OSL_TRACE -> SAL in sw..ucb

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

5 files changed, 18 insertions, 32 deletions

diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 6219648d513c..8e28a28175d9 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -51,7 +51,7 @@ VCLXTabPageContainer::VCLXTabPageContainer() :
 
 VCLXTabPageContainer::~VCLXTabPageContainer()
 {
-    OSL_TRACE ("%s", __FUNCTION__);
+    SAL_INFO("toolkit", __FUNCTION__);
 }
 
 void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, sal_Int32 nY ) throw(RuntimeException, std::exception)
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index b5dbe26218ae..28338f151110 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1413,10 +1413,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::createSystemChild( con
             catch ( const css::uno::RuntimeException & rEx )
             {
                 // system child window could not be created
-                OSL_TRACE(
-                    "VCLXToolkit::createSystemChild: caught %s\n",
-                    OUStringToOString(
-                        rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
+                SAL_WARN("toolkit", "caught " << rEx.Message);
                 pChildWindow.clear();
             }
         }
@@ -1821,10 +1818,7 @@ void VCLXToolkit::callTopWindowListeners(
                 }
                 catch (const css::uno::RuntimeException & rEx)
                 {
-                    OSL_TRACE(
-                        "VCLXToolkit::callTopWindowListeners: caught %s\n",
-                        OUStringToOString(
-                            rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
+                    SAL_WARN("toolkit", "caught " << rEx.Message);
                 }
             }
         }
@@ -1869,10 +1863,7 @@ bool VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent,
             }
             catch (const css::uno::RuntimeException & rEx)
             {
-                OSL_TRACE(
-                    "VCLXToolkit::callKeyHandlers: caught %s\n",
-                    OUStringToOString(
-                       rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
+                SAL_WARN("toolkit", "caught " << rEx.Message);
             }
         }
     }
@@ -1918,10 +1909,7 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent,
                 }
                 catch (const css::uno::RuntimeException & rEx)
                 {
-                    OSL_TRACE(
-                        "VCLXToolkit::callFocusListeners: caught %s\n",
-                        OUStringToOString(
-                            rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
+                    SAL_WARN("toolkit", "caught " << rEx.Message);
                 }
             }
         }
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 1acff4ecfd33..892391650d45 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2243,12 +2243,12 @@ void VCLXDialog::GetPropertyIds( std::vector< sal_uInt16 > &rIds )
 
 VCLXDialog::VCLXDialog()
 {
-    OSL_TRACE("XDialog created");
+    SAL_INFO("toolkit", "XDialog created");
 }
 
 VCLXDialog::~VCLXDialog()
 {
-    OSL_TRACE ("%s", __FUNCTION__);
+    SAL_INFO("toolkit", __FUNCTION__);
 }
 
 // css::uno::XInterface
@@ -2418,7 +2418,7 @@ throw(css::uno::RuntimeException, std::exception)
 
 VCLXMultiPage::VCLXMultiPage() : maTabListeners( *this ), mTabId( 1 )
 {
-    OSL_TRACE("VCLXMultiPage::VCLXMultiPage()" );
+    SAL_INFO("toolkit", "VCLXMultiPage::VCLXMultiPage()" );
 }
 
 void VCLXMultiPage::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
