diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 12:18:57 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 12:18:57 +0000 |
| commit | cbb4ccf88f6a202496e2243951964059d396ea0b (patch) | |
| tree | 036f64b9092f81fe1a9832f55adec8af79fa05c0 /vcl/source/gdi/impimage.cxx | |
| parent | 19f3db1217dce8ea06500ae2e203f1146bdc7ca8 (diff) | |
INTEGRATION: CWS vclcleanup01 (1.11.6); FILE MERGED
2003/11/28 07:32:39 mt 1.11.6.1: #i22952# Removed App Server code
Diffstat (limited to 'vcl/source/gdi/impimage.cxx')
| -rw-r--r-- | vcl/source/gdi/impimage.cxx | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index f08fe1554974..f8de4ff7dc31 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impimage.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2003-11-24 17:32:06 $ + * last change: $Author: rt $ $Date: 2003-12-01 13:18:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,16 +89,12 @@ // - FASTIMAGE - // ------------- -#ifndef REMOTE_APPSERVER #if defined WIN || defined WNT || defined OS2 #undef FASTTRANSPARENT extern BOOL bFastTransparent; #else #undef FASTTRANSPARENT #endif -#else -#undef FASTTRANSPARENT -#endif // ----------- // - Defines - @@ -433,7 +429,6 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev, { const Point aPos( nPos * aSize.Width(), 0 ); -#ifndef REMOTE_APPSERVER if( !aBmpDisp && !!aBmp ) aBmpDisp = aBmp.CreateDisplayBitmap( pOutDev ); @@ -441,19 +436,6 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev, if( !aMaskDisp && !!aMask ) aMaskDisp = aMask.CreateDisplayBitmap( pOutDev ); -#else // REMOTE_APPSERVER - - if( !aBmpDisp && !!aBmp ) - aBmpDisp = aBmp; - - if( !aMaskDisp && !!aMask ) - aMaskDisp = aMask; - - if( !aDisaDisp && !!aDisa ) - aDisaDisp = aDisa; - -#endif // REMOTE_APPSERVER - if( !aBmpEx ) aBmpEx = BitmapEx( aBmpDisp, aMaskDisp ); @@ -484,11 +466,7 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev, { aDisa = Bitmap( aBmpEx.GetSizePixel(), 1 ); ImplUpdateDisaBmp( DISA_ALL ); -#ifndef REMOTE_APPSERVER aDisaDisp = aDisa.CreateDisplayBitmap( pOutDev ); -#else // REMOTE_APPSERVER - aDisaDisp = aDisa; -#endif // REMOTE_APPSERVER } if( !aDisaDisp && !!aDisa ) |