tdf#43157: Fix format string violations in OSL_TRACE etc.

...in preparation of enabling the __attribute__((format(...))) in
sal_detail_logFormat (include/sal/detail/log.h)

Change-Id: I8a859199fa11ca0f9f4f4b4b23a8ebddec955a86

2 files changed, 18 insertions, 16 deletions

diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 6f2f0426abbd..10a2cb671177 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -192,7 +192,7 @@ TBCHeader::~TBCHeader()
 
 bool TBCHeader::Read( SvStream &rS )
 {
-    OSL_TRACE("TBCHeader::Read() stream pos 0x%x", rS.Tell() );
+    SAL_INFO("filter.ms", "stream pos " << rS.Tell());
     nOffSet = rS.Tell();
     rS.ReadSChar( bSignature ).ReadSChar( bVersion ).ReadUChar( bFlagsTCR ).ReadUChar( tct ).ReadUInt16( tcid ).ReadUInt32( tbct ).ReadUChar( bPriority );
     //  bit 4 ( from lsb )
@@ -230,7 +230,7 @@ TBCData::TBCData( const TBCHeader& Header ) : rHeader( Header )
 
 bool TBCData::Read(SvStream &rS)
 {
-    OSL_TRACE("TBCData::Read() stream pos 0x%x", rS.Tell() );
+    SAL_INFO("filter.ms", "stream pos " << rS.Tell());
     nOffSet = rS.Tell();
     if ( !controlGeneralInfo.Read(rS) /*|| !controlSpecificInfo.Read(rS)*/ )
         return false;
@@ -375,7 +375,7 @@ void TBCData::Print( FILE* fp )
 bool
 WString::Read( SvStream &rS )
 {
-    OSL_TRACE("WString::Read() stream pos 0x%x", rS.Tell() );
+    SAL_INFO("filter.ms", "stream pos " << rS.Tell());
     nOffSet = rS.Tell();
     sal_uInt8 nChars = 0;
     rS.ReadUChar( nChars );
@@ -393,7 +393,7 @@ TBCExtraInfo::TBCExtraInfo()
 bool
 TBCExtraInfo::Read( SvStream &rS )
 {
-    OSL_TRACE("TBCExtraInfo::Read() stream pos 0x%x", rS.Tell() );
+    SAL_INFO("filter.ms", "stream pos " << rS.Tell());
     nOffSet = rS.Tell();
     if( !wstrHelpFile.Read( rS )  )
         return false;
@@ -439,7 +439,7 @@ TBCGeneralInfo::TBCGeneralInfo() : bFlags( 0 )
 
 bool TBCGeneralInfo::Read( SvStream &rS )
 {
-    OSL_TRACE("TBCGeneralInfo::Read() stream pos 0x%x", rS.Tell() );
+    SAL_INFO("filter.ms", "stream pos " << rS.Tell());
     nOffSet = rS.Tell();
     rS.ReadUChar( bFlags );
 
@@ -521,7 +521,7 @@ TBCMenuSpecific::TBCMenuSpecific() : tbid( 0 )
 bool
 TBCMenuSpecific::Read( SvStream &rS)
 {
-    OSL_TRACE("TBCMenuSpecific::Read() stream pos 0x%x", rS.Tell() );
+    SAL_INFO("filter.ms", "stream pos " << rS.Tell());
     nOffSet = rS.Tell();
     rS.ReadInt32( tbid );
     if ( tbid == 1 )
@@ -557,7 +557,7 @@ TBCBSpecific::TBCBSpecific() : bFlags( 0 )
 
 bool TBCBSpecific::Read( SvStream &rS)
 {
-    OSL_TRACE("TBCBSpecific::Read() stream pos 0x%x", rS.Tell() );
+    SAL_INFO("filter.ms", "stream pos " << rS.Tell());
     nOffSet = rS.Tell();
     rS.ReadUChar( bFlags );
 
@@ -720,7 +720,7 @@ TBCBitMap::~TBCBitMap()
 
 bool TBCBitMap::Read( SvStream& rS)
 {
-    OSL_TRACE("TBCBitMap::Read() stream pos 0x%x", rS.Tell() );
+    SAL_INFO("filter.ms", "stream pos " << rS.Tell());
     nOffSet = rS.Tell();
     rS.ReadInt32( cbDIB );
     // cbDIB = sizeOf(biHeader) + sizeOf(colors) + sizeOf(bitmapData) + 10
@@ -748,7 +748,7 @@ bFlags( 0 )
 
 bool TB::Read(SvStream &rS)
 {
-    OSL_TRACE("TB::Read() stream pos 0x%x", rS.Tell() );
+    SAL_INFO("filter.ms", "stream pos " << rS.Tell());
     nOffSet = rS.Tell();
     rS.ReadUChar( bSignature ).ReadUChar( bVersion ).ReadInt16( cCL ).ReadInt32( ltbid ).ReadUInt32( ltbtr ).ReadUInt16( cRowsDefault ).ReadUInt16( bFlags );
     name.Read( rS );
@@ -783,7 +783,7 @@ TBVisualData::TBVisualData() : tbds(0), tbv(0), tbdsDock(0), iRow(0)
 
 bool TBVisualData::Read( SvStream& rS )
 {
-    OSL_TRACE("TBVisualData::Read() stream pos 0x%x", rS.Tell() );
+    SAL_INFO("filter.ms", "stream pos " << rS.Tell());
     nOffSet = rS.Tell();
     rS.ReadSChar( tbds ).ReadSChar( tbv ).ReadSChar( tbdsDock ).ReadSChar( iRow );
     rcDock.Read( rS );
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index a02a028f7ef8..e7662cad1705 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -99,10 +99,10 @@ SfxObjectShell* findShellForUrl( const OUString& sMacroURLOrPath )
         // a new document :/
         if ( xModel.is() )
         {
-            OSL_TRACE("shell 0x%x has model with url %s and we look for %s", pShell
-                , OUStringToOString( xModel->getURL(), RTL_TEXTENCODING_UTF8 ).getStr()
-                , OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr()
-            );
+            SAL_INFO(
+                "filter.ms",
+                "shell " << pShell << " has model with url " << xModel->getURL()
+                    << " and we look for " << aURL);
             OUString aName = xModel->getURL() ;
             if (aName.isEmpty())
                 {
@@ -309,7 +309,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro
         // assume for now that the document name is *this* document
         OUString sDocUrlOrPath = aMacroName.copy( 0, nDocSepIndex );
         aMacroName = aMacroName.copy( nDocSepIndex + 1 );
-        OSL_TRACE("doc search, current shell is 0x%x", pShell );
+        SAL_INFO("filter.ms", "doc search, current shell is " << pShell);
         SfxObjectShell* pFoundShell = 0;
         if( bSearchGlobalTemplates )
         {
@@ -320,7 +320,9 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro
         }
         if( !pFoundShell )
             pFoundShell = findShellForUrl( sDocUrlOrPath );
-        OSL_TRACE("doc search, after find, found shell is 0x%x", pFoundShell );
+        SAL_INFO(
+            "filter.ms",
+            "doc search, after find, found shell is " << pFoundShell);
         return resolveVBAMacro( pFoundShell, aMacroName );
     }