[Libreoffice-commits] .: 2 commits - editeng/source svtools/source

[Caolán McNamara]

 editeng/source/rtf/rtfgrf.cxx        |    2 +-
 svtools/source/filter/wmf/winwmf.cxx |    2 +-
 svtools/source/filter/wmf/wmfwr.cxx  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6b6bbe539bf4c72773b280addc7150656f83713b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 31 20:23:25 2012 +0000

    SWAPLONG->OSL_SWAPDWORD

diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index f22a0a4..142b48d 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -164,7 +164,7 @@ static sal_uInt8 aPal8[ 256 * 4 ] =
 inline long SwapLong( long n )
 {
 #ifndef OSL_LITENDIAN
-    return SWAPLONG( n );
+    return OSL_SWAPDWORD( n );
 #else
     return n;
 #endif
commit 19f53f40039a935fee48fdf1fb1f801f489fd478
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 31 20:21:22 2012 +0000

    SWAPLONG->OSL_SWAPDWORD

diff --git a/svtools/source/filter/wmf/winwmf.cxx b/svtools/source/filter/wmf/winwmf.cxx
index c6e76d7..214dd57 100644
--- a/svtools/source/filter/wmf/winwmf.cxx
+++ b/svtools/source/filter/wmf/winwmf.cxx
@@ -875,7 +875,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
                             if ( nEscLen <= ( nRecSize * 2 ) )
                             {
 #ifdef OSL_BIGENDIAN
-                                sal_uInt32 nTmp = SWAPLONG( nEsc );
+                                sal_uInt32 nTmp = OSL_SWAPDWORD( nEsc );
                                 sal_uInt32 nCheckSum = rtl_crc32( 0, &nTmp, 4 );
 #else
                                 sal_uInt32 nCheckSum = rtl_crc32( 0, &nEsc, 4 );
diff --git a/svtools/source/filter/wmf/wmfwr.cxx b/svtools/source/filter/wmf/wmfwr.cxx
index 2079154..ca0caad 100644
--- a/svtools/source/filter/wmf/wmfwr.cxx
+++ b/svtools/source/filter/wmf/wmfwr.cxx
@@ -523,7 +523,7 @@ bool IsStarSymbol(const String &rStr)
 void WMFWriter::WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const sal_Int8* pData )
 {
 #ifdef OSL_BIGENDIAN
-    sal_uInt32 nTmp = SWAPLONG( nEsc );
+    sal_uInt32 nTmp = OSL_SWAPDWORD( nEsc );
     sal_uInt32 nCheckSum = rtl_crc32( 0, &nTmp, 4 );
 #else
     sal_uInt32 nCheckSum = rtl_crc32( 0, &nEsc, 4 );