diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-13 10:50:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-13 10:53:28 +0100 |
| commit | ee11e221d2108212619e1bbe7f029e7d9afdba32 (patch) | |
| tree | 65e77bfcd7fc7a4ca7e1c111cc8707615bc0d613 /sc/source/filter | |
| parent | e37388c7de15242b7af0bf9fdc48c6d194d8cd94 (diff) | |
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
Diffstat (limited to 'sc/source/filter')
| -rw-r--r-- | sc/source/filter/excel/xicontent.cxx | 5 | ||||
| -rw-r--r-- | sc/source/filter/excel/xltoolbar.cxx | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index c248e9d9b04c..ef683fecf0c6 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -532,7 +532,8 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm ) case EXC_CF_CMP_GREATER_EQUAL: eMode = SC_COND_EQGREATER; break; case EXC_CF_CMP_LESS_EQUAL: eMode = SC_COND_EQLESS; break; default: - OSL_TRACE( "XclImpCondFormat::ReadCF - unknown CF comparison 0x%02hX", nOperator ); + SAL_INFO( + "sc.filter", "unknown CF comparison " << nOperator); } } break; @@ -542,7 +543,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm ) break; default: - OSL_TRACE( "XclImpCondFormat::ReadCF - unknown CF mode 0x%02hX", nType ); + SAL_INFO("sc.filter", "unknown CF mode " << nType); return; } diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index 0276a0de6591..f3631be5c46a 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -77,7 +77,7 @@ ScCTB::ScCTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0) bool ScCTB::Read( SvStream &rS ) { - OSL_TRACE("ScCTB::Read() stream pos 0x%x", rS.Tell() ); + SAL_INFO("sc.filter", "stream pos " << rS.Tell()); nOffSet = rS.Tell(); tb.Read( rS ); for ( sal_uInt16 index = 0; index < nViews; ++index ) @@ -188,7 +188,7 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp } bool CTBS::Read( SvStream &rS ) { - OSL_TRACE("CTBS::Read() stream pos 0x%x", rS.Tell() ); + SAL_INFO("sc.filter", "stream pos " << rS.Tell()); nOffSet = rS.Tell(); rS.ReadUChar( bSignature ).ReadUChar( bVersion ).ReadUInt16( reserved1 ).ReadUInt16( reserved2 ).ReadUInt16( reserved3 ).ReadUInt16( ctb ).ReadUInt16( ctbViews ).ReadUInt16( ictbView ); return true; @@ -220,7 +220,7 @@ ScTBC::ScTBC() bool ScTBC::Read(SvStream &rS) { - OSL_TRACE("ScTBC::Read() stream pos 0x%x", rS.Tell() ); + SAL_INFO("sc.filter", "stream pos " << rS.Tell()); nOffSet = rS.Tell(); if ( !tbch.Read( rS ) ) return false; @@ -329,7 +329,7 @@ TBCCmd::Print(FILE* fp) bool TBCCmd::Read( SvStream &rS ) { - OSL_TRACE("TBCCmd::Read() stream pos 0x%x", rS.Tell() ); + SAL_INFO("sc.filter", "stream pos " << rS.Tell()); nOffSet = rS.Tell(); rS.ReadUInt16( cmdID ); sal_uInt16 temp; @@ -354,7 +354,7 @@ ScCTBWrapper::~ScCTBWrapper() bool ScCTBWrapper::Read( SvStream &rS) { - OSL_TRACE("ScCTBWrapper::Read() stream pos 0x%x", rS.Tell() ); + SAL_INFO("sc.filter", "stream pos " << rS.Tell()); nOffSet = rS.Tell(); if (!ctbSet.Read(rS)) return false; |