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, 14 deletions

diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index 59efda2c9001..6e5d2b49a9ea 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -265,11 +265,11 @@ namespace slideshow
                 }
                 else
                 {
-#if OSL_DEBUG_LEVEL > 0
-                    VERBOSE_TRACE( "Ignoring discharged event: unknown (0x%X), timeout was: %f",
-                                   event.pEvent.get(),
-                                   event.pEvent->getActivationTime(0.0) );
-#endif
+                    SAL_INFO(
+                        "slideshow.eventqueue",
+                        "Ignoring discharged event: unknown ("
+                            << event.pEvent.get() << "), timeout was: "
+                            << event.pEvent->getActivationTime(0.0));
                 }
             }
         }
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 13d47d692972..95a0247f02d4 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -371,19 +371,23 @@ namespace slideshow
                 // safe cast, since order does not depend on mnSubsetQueriedCount
                 const_cast<SubsetEntry&>(*aIter).mnSubsetQueriedCount--;
 
-                VERBOSE_TRACE( "Subset summary: shape 0x%X, %d open subsets, revoked subset has refcount %d",
-                               this,
-                               maSubsetShapes.size(),
-                               aIter->mnSubsetQueriedCount );
+                SAL_INFO(
+                    "slideshow",
+                    "Subset summary: shape " << this << ", "
+                        << maSubsetShapes.size()
+                        << " open subsets, revoked subset has refcount "
+                        << aIter->mnSubsetQueriedCount);
 
                 return false; // not the last client
             }
 
-            VERBOSE_TRACE( "Subset summary: shape 0x%X, %d open subsets, cleared subset has range [%d,%d]",
-                           this,
-                           maSubsetShapes.size(),
-                           aEntry.mnStartActionIndex,
-                           aEntry.mnEndActionIndex );
+            SAL_INFO(
+                "slideshow",
+                "Subset summary: shape " << this << ", "
+                    << maSubsetShapes.size()
+                    << " open subsets, cleared subset has range ["
+                    << aEntry.mnStartActionIndex << ","
+                    << aEntry.mnEndActionIndex << "]");
 
             // yes, remove from set
             maSubsetShapes.erase( aIter );