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, 15 insertions, 5 deletions

diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 546384ac1b10..bb852c4c3cf4 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -357,7 +357,9 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
                ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_NAME ) ||
                ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_STRING ) ) )
         {
-            OSL_TRACE( "analyseSQL : pAtom->count() = %d", pAtom->count() );
+            SAL_INFO(
+                "connectivity.evoab2",
+                "analyseSQL : pAtom->count() = " << pAtom->count());
             m_pConnection->throwGenericSQLException(STR_QUERY_INVALID_LIKE_STRING,*this);
         }
 
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 1b355cbcc793..02d08956a158 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1269,7 +1269,9 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
                     OSL_TRACE("OrderbyColumnNumber->size() = %zu",m_aOrderbyColumnNumber.size());
 #if OSL_DEBUG_LEVEL > 0
                     for ( ::std::vector<sal_Int32>::size_type i = 0; i < m_aColMapping.size(); i++ )
-                        OSL_TRACE("Mapped: %d -> %d", i, m_aColMapping[i] );
+                        SAL_INFO(
+                            "connectivity.mork",
+                            "Mapped: " << i << " -> " << m_aColMapping[i]);
 #endif
                     for ( sal_Int32 nRow = 1; nRow <= m_aQueryHelper.getResultCount(); nRow++ ) {
 
@@ -1292,7 +1294,9 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
                     m_CurrentRowCount = static_cast<sal_Int32>(m_pKeySet->get().size());
 #if OSL_DEBUG_LEVEL > 0
                     for( OKeySet::Vector::size_type i = 0; i < m_pKeySet->get().size(); i++ )
-                        OSL_TRACE("Sorted: %d -> %d", i, (m_pKeySet->get())[i] );
+                        SAL_INFO(
+                            "connectivity.mork",
+                            "Sorted: " << i << " -> " << (m_pKeySet->get())[i]);
 #endif
 
                     beforeFirst(); // Go back to start
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index a56c8445afc0..e0766cef8188 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -502,12 +502,16 @@ void OCommonStatement::createColumnMapping()
     // now check which columns are bound
 #if OSL_DEBUG_LEVEL > 0
     for ( i = 0; i < m_aColMapping.size(); i++ )
-        OSL_TRACE("BEFORE Mapped: %d -> %d", i, m_aColMapping[i] );
+        SAL_INFO(
+            "connectivity.mork",
+            "BEFORE Mapped: " << i << " -> " << m_aColMapping[i]);
 #endif
     OResultSet::setBoundedColumns(m_aRow,xColumns,xNames,true,m_xDBMetaData,m_aColMapping);
 #if OSL_DEBUG_LEVEL > 0
     for ( i = 0; i < m_aColMapping.size(); i++ )
-        OSL_TRACE("AFTER  Mapped: %d -> %d", i, m_aColMapping[i] );
+        SAL_INFO(
+            "connectivity.mork",
+            "AFTER  Mapped: " << i << " -> " << m_aColMapping[i]);
 #endif
 }