[Libreoffice-commits] .: Branch 'refs/tags/libreoffice-3.5.0.1' - 3 commits - binfilter/bf_sch binfilter/bf_sw

[Fridrich Strba]

Rebased ref, commits from common ancestor:
commit 8c0b45513a139657678484b73112dc5eba800dac
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 18 09:24:57 2012 +0100

    Version 3.5.0.1, tag libreoffice-3.5.0.1 (3.5.0-rc1)
commit 539d9db35d08904e033111166c51105f60385f84
Author: David Tardon <dtardon at 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 <dtardon at 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() );
commit 7f15fcac486ea45c3ca77db7f93506850a022e5e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Dec 6 14:15:08 2011 +0100

    Branch libreoffice-3-5
    
    This is 'libreoffice-3-5' - the stable branch for the 3.5.x releases.
    The commit rules are different according to the development phase:
    
    + 3.5.0 beta phase:
    
        + any bug fixes are allowed without review
        + late features need approval by 2 people with different affiliation
    
    + 3.5.0 rc phase and later:
    
        + fixes need approval by one reviewer
        + late features need approval by 2 more people with different affiliation
    
    IMPORTANT: Every developer is responsible for pushing the fixes into all
               appropriate branches. Note that we do not plan any merge
               from this branch to master or vice versa.
    
    Please, help use to make stable and usable release. If you want to build
    something cool, unstable, and risky, use master.