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

3 files changed, 12 insertions, 7 deletions

diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 7a1b1714e99e..6c1ce13336d6 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -304,7 +304,10 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
                 {
                     aSubViewSize[i].Width = static_cast< sal_Int32 >( maPath2DList[i].w );
                     aSubViewSize[i].Height = static_cast< sal_Int32 >( maPath2DList[i].h );
-                    OSL_TRACE("set subpath %d size: %d x %d", i, maPath2DList[i].w, maPath2DList[i].h);
+                    SAL_INFO(
+                        "oox.cscode",
+                        "set subpath " << i << " size: " << maPath2DList[i].w
+                            << " x " << maPath2DList[i].h);
                 }
                 aPath.setProperty( PROP_SubViewSize, aSubViewSize);
             }
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 1209f004fdf3..3fcd3fe0281c 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -62,11 +62,10 @@ void Connection::dump()
 
 void Point::dump()
 {
-    OSL_TRACE( "dgm: pt text %x, cnxId %s, modelId %s, type %d",
-               mpShape.get(),
-               OUSTRING_TO_CSTR( msCnxId ),
-               OUSTRING_TO_CSTR( msModelId ),
-               mnType );
+    SAL_INFO(
+        "oox.drawingml",
+        "pt text " << mpShape.get() << ", cnxId " << msCnxId << ", modelId "
+            << msModelId << ", type " << mnType);
 }
 
 } // dgm namespace
diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx
index 225ca38de3bb..b565a1b5e917 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -134,7 +134,10 @@ namespace oox { namespace ppt {
             return new ShapeTargetElementContext( *this, mpTarget->maShapeTarget );
         }
         default:
-            OSL_TRACE( "OOX: unhandled tag %ld in TL_TimeTargetElement.", getBaseToken( aElementToken ) );
+            SAL_INFO(
+                "oox.ppt",
+                "unhandled tag " << getBaseToken(aElementToken)
+                    << " in TL_TimeTargetElement");
             break;
         }