OSL_TRACE -> SAL_ in vcl

Change-Id: Icd317671a6b1b5356f0ccc7c59d50952fe20269b
Reviewed-on: https://gerrit.libreoffice.org/31667
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 13 insertions, 37 deletions

diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 3a8ef05bea2f..cc661fb839b9 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -540,13 +540,11 @@ void CUPSManager::setupJobContextData( JobData& rData )
 
 FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand )
 {
-    OSL_TRACE( "startSpool: %s, %s",
-               OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(),
-              bQuickCommand ? "true" : "false" );
+    SAL_INFO( "vcl", "startSpool: " << rPrintername << " " << (bQuickCommand ? "true" : "false") );
 
     if( m_aCUPSDestMap.find( rPrintername ) == m_aCUPSDestMap.end() )
     {
-        OSL_TRACE( "defer to PrinterInfoManager::startSpool" );
+        SAL_INFO( "vcl", "defer to PrinterInfoManager::startSpool" );
         return PrinterInfoManager::startSpool( rPrintername, bQuickCommand );
     }
 
@@ -619,11 +617,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner
 
 bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber )
 {
-    OSL_TRACE( "endSpool: %s, %s, copy count = %d",
-               OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(),
-               OUStringToOString( rJobTitle, RTL_TEXTENCODING_UTF8 ).getStr(),
-               rDocumentJobData.m_nCopies
-               );
+    SAL_INFO( "vcl", "endSpool: " << rPrintername << "," << rJobTitle << " copy count = " << rDocumentJobData.m_nCopies );
 
     int nJobID = 0;
 
@@ -633,7 +627,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi
         m_aCUPSDestMap.find( rPrintername );
     if( dest_it == m_aCUPSDestMap.end() )
     {
-        OSL_TRACE( "defer to PrinterInfoManager::endSpool" );
+        SAL_INFO( "vcl", "defer to PrinterInfoManager::endSpool" );
         return PrinterInfoManager::endSpool( rPrintername, rJobTitle, pFile, rDocumentJobData, bBanner, rFaxNumber );
     }
 
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 817db94ad9a5..72d7cfa297f7 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -717,56 +717,40 @@ PPDParser::PPDParser( const OUString& rFile ) :
     if( m_pImageableAreas )
         m_pDefaultImageableArea = m_pImageableAreas->getDefaultValue();
     if (m_pImageableAreas == nullptr) {
-        OSL_TRACE(
-            "Warning: no ImageableArea in %s\n",
-            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN( "vcl", "no ImageableArea in " << m_aFile);
     }
     if (m_pDefaultImageableArea == nullptr) {
-        OSL_TRACE(
-            "Warning: no DefaultImageableArea in %s\n",
-            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN( "vcl", "no DefaultImageableArea in " << m_aFile);
     }
 
     m_pPaperDimensions = getKey( OUString( "PaperDimension" ) );
     if( m_pPaperDimensions )
         m_pDefaultPaperDimension = m_pPaperDimensions->getDefaultValue();
     if (m_pPaperDimensions == nullptr) {
-        OSL_TRACE(
-            "Warning: no PaperDimensions in %s\n",
-            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN( "vcl", "no PaperDimensions in " << m_aFile);
     }
     if (m_pDefaultPaperDimension == nullptr) {
-        OSL_TRACE(
-            "Warning: no DefaultPaperDimensions in %s\n",
-            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN( "vcl", "no DefaultPaperDimensions in " << m_aFile);
     }
 
     m_pResolutions = getKey( OUString( "Resolution" ) );
     if( m_pResolutions )
         m_pDefaultResolution = m_pResolutions->getDefaultValue();
     if (m_pResolutions == nullptr) {
-        OSL_TRACE(
-            "Warning: no Resolution in %s\n",
-            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN( "vcl", "no Resolution in " << m_aFile);
     }
     if (m_pDefaultResolution == nullptr) {
-        OSL_TRACE(
-            "Warning: no DefaultResolution in %s\n",
-            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN( "vcl", "no DefaultResolution in " + m_aFile);
     }
 
     m_pInputSlots = getKey( OUString( "InputSlot" ) );
     if( m_pInputSlots )
         m_pDefaultInputSlot = m_pInputSlots->getDefaultValue();
     if (m_pInputSlots == nullptr) {
-        OSL_TRACE(
-            "Warning: no InputSlot in %s\n",
-            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN( "vcl", "no InputSlot in " << m_aFile);
     }
     if (m_pDefaultInputSlot == nullptr) {
-        OSL_TRACE(
-            "Warning: no DefaultInputSlot in %s\n",
-            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN( "vcl", "no DefaultInputSlot in " << m_aFile);
     }
 
     m_pDuplexTypes = getKey( OUString( "Duplex" ) );
@@ -775,9 +759,7 @@ PPDParser::PPDParser( const OUString& rFile ) :
 
     m_pFontList = getKey( OUString( "Font" ) );
     if (m_pFontList == nullptr) {
-        OSL_TRACE(
-            "Warning: no Font in %s\n",
-            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN( "vcl", "no Font in " << m_aFile);
     }
 
     // fill in direct values