[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - tools/inc vcl/source

[Tomaž Vajngerl]

 tools/inc/tools/gen.hxx          |    2 ++
 vcl/source/filter/wmf/winwmf.cxx |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 1c2e47193e8d811be2023860f61e1af922526610
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Fri Apr 18 20:57:27 2014 +0200

    fdo#77088 WMF - replace 32-bit min/max assumption with const
    
    Added RECT_MIN and RECT_MAX which represent the minimum and
    maximum value a Rectangle object can hold. In WMF we used a 32-bit
    assumption what the min and max value could be (0x7fffffff,
    0x80000000) which causes problems on 64-bit systems.
    
    Change-Id: Ic62daebbc2708cdeb7b0cf7b694bd9940eb98313

diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index 2ddb21f..1c7f766 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -354,6 +354,8 @@ inline std::basic_ostream<charT, traits> & operator <<(
 // Rectangle
 
 #define RECT_EMPTY  ((short)-32767)
+#define RECT_MAX    LONG_MAX
+#define RECT_MIN    LONG_MIN
 
 class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle
 {
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 0178e3d..db4fb75 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1259,10 +1259,10 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
 {
     sal_Bool bRet = sal_True;
 
-    rPlaceableBound.Left()   = (sal_Int32)0x7fffffff;
-    rPlaceableBound.Top()    = (sal_Int32)0x7fffffff;
-    rPlaceableBound.Right()  = (sal_Int32)0x80000000;
-    rPlaceableBound.Bottom() = (sal_Int32)0x80000000;
+    rPlaceableBound.Left()   = RECT_MAX;
+    rPlaceableBound.Top()    = RECT_MAX;
+    rPlaceableBound.Right()  = RECT_MIN;
+    rPlaceableBound.Bottom() = RECT_MIN;
 
     sal_uInt32 nPos = pStm->Tell();
     sal_uInt32 nEnd = pStm->Seek( STREAM_SEEK_TO_END );