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>

8 files changed, 52 insertions, 114 deletions

diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index cfb96ea58c2f..915ff3728c03 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -311,7 +311,7 @@ void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // cons
     const SalDisplay *pDisplay = GetDisplay();
     if (!pDisplay)
     {
-        OSL_TRACE("Null display");
+        SAL_WARN( "vcl", "Null display");
         rDPIX = rDPIY = 96;
         return;
     }
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 73ac6664c89a..460247a60fca 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -874,7 +874,7 @@ bool PspSalPrinter::StartJob(
     bool bDirect,
     ImplJobSetup* pJobSetup )
 {
-    OSL_TRACE("PspSalPrinter::StartJob");
+    SAL_INFO( "vcl", "PspSalPrinter::StartJob");
     GetSalData()->m_pInstance->jobStartedPrinterUpdate();
     m_bPdf      = false;
     if (pFileName)
@@ -931,7 +931,7 @@ bool PspSalPrinter::EndJob()
     else
     {
         bSuccess = m_aPrintJob.EndJob();
-        OSL_TRACE("PspSalPrinter::EndJob %d", bSuccess);
+        SAL_INFO( "vcl", "PspSalPrinter::EndJob " << bSuccess);
 
         if( bSuccess && m_bPdf )
         {
@@ -945,7 +945,7 @@ bool PspSalPrinter::EndJob()
 
 SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, bool )
 {
-    OSL_TRACE("PspSalPrinter::StartPage");
+    SAL_INFO( "vcl", "PspSalPrinter::StartPage");
 
     JobData::constructFromStreamBuffer( pJobSetup->GetDriverData(), pJobSetup->GetDriverDataLen(), m_aJobData );
     m_pGraphics = GetGenericInstance()->CreatePrintGraphics();
@@ -969,7 +969,7 @@ void PspSalPrinter::EndPage()
 {
     m_aPrintJob.EndPage();
     m_aPrinterGfx.Clear();
-    OSL_TRACE("PspSalPrinter::EndPage");
+    SAL_INFO( "vcl", "PspSalPrinter::EndPage");
 }
 
 sal_uLong PspSalPrinter::GetErrorCode()
@@ -1016,7 +1016,7 @@ struct PDFPrintFile
 bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName,
                               ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController )
 {
-    OSL_TRACE( "StartJob with controller: pFilename = %s", i_pFileName ? OUStringToOString( *i_pFileName, RTL_TEXTENCODING_UTF8 ).getStr() : "<nil>" );
+    SAL_INFO( "vcl", "StartJob with controller: pFilename = " << (i_pFileName ? *i_pFileName : "<nil>") );
     // mark for endjob
     m_bIsPDFWriterJob = true;
     // reset IsLastPage
@@ -1259,7 +1259,7 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo
         for(PDFPrintFile & rPDFFile : aPDFFiles)
         {
             osl_removeFile( rPDFFile.maTmpURL.pData );
-            OSL_TRACE( "removed print PDF file %s", OUStringToOString( rPDFFile.maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+            SAL_INFO( "vcl", "removed print PDF file " << rPDFFile.maTmpURL );
         }
     }
 
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
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index e6633e803eed..7d122b1d02aa 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -152,8 +152,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
             setLabel( CHECKBOX_##elem, aLabel ); \
             break
 
-          switch( i ) {
-
+        switch( i ) {
         LABEL_TOGGLE( AUTOEXTENSION );
         LABEL_TOGGLE( PASSWORD );
         LABEL_TOGGLE( FILTEROPTIONS );
@@ -161,9 +160,9 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
         LABEL_TOGGLE( LINK );
         LABEL_TOGGLE( PREVIEW );
         LABEL_TOGGLE( SELECTION );
-            default:
-                OSL_TRACE("Handle unknown control %d", i);
-                break;
+        default:
+            SAL_WARN( "vcl", "Handle unknown control " << i);
+            break;
         }
 
         gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], false, false, 0 );
@@ -198,7 +197,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
             LABEL_LIST( TEMPLATE );
             LABEL_LIST( IMAGE_TEMPLATE );
             default:
-                OSL_TRACE("Handle unknown control %d", i);
+                SAL_WARN( "vcl", "Handle unknown control " << i);
                 break;
         }
 
@@ -303,19 +302,16 @@ void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<X
 
 void SalGtkFilePicker::impl_fileSelectionChanged( const FilePickerEvent& aEvent )
 {
-    OSL_TRACE( "file selection changed");
     if (m_xListener.is()) m_xListener->fileSelectionChanged( aEvent );
 }
 
 void SalGtkFilePicker::impl_directoryChanged( const FilePickerEvent& aEvent )
 {
-    OSL_TRACE("directory changed");
     if (m_xListener.is()) m_xListener->directoryChanged( aEvent );
 }
 
 void SalGtkFilePicker::impl_controlStateChanged( const FilePickerEvent& aEvent )
 {
-    OSL_TRACE("control state changed");
     if (m_xListener.is()) m_xListener->controlStateChanged( aEvent );
 }
 
@@ -552,16 +548,10 @@ void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle )
 
     OSL_ASSERT( m_pDialog != nullptr );
 
-    OSL_TRACE( "Setting current filter to %s\n",
-        OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ).getStr() );
-
     if( aTitle != m_aCurrentFilter )
     {
         m_aCurrentFilter = aTitle;
         SetCurFilter( m_aCurrentFilter );
-        OSL_TRACE( "REALLY Setting current filter to %s\n",
-            OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ).getStr() );
-
     }
 
     // TODO m_pImpl->setCurrentFilter( aTitle );
