[Libreoffice-commits] core.git: 2 commits - svx/source vcl/inc vcl/ios

[Tor Lillqvist]

 svx/source/svdraw/svdfmtf.cxx  |    2 +-
 svx/source/svdraw/svdfmtf.hxx  |    2 +-
 vcl/inc/ios/saldata.hxx        |    5 -----
 vcl/ios/source/app/saldata.cxx |    1 -
 4 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 494042ef5b104a4b4fd1cf7b4a861df9ba6771a8
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Mar 16 20:26:31 2013 +0200

    CONTAINER_APPEND is SAL_ULONG, an unsigned long
    
    Fix WaE: implicit conversion from 'unsigned long' to 'sal_uInt32' (aka
    'unsigned int') changes value from 18446744073709551615 to 4294967295,
    which definitely sounds like an actual bug-inducing error to me, not
    "just a warning".
    
    So don't try to use it as default value for a parameter of type
    sal_uInt32. Changing the parameter to sal_uLong.
    
    Change-Id: I8ebc7195ba1bf94f4f2d6df7cd7863f779ba3fa6

diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 5c83ee7..dc2f6c8 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -201,7 +201,7 @@ void ImpSdrGDIMetaFileImport::DoLoopActions(GDIMetaFile& rMtf, SvdProgressInfo*
 sal_uInt32 ImpSdrGDIMetaFileImport::DoImport(
     const GDIMetaFile& rMtf,
     SdrObjList& rOL,
-    sal_uInt32 nInsPos,
+    sal_uLong nInsPos,
     SvdProgressInfo* pProgrInfo)
 {
     // setup some global scale parameter
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index e52f835..93e3904 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -162,7 +162,7 @@ public:
     sal_uInt32 DoImport(
         const GDIMetaFile& rMtf,
         SdrObjList& rDestList,
-        sal_uInt32 nInsPos = CONTAINER_APPEND,
+        sal_uLong nInsPos = CONTAINER_APPEND,
         SvdProgressInfo* pProgrInfo = 0);
 };
 
commit b0bc47d628ceb6d89d22cd2bd5abc5e5c92af4d8
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Mar 16 19:24:38 2013 +0200

    mnSystemVersion not used
    
    Change-Id: Ief800f1228bca327fd8d77a78fa332639f5d5f69

diff --git a/vcl/inc/ios/saldata.hxx b/vcl/inc/ios/saldata.hxx
index 75d1b76..9ab5e4b 100644
--- a/vcl/inc/ios/saldata.hxx
+++ b/vcl/inc/ios/saldata.hxx
@@ -52,9 +52,6 @@ class SystemFontList;
 
 #define SAL_CLIPRECT_COUNT 16
 
-#define VER_TIGER   0x1040
-#define VER_LEOPARD 0x1050
-
 // -----------
 // - SalData -
 // -----------
@@ -87,8 +84,6 @@ public:
 
     static oslThreadKey                           s_aAutoReleaseKey;
 
-    SInt32                                        mnSystemVersion;          // Store System Version
-
     long                                          mnDPIX;           // #i100617# read DPI only once per office life
     long                                          mnDPIY;           // #i100617# read DPI only once per office life
 
diff --git a/vcl/ios/source/app/saldata.cxx b/vcl/ios/source/app/saldata.cxx
index b8f3910..b83bc78 100644
--- a/vcl/ios/source/app/saldata.cxx
+++ b/vcl/ios/source/app/saldata.cxx
@@ -42,7 +42,6 @@ SalData::SalData()
     mxGraySpace( CGColorSpaceCreateDeviceGray( ) ),
     mxP50Space( NULL ),
     mxP50Pattern( NULL ),
-    mnSystemVersion( VER_TIGER ),
     mnDPIX( 0 ),
     mnDPIY( 0 )
 {