diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:33:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:33:59 +0000 |
| commit | ee9b8719787f1ef6c627b4a1219fca6805c7aba1 (patch) | |
| tree | 9ec08a6e312d5f62d590b7eb15c41ed43c1853c5 /vcl | |
| parent | a2e0beaa03491dccfa371dffe3e2d2b6dd71b1a0 (diff) | |
INTEGRATION: CWS aw003 (1.10.68); FILE MERGED
2003/10/07 19:11:16 aw 1.10.68.2: RESYNC: (1.10-1.11); FILE MERGED
2003/07/28 18:03:56 thb 1.10.68.1: #110958# Removed several set* inlines, to intercept them for alpha vdev painting
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/outmap.cxx | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 1d103527786d..6d66851daf78 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outmap.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2003-09-19 10:46:17 $ + * last change: $Author: rt $ $Date: 2003-11-24 17:33:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,6 +74,9 @@ #include <tools/debug.hxx> #endif +#ifndef _SV_VIRDEV_HXX +#include <virdev.hxx> +#endif #ifndef _SV_SVDATA_HXX #include <svdata.hxx> #endif @@ -811,6 +814,16 @@ Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const // ----------------------------------------------------------------------- +void OutputDevice::EnableMapMode( BOOL bEnable ) +{ + mbMap = (bEnable != 0); + + if( mpAlphaVDev ) + mpAlphaVDev->EnableMapMode( bEnable ); +} + +// ----------------------------------------------------------------------- + void OutputDevice::SetMapMode() { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -836,6 +849,9 @@ void OutputDevice::SetMapMode() mnOutOffLogicX = mnOutOffOrigX; // no mapping -> equal offsets mnOutOffLogicY = mnOutOffOrigY; } + + if( mpAlphaVDev ) + mpAlphaVDev->SetMapMode(); } // ----------------------------------------------------------------------- @@ -859,6 +875,9 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) if ( maMapMode == rNewMapMode ) return; + if( mpAlphaVDev ) + mpAlphaVDev->SetMapMode( rNewMapMode ); + // Ist Default-MapMode, dann bereche nichts BOOL bOldMap = mbMap; mbMap = !rNewMapMode.IsDefault(); @@ -999,6 +1018,9 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) mnOutOffLogicY = ImplPixelToLogic( mnOutOffOrigY, mnDPIY, maMapRes.mnMapScNumY, maMapRes.mnMapScDenomY, maThresRes.mnThresPixToLogY ); + + if( mpAlphaVDev ) + mpAlphaVDev->SetRelativeMapMode( rNewMapMode ); } // ----------------------------------------------------------------------- @@ -2113,6 +2135,9 @@ void OutputDevice::SetPixelOffset( const Size& rOffset ) mnOutOffLogicY = ImplPixelToLogic( mnOutOffOrigY, mnDPIY, maMapRes.mnMapScNumY, maMapRes.mnMapScDenomY, maThresRes.mnThresPixToLogY ); + + if( mpAlphaVDev ) + mpAlphaVDev->SetPixelOffset( rOffset ); } // ----------------------------------------------------------------------- |