@@ -617,13 +607,8 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept
 
     OSL_ASSERT( m_pDialog != nullptr );
 
-    OSL_TRACE( "GetCURRENTfilter" );
-
     UpdateFilterfromUI();
 
-    OSL_TRACE( "Returning current filter of %s\n",
-        OUStringToOString( m_aCurrentFilter, RTL_TEXTENCODING_UTF8 ).getStr() );
-
     return m_aCurrentFilter;
 }
 
@@ -741,7 +726,6 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
 
     int nCount = g_slist_length( pPathList );
     int nIndex = 0;
-    OSL_TRACE( "GETFILES called %d files", nCount );
 
     // get the current action setting
     GtkFileChooserAction eAction = gtk_file_chooser_get_action(
@@ -824,9 +808,6 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
                     sFilterName = m_aInitialFilter;
             }
 
-            OSL_TRACE( "2: current filter is %s\n",
-                OUStringToOString( sFilterName, RTL_TEXTENCODING_UTF8 ).getStr() );
-
             if (m_pFilterList)
             {
                 FilterList::iterator aListIter = ::std::find_if(
@@ -836,9 +817,6 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
                 if (aListIter != m_pFilterList->end())
                     aFilter = aListIter->getFilter();
 
-                OSL_TRACE( "turned into %s\n",
-                           OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr() );
-
                 nTokenIndex = 0;
                 OUString sToken;
                 do
@@ -896,7 +874,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
 {
     SolarMutexGuard g;
 
-    OSL_TRACE( "1: HERE WE ARE");
     OSL_ASSERT( m_pDialog != nullptr );
 
     sal_Int16 retVal = 0;
@@ -1041,7 +1018,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
                 {
                     FilePickerEvent evt;
                     evt.ElementId = PUSHBUTTON_PLAY;
-                    OSL_TRACE( "filter_changed, isn't it great %p", this);
                     impl_controlStateChanged( evt );
                     btn = GTK_RESPONSE_NO;
                 }
@@ -1065,7 +1041,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
 // cf. offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl
 GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
 {
-    OSL_TRACE("control id is %d", nControlId);
     GType      tType = GTK_TYPE_TOGGLE_BUTTON; //prevent warning by initializing
     GtkWidget *pWidget = nullptr;
 
@@ -1103,7 +1078,7 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
         MAP_LIST_LABEL( TEMPLATE );
         MAP_LIST_LABEL( IMAGE_TEMPLATE );
     default:
-        OSL_TRACE("Handle unknown control %d", nControlId);
+        SAL_WARN( "vcl", "Handle unknown control " << nControlId);
         break;
     }
 #undef MAP
@@ -1191,7 +1166,7 @@ void SalGtkFilePicker::HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nContr
             }
             break;
         default:
-            OSL_TRACE("undocumented/unimplemented ControlAction for a list");
+            SAL_WARN( "vcl", "undocumented/unimplemented ControlAction for a list " << nControlAction);
             break;
     }
 
@@ -1253,7 +1228,7 @@ uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nC
             }
             break;
         default:
