[Libreoffice-commits] .: Branch 'libreoffice-3-5' - binfilter/bf_sch binfilter/bf_sw

[David Tardon]

 binfilter/bf_sch/source/core/sch_globfunc.cxx   |    4 ++--
 binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 539d9db35d08904e033111166c51105f60385f84
Author: David Tardon <dtar...@redhat.com>
Date:   Tue Jan 10 19:32:51 2012 +0100

    fix for gcc 4.7/C++11: these are not string literal operators
    
    Signed-off-by: David Tardon <dtar...@redhat.com>

diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx 
b/binfilter/bf_sch/source/core/sch_globfunc.cxx
index 6a81bf1..ac87608 100644
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
@@ -1193,7 +1193,7 @@ namespace binfilter {
 /*N*/   const USHORT* pRanges = rSet.GetRanges();
 /*N*/   for( long n = 0; pRanges[ n ] && n<32; n+=2 )
 /*N*/   {
-/*N*/       snprintf( pSmallBuf, sizeof(pSmallBuf), "[%"SAL_PRIdINT32"; 
%"SAL_PRIdINT32"] ", (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
+/*N*/       snprintf( pSmallBuf, sizeof(pSmallBuf), "[%" SAL_PRIdINT32 "; %" 
SAL_PRIdINT32 "] ", (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
 /*N*/       strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 );
 /*N*/   }
 /*N*/
@@ -1219,7 +1219,7 @@ namespace binfilter {
 /*N*/               nCns++;
 /*N*/           if( nCnt < 100 )
 /*N*/           {
-/*N*/               snprintf( pSmallBuf, sizeof(pSmallBuf), "%"SAL_PRIdINT32", 
", (sal_uInt32) nWhich );
+/*N*/               snprintf( pSmallBuf, sizeof(pSmallBuf), "%" SAL_PRIdINT32 
", ", (sal_uInt32) nWhich );
 /*N*/               strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 
);
 /*N*/           }
 /*N*/
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx 
b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 6548a85..3da5855 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1646,7 +1646,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
 /*N*/   if( pCrypter )
 /*N*/   {
 /*?*/       sal_Char buf[ 17 ];
-/*?*/       snprintf( buf, sizeof(buf), 
"%08"SAL_PRIxUINT32"%08"SAL_PRIxUINT32, nDate, nTime );
+/*?*/       snprintf( buf, sizeof(buf), "%08" SAL_PRIxUINT32 "%08" 
SAL_PRIxUINT32, nDate, nTime );
 /*?*/       rtl::OStringBuffer aTest( buf );
 /*?*/       pCrypter->Encrypt( aTest );
 /*?*/       return sal_Bool( !memcmp( cPasswd, aTest.getStr(), PASSWDLEN ) );
@@ -1664,7 +1664,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
 /*N*/   {
 /*?*/       pCrypter = new Crypter( pRoot->GetKey() );
 /*?*/       sal_Char buf[ 17 ];
-/*?*/       snprintf( buf, sizeof(buf), 
"%08"SAL_PRIxUINT32"%08"SAL_PRIxUINT32, nDate, nTime );
+/*?*/       snprintf( buf, sizeof(buf), "%08" SAL_PRIxUINT32 "%08" 
SAL_PRIxUINT32, nDate, nTime );
 /*?*/       rtl::OStringBuffer aTest( buf );
 /*?*/       pCrypter->Encrypt( aTest );
 /*?*/       memcpy( cPasswd, aTest.getStr(), aTest.getLength() );
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits