diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 14:12:22 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 14:12:22 +0000 |
| commit | 368abce5a218c6eb994b9d960cb78235dc3451eb (patch) | |
| tree | 283587862627835838732905eaa1fe4d8bae5e46 /vcl | |
| parent | 288da036c24bc038e1eb6b827c4488ebfabde2cd (diff) | |
INTEGRATION: CWS vcl83 (1.23.60); FILE MERGED
2007/10/22 08:59:46 pl 1.23.60.3: #i82823# remove warnings (thanks pjanik)
2007/10/15 10:03:08 aw 1.23.60.2: #i82615# secured OutputDevice::GetInverseViewTransformation()
2007/10/15 09:25:23 aw 1.23.60.1: #i82615# secured OutputDevice::GetInverseViewTransformation()
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/outmap.cxx | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 5757faf80ce4..e4290c4394e4 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: outmap.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: rt $ $Date: 2007-07-24 10:13:23 $ + * last change: $Author: ihi $ $Date: 2007-11-26 15:12:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -426,6 +426,8 @@ inline void ImplCalcMapResolution( const MapMode& rMapMode, static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) { + // To "use" it... + (void) nThres; #ifdef USE_64BIT_INTS #if (SAL_TYPES_SIZEOFLONG < 8) if( (+n < nThres) && (-n < nThres) ) @@ -489,6 +491,8 @@ static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) { + // To "use" it... + (void) nThres; #ifdef USE_64BIT_INTS #if (SAL_TYPES_SIZEOFLONG < 8) if( (+n < nThres) && (-n < nThres) ) @@ -1045,7 +1049,11 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const { if(mbMap) { - const_cast< OutputDevice* >(this)->ImplInitOutDevData(); + // #i82615# + if(!mpOutDevData) + { + const_cast< OutputDevice* >(this)->ImplInitOutDevData(); + } if(!mpOutDevData->mpViewTransform) { @@ -1077,6 +1085,12 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const { if(mbMap) { + // #i82615# + if(!mpOutDevData) + { + const_cast< OutputDevice* >(this)->ImplInitOutDevData(); + } + if(!mpOutDevData->mpInverseViewTransform) { GetViewTransformation(); |