-            OSL_TRACE("undocumented/unimplemented ControlAction for a list");
+            SAL_WARN( "vcl", "undocumented/unimplemented ControlAction for a list " << nControlAction);
             break;
     }
     return aAny;
@@ -1266,12 +1241,11 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr
 
     OSL_ASSERT( m_pDialog != nullptr );
 
-    OSL_TRACE( "SETTING VALUE %d", nControlAction );
     GType tType;
     GtkWidget *pWidget;
 
     if( !( pWidget = getWidget( nControlId, &tType ) ) )
-        OSL_TRACE("enable unknown control %d", nControlId);
+        SAL_WARN( "vcl", "enable unknown control " << nControlId);
     else if( tType == GTK_TYPE_TOGGLE_BUTTON )
     {
         bool bChecked = false;
@@ -1282,8 +1256,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr
         HandleSetListValue(GTK_COMBO_BOX(pWidget), nControlAction, rValue);
     else
     {
-        OSL_TRACE("Can't set value on button / list %d %d\n",
-            nControlId, nControlAction);
+        SAL_WARN( "vcl", "Can't set value on button / list " << nControlId << " " << nControlAction );
     }
 }
 
@@ -1300,14 +1273,13 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC
     GtkWidget *pWidget;
 
     if( !( pWidget = getWidget( nControlId, &tType ) ) )
-        OSL_TRACE("enable unknown control %d", nControlId);
+        SAL_WARN( "vcl", "enable unknown control " << nControlId);
     else if( tType == GTK_TYPE_TOGGLE_BUTTON )
         aRetval <<= bool( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( pWidget ) ) );
     else if( tType == GTK_TYPE_COMBO_BOX )
         aRetval = HandleGetListValue(GTK_COMBO_BOX(pWidget), nControlAction);
     else
-        OSL_TRACE("Can't get value on button / list %d %d\n",
-            nControlId, nControlAction );
+        SAL_WARN( "vcl", "Can't get value on button / list " << nControlId << " " << nControlAction );
 
     return aRetval;
 }
@@ -1325,17 +1297,15 @@ throw( uno::RuntimeException, std::exception )
     {
         if( bEnable )
         {
-            OSL_TRACE( "enable" );
             gtk_widget_set_sensitive( pWidget, true );
         }
         else
         {
-            OSL_TRACE( "disable" );
             gtk_widget_set_sensitive( pWidget, false );
         }
     }
     else
-        OSL_TRACE("enable unknown control %d", nControlId );
+        SAL_WARN( "vcl", "enable unknown control " << nControlId );
 }
 
 void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel )
@@ -1350,7 +1320,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString&
 
     if( !( pWidget = getWidget( nControlId, &tType ) ) )
     {
-          OSL_TRACE("Set label on unknown control %d", nControlId);
+        SAL_WARN( "vcl", "Set label on unknown control " << nControlId);
         return;
     }
 
@@ -1372,7 +1342,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString&
         g_object_set( pWidget, "label", aTxt.getStr(),
                       "use_underline", true, nullptr );
     else
-        OSL_TRACE("Can't set label on list");
+        SAL_WARN( "vcl", "Can't set label on list");
 }
 
 OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
@@ -1387,11 +1357,11 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
     GtkWidget *pWidget;
 
     if( !( pWidget = getWidget( nControlId, &tType ) ) )