@@ -2498,10 +2498,8 @@ throw(css::uno::RuntimeException, std::exception)
 
 uno::Any SAL_CALL VCLXMultiPage::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
 {
+    SAL_INFO("toolkit", " **** VCLXMultiPage::getProperty " << PropertyName );
     SolarMutexGuard aGuard;
-    OSL_TRACE(" **** VCLXMultiPage::getProperty( %s )",
-        OUStringToOString( PropertyName,
-        RTL_TEXTENCODING_UTF8 ).getStr() );
     css::uno::Any aProp;
     sal_uInt16 nPropType = GetPropertyId( PropertyName );
     switch ( nPropType )
@@ -2523,8 +2521,8 @@ void SAL_CALL VCLXMultiPage::setProperty(
     const css::uno::Any& Value )
 throw(css::uno::RuntimeException, std::exception)
 {
+    SAL_INFO("toolkit", " **** VCLXMultiPage::setProperty " << PropertyName );
     SolarMutexGuard aGuard;
-    OSL_TRACE(" **** VCLXMultiPage::setProperty( %s )", OUStringToOString( PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() );
 
     VclPtr< TabControl > pTabControl = GetAs< TabControl >();
     if ( pTabControl )
@@ -2536,7 +2534,7 @@ throw(css::uno::RuntimeException, std::exception)
         {
             case BASEPROPERTY_MULTIPAGEVALUE:
             {
-                OSL_TRACE("***MULTIPAGE VALUE");
+                SAL_INFO("toolkit", "***MULTIPAGE VALUE");
                 sal_Int32 nId(0);
                 Value >>= nId;
                 // when the multipage is created we attempt to set the activepage
@@ -4153,7 +4151,7 @@ VCLXComboBox::VCLXComboBox()
 
 VCLXComboBox::~VCLXComboBox()
 {
-    OSL_TRACE ("%s", __FUNCTION__);
+    SAL_INFO("toolkit", __FUNCTION__);
 }
 
 css::uno::Reference< css::accessibility::XAccessibleContext > VCLXComboBox::CreateAccessibleContext()
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 32a80af35cc4..1294f41cef3f 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -113,7 +113,7 @@ struct DisposeControlModel : public ::std::unary_function< Reference< XControlMo
         }
         catch (const Exception&)
         {
-            OSL_TRACE( "DisposeControlModel::(): caught an exception while disposing a component!" );
+            SAL_WARN("toolkit", "caught an exception while disposing a component!" );
         }
     }
 };
@@ -667,7 +667,7 @@ sal_Bool SAL_CALL ControlModelContainerBase::getGroupControl(  ) throw (RuntimeE
 
 void SAL_CALL ControlModelContainerBase::setGroupControl( sal_Bool ) throw (RuntimeException, std::exception)
 {
-    OSL_TRACE( "ControlModelContainerBase::setGroupControl: explicit grouping not supported" );
+    SAL_WARN("toolkit", "explicit grouping not supported" );
 }
 
 
@@ -763,7 +763,7 @@ void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XC
     // We only have a sequence of control models, and we _know_ (yes, that's a HACK relying on
     // implementation details) that VCL does grouping according to the order of controls automatically
     // At least VCL does this for all we're interested in: Radio buttons.
-    OSL_TRACE( "ControlModelContainerBase::setGroup: grouping not supported" );
+    SAL_WARN("toolkit", "grouping not supported" );
 }
 
 ////----- XInitialization -------------------------------------------------------------------
@@ -842,7 +842,7 @@ namespace
         }
         catch (const Exception&)
         {
-            OSL_TRACE( "lcl_getDialogStep: caught an exception while determining the dialog page!" );
+            SAL_WARN("toolkit", "caught an exception while determining the dialog page!" );
         }
         return nStep;
     }
@@ -867,7 +867,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence<
 
     if ( ( _nGroup < 0 ) || ( _nGroup >= (sal_Int32)maGroups.size() ) )
     {
-        OSL_TRACE( "ControlModelContainerBase::getGroup: invalid argument and I am not allowed to throw an exception!" );
+        SAL_WARN("toolkit", "invalid argument and I am not allowed to throw an exception!" );
         _rGroup.realloc( 0 );
         _rName.clear();
     }
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index d4ecae320b20..6603e86caa4a 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -125,7 +125,7 @@ bool StdTabController::ImplCreateComponentSequence(
         }
         else
         {
-            OSL_TRACE( "ImplCreateComponentSequence: Control not found" );
+            SAL_WARN("toolkit", "Control not found" );
             bOK = false;
         }
     }