openoffice-gui-icon-composite.patch

   1 Index: vcl/source/control/fixed.cxx
   2 ===================================================================
   3 RCS file: /cvs/gsl/vcl/source/control/fixed.cxx,v
   4 retrieving revision 1.10
   5 diff -u -p -u -r1.10 fixed.cxx
   6 --- vcl/source/control/fixed.cxx        17 Oct 2002 14:47:00 -0000      1.10
   7 +++ vcl/source/control/fixed.cxx        12 Sep 2003 14:38:28 -0000
   8 @@ -73,6 +73,9 @@
   9  #ifndef _VCL_CONTROLLAYOUT_HXX
  10  #include <controllayout.hxx>
  11  #endif
  12 +#ifndef _SV_BITMAPEX_HXX
  13 +#include <bitmapex.hxx>
  14 +#endif
  15
  16  #include <rc.h>
  17
  18 @@ -810,14 +820,16 @@ void FixedBitmap::ImplDraw( OutputDevice
  19         else
  20         {
  21                 // Haben wir ueberhaupt eine Bitmap
  22 -               if ( !(!(*pBitmap)) )
  23 +        if ( !!(*pBitmap) )
  24                 {
  25 +                       BitmapEx aEx( *pBitmap );
  26 +
  27                         if ( GetStyle() & WB_SCALE )
  28 -                               pDev->DrawBitmap( rPos, rSize, *pBitmap );
  29 +                               pDev->DrawBitmapEx( rPos, rSize, aEx );
  30                         else
  31                         {
  32                                 Point aPos = ImplCalcPos( GetStyle(), rPos, pBitmap->GetSizePixel(), rSize );
  33 -                               pDev->DrawBitmap( aPos, *pBitmap );
  34 +                               pDev->DrawBitmapEx( aPos, aEx );
  35                         }
  36                 }
  37         }