-        OSL_TRACE("Get label on unknown control %d", nControlId);
+        SAL_WARN( "vcl", "Get label on unknown control " << nControlId);
     else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
         aTxt = gtk_button_get_label( GTK_BUTTON( pWidget ) );
     else
-        OSL_TRACE("Can't get label on list");
+        SAL_WARN( "vcl", "Can't get label on list");
 
     return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 );
 }
@@ -1488,21 +1458,21 @@ void SalGtkFilePicker::filter_changed_cb( GtkFileChooser *, GParamSpec *,
 {
     FilePickerEvent evt;
     evt.ElementId = LISTBOX_FILTER;
-    OSL_TRACE( "filter_changed, isn't it great %p", pobjFP );
+    SAL_INFO( "vcl", "filter_changed, isn't it great " << pobjFP );
     pobjFP->impl_controlStateChanged( evt );
 }
 
 void SalGtkFilePicker::folder_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP )
 {
     FilePickerEvent evt;
-    OSL_TRACE( "folder_changed, isn't it great %p", pobjFP );
+    SAL_INFO( "vcl", "folder_changed, isn't it great " << pobjFP );
     pobjFP->impl_directoryChanged( evt );
 }
 
 void SalGtkFilePicker::selection_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP )
 {
     FilePickerEvent evt;
-    OSL_TRACE( "selection_changed, isn't it great %p", pobjFP );
+    SAL_INFO( "vcl", "selection_changed, isn't it great " << pobjFP );
     pobjFP->impl_fileSelectionChanged( evt );
 }
 
@@ -1615,18 +1585,15 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
         case FILEOPEN_SIMPLE:
             eAction = GTK_FILE_CHOOSER_ACTION_OPEN;
             first_button_text = GTK_STOCK_OPEN;
-            OSL_TRACE( "3all true" );
             break;
         case FILESAVE_SIMPLE:
             eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
             first_button_text = GTK_STOCK_SAVE;
-            OSL_TRACE( "2all true" );
                 break;
         case FILESAVE_AUTOEXTENSION_PASSWORD:
             eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
             first_button_text = GTK_STOCK_SAVE;
             mbToggleVisibility[PASSWORD] = true;
-            OSL_TRACE( "1all true" );
             // TODO
             break;
         case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS:
@@ -1634,21 +1601,18 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
             first_button_text = GTK_STOCK_SAVE;
             mbToggleVisibility[PASSWORD] = true;
             mbToggleVisibility[FILTEROPTIONS] = true;
-            OSL_TRACE( "4all true" );
             // TODO
                 break;
         case FILESAVE_AUTOEXTENSION_SELECTION:
             eAction = GTK_FILE_CHOOSER_ACTION_SAVE; // SELECT_FOLDER ?
             first_button_text = GTK_STOCK_SAVE;
             mbToggleVisibility[SELECTION] = true;
-            OSL_TRACE( "5all true" );
             // TODO
                 break;
         case FILESAVE_AUTOEXTENSION_TEMPLATE:
             eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
             first_button_text = GTK_STOCK_SAVE;
             mbListVisibility[TEMPLATE] = true;
-            OSL_TRACE( "6all true" );
             // TODO
                 break;
         case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE:
@@ -1688,7 +1652,6 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
         case FILESAVE_AUTOEXTENSION:
             eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
             first_button_text = GTK_STOCK_SAVE;
-            OSL_TRACE( "7all true" );
             // TODO
                 break;
         case FILEOPEN_PREVIEW:
@@ -1784,7 +1747,7 @@ void SalGtkFilePicker::SetCurFilter( const OUString& rFilter )
         OUString aShrunkName = shrinkFilterName( rFilter );
         if( aShrunkName.equals( sFilterName) )
         {
-            OSL_TRACE( "actually setting %s", filtername );
+            SAL_INFO( "vcl", "actually setting " << filtername );
             gtk_file_chooser_set_filter( GTK_FILE_CHOOSER( m_pDialog ), pFilter );
             bFound = true;
         }
@@ -1855,7 +1818,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
                     g_strdup( OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ),
                     g_free );
 
