[Libreoffice-commits] core.git: basic/source cui/source framework/source

[Thomas Arnhold]

 basic/source/classes/eventatt.cxx                     |   18 ++++++------------
 cui/source/customize/cfgutil.cxx                      |    8 +++-----
 framework/source/uielement/popuptoolbarcontroller.cxx |    8 ++------
 3 files changed, 11 insertions(+), 23 deletions(-)

New commits:
commit ea491d056d301b8b4507a2a2772cd09342284e56
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue May 27 12:31:13 2014 +0200

    OSL_TRACE -> SAL_INFO
    
    Change-Id: Ib9e1ed6119b5286871ac10136f7fcbefffe7aebe

diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 16fc4bd..ee75d0f 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -75,9 +75,7 @@ using namespace ::osl;
 
 void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Reference< frame::XModel >& xModel )
 {
-        OSL_TRACE("SFURL_firing_impl() processing script url %s",
-            OUStringToOString( aScriptEvent.ScriptCode,
-                RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+        SAL_INFO("basic", "Processing script url " << aScriptEvent.ScriptCode);
         try
         {
             Reference< provider::XScriptProvider > xScriptProvider;
@@ -102,7 +100,7 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere
 
             if ( !xScriptProvider.is() )
             {
-                OSL_TRACE("SFURL_firing_impl() Failed to create msp");
+                SAL_INFO("basic", "Failed to create msp");
                 return;
             }
             Sequence< Any > inArgs( 0 );
@@ -116,7 +114,7 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere
 
             if ( !xScript.is() )
             {
-                OSL_TRACE("SFURL_firing_impl() Failed to obtain XScript");
+                SAL_INFO("basic", "Failed to Failed to obtain XScript");
                 return;
             }
 
@@ -128,15 +126,11 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere
         }
         catch ( const RuntimeException& re )
         {
-            OSL_TRACE("SFURL_firing_impl() Caught RuntimeException reason %s.",
-                OUStringToOString( re.Message,
-                    RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+            SAL_INFO("basic", "Caught RuntimeException reason " << re.Message);
         }
         catch ( const Exception& e )
         {
-            OSL_TRACE("SFURL_firing_impl() Caught Exception reason %s.",
-                OUStringToOString( e.Message,
-                    RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+            SAL_INFO("basic", "Caught Exception reason " << e.Message);
         }
 
 }
@@ -491,7 +485,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite )
     css::uno::Reference< css::container::XNameContainer > aDlgLib;
     bool bDocDialog = false;
     StarBASIC* pFoundBasic = NULL;
-    OSL_TRACE("About to try get a hold of ThisComponent");
+    SAL_INFO("basic", "About to try get a hold of ThisComponent");
     Reference< frame::XModel > xModel = StarBASIC::GetModelFromBasic( GetSbData()->pInst->GetBasic() ) ;
     aDlgLib = implFindDialogLibForDialogBasic( aAnyISP, GetSbData()->pInst->GetBasic(), pFoundBasic );
     // If we found the dialog then it belongs to the Search basic
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 5e33fa6..787534a 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -582,7 +582,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent
         InitStyles();
     }
 
-    OSL_TRACE("** ** About to initialise SF Scripts");
+    SAL_INFO("cui.customize", "** ** About to initialise SF Scripts");
     // Add Scripting Framework entries
     Reference< browse::XBrowseNode > rootNode;
     Reference< XComponentContext > xCtx(
@@ -594,8 +594,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent
     }
     catch( Exception& e )
     {
-        OSL_TRACE(" Caught some exception whilst retrieving browse nodes from factory... Exception: %s",
-            OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+        SAL_INFO("cui.customize", "Caught some exception whilst retrieving browse nodes from factory... Exception: " << e.Message);
         // TODO exception handling
     }
 
@@ -770,8 +769,7 @@ Image SfxConfigGroupListBox::GetImage(
                     if ( pmoduleDescr[ pos ].Name == "ooSetupFactoryEmptyDocumentURL" )
                     {
                         pmoduleDescr[ pos ].Value >>= factoryURL;
-                        OSL_TRACE("factory url for doc images is %s",
-                        OUStringToOString( factoryURL , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+                        SAL_INFO("cui.customize", "factory url for doc images is " << factoryURL);
                         break;
                     }
                 }
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 8d09b35..e17a86b 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -142,9 +142,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
     }
     catch (const css::uno::Exception& e)
     {
-        OSL_TRACE( "PopupMenuToolbarController - caught an exception! %s",
-                   rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-        (void) e;
+        SAL_INFO( "framework.uielement", "Caught an exception: " << e.Message );
     }
 
     SolarMutexGuard aSolarLock;
@@ -244,9 +242,7 @@ void PopupMenuToolbarController::createPopupMenuController()
         catch ( const css::uno::Exception &e )
         {
             m_xPopupMenu.clear();
-            OSL_TRACE( "PopupMenuToolbarController - caught an exception! %s",
-                       OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-            (void) e;
+            SAL_INFO( "framework.uielement", "Caught an exception: " << e.Message );
         }
     }
 }