applied_patches/0813-svx-ooo320-backports.diff

   1 --- svx/source/mnuctrls/clipboardctl.cxx        2009-04-02 13:03:32.000000000 +0200
   2 +++ svx/source/mnuctrls/clipboardctl.cxx        2009-03-25 18:33:18.000000000 +0100
   3 @@ -143,6 +143,16 @@
   4              GetToolBox().SetItemBits( GetId(), GetToolBox().GetItemBits( GetId() ) & ~TIB_DROPDOWN );
   5          GetToolBox().Invalidate( GetToolBox().GetItemRect( GetId() ) );
   6      }
   7 +    #ifdef UNIX
   8 +    // #b6673979# enable some slots hardly, because UNIX clipboard does not notify all changes
   9 +    // Can be removed if follow up task will be fixed directly within applications.
  10 +    else
  11 +    if ( SID_PASTE == nSID )
  12 +    {
  13 +        bDisabled = false;
  14 +        GetToolBox().EnableItem( GetId(), true );
  15 +    }
  16 +    #endif
  17      else
  18      {
  19          // enable the item as a whole
  20 --- svx/source/svdraw/svdotextdecomposition.cxx 2009-04-02 13:03:00.000000000 +0200
  21 +++ svx/source/svdraw/svdotextdecomposition.cxx 2009-03-25 18:32:48.000000000 +0100
  22 @@ -206,11 +206,7 @@
  23                  false));
  24                         basegfx::B2DHomMatrix aNewTransform;
  25
  26 -                       // #i100489# need extra scale factor for DXArray which collects all scalings
  27 -                       // which are needed to get the DXArray to unit coordinates
  28 -                       double fDXArrayScaleFactor(aSize.getX());
  29 -
  30 -            // add font scale to new transform
  31 +                       // add font scale to new transform
  32                         aNewTransform.scale(aSize.getX(), aSize.getY());
  33
  34                         // look for proportional font scaling, evtl scale accordingly
  35 @@ -218,10 +214,6 @@
  36                         {
  37                                 const double fFactor(rInfo.mrFont.GetPropr() / 100.0);
  38                                 aNewTransform.scale(fFactor, fFactor);
  39 -
  40 -                               // #i100489# proportional font scaling influences the DXArray,
  41 -                               // add to factor
  42 -                               fDXArrayScaleFactor *= fFactor;
  43                         }
  44
  45                         // apply font rotate
  46 @@ -273,8 +265,7 @@
  47
  48                         if(!bDisableTextArray && rInfo.mpDXArray && rInfo.mnTextLen)
  49                         {
  50 -                               // #i100489# use fDXArrayScaleFactor here
  51 -                               const double fScaleFactor(basegfx::fTools::equalZero(fDXArrayScaleFactor) ? 1.0 : 1.0 / fDXArrayScaleFactor);
  52 +                               const double fScaleFactor(basegfx::fTools::equalZero(aSize.getX()) ? 1.0 : 1.0 / aSize.getX());
  53                                 aDXArray.reserve(rInfo.mnTextLen);
  54
  55                                 for(xub_StrLen a(0); a < rInfo.mnTextLen; a++)