-                OSL_TRACE( "fustering with %s", OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr());
+                SAL_INFO( "vcl", "fustering with " << aToken );
             }
 #if OSL_DEBUG_LEVEL > 0
             else
@@ -1973,7 +1936,7 @@ void SalGtkFilePicker::SetFilters()
     else if(!m_aCurrentFilter.isEmpty())
         SetCurFilter( m_aCurrentFilter );
 
-    OSL_TRACE( "end setting filters");
+    SAL_INFO( "vcl", "end setting filters");
 }
 
 SalGtkFilePicker::~SalGtkFilePicker()
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 1f2e46bb7dab..cedbd5a20f1d 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -77,7 +77,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirector
     if( aTxt.endsWith("/") )
         aTxt = aTxt.copy( 0, aTxt.getLength() - 1 );
 
-    OSL_TRACE( "setting path to %s", aTxt.getStr() );
+    SAL_INFO( "vcl", "setting path to " << aTxt );
 
     gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ),
         aTxt.getStr() );
@@ -133,7 +133,6 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s
 {
     SolarMutexGuard g;
 
-    OSL_TRACE( "1: HERE WE ARE");
     OSL_ASSERT( m_pDialog != nullptr );
 
     sal_Int16 retVal = 0;
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index dbbec941ce23..c710bb0ea9d6 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -213,7 +213,7 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory
     if( aTxt.endsWith("/") )
         aTxt = aTxt.copy( 0, aTxt.getLength() - 1 );
 
-    OSL_TRACE( "setting path to %s", aTxt.getStr() );
+    SAL_INFO( "vcl", "setting path to " << aTxt );
 
     gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ),
         aTxt.getStr() );
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index bf366ab551f8..567648a90833 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -446,7 +446,7 @@ void SAL_CALL KDE4FilePicker::setValue( sal_Int16 controlId, sal_Int16 nControlA
             cb->setChecked(value.get<bool>());
     }
     else
-        OSL_TRACE( "set label on unknown control %d", controlId );
+        SAL_WARN( "vcl", "set label on unknown control " << controlId );
 }
 
 uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 nControlAction )
@@ -472,7 +472,7 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 nCont
             res = uno::Any(cb->isChecked());
     }
     else
-        OSL_TRACE( "get value on unknown control %d", controlId );
+        SAL_WARN( "vcl", "get value on unknown control " << controlId );
 
     return res;
 }
@@ -488,7 +488,7 @@ void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enabl
     if (_customWidgets.contains( controlId ))
         _customWidgets.value( controlId )->setEnabled( enable );
     else
-        OSL_TRACE("enable unknown control %d", controlId );
+        SAL_WARN( "vcl", "enable unknown control " << controlId );
 }
 
 void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &label )
@@ -505,7 +505,7 @@ void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &lab
             cb->setText( toQString(label) );
     }
     else
-        OSL_TRACE( "set label on unknown control %d", controlId );
+        SAL_WARN( "vcl", "set label on unknown control " << controlId );
 }
 
 OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
@@ -523,7 +523,7 @@ OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
             label = cb->text();
     }
     else
-        OSL_TRACE( "get label on unknown control %d", controlId );
+        SAL_WARN( "vcl", "get label on unknown control " << controlId );
 
     return toOUString(label);
 }
@@ -818,7 +818,7 @@ void KDE4FilePicker::filterChanged(const QString &)
 {
     FilePickerEvent aEvent;
     aEvent.ElementId = LISTBOX_FILTER;
-    OSL_TRACE( "filter changed" );
+    SAL_INFO( "vcl", "filter changed" );
     if (m_xListener.is())
         m_xListener->controlStateChanged( aEvent );
 }
@@ -826,7 +826,7 @@ void KDE4FilePicker::filterChanged(const QString &)
 void KDE4FilePicker::selectionChanged()
 {
     FilePickerEvent aEvent;
-    OSL_TRACE( "file selection changed" );
+    SAL_INFO( "vcl", "file selection changed" );
     if (m_xListener.is())
         m_xListener->fileSelectionChanged( aEvent );
 }