no need to use OUStringToOString in SAL_INFO

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

11 files changed, 29 insertions, 50 deletions

diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index ea8171ac6575..1416f5948555 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -41,8 +41,7 @@ void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest)
 {
     Reference<container::XNamed> xNamed (rxRequest, UNO_QUERY);
     if (xNamed.is())
-        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ":    " <<
-            OUStringToOString(xNamed->getName(), RTL_TEXTENCODING_UTF8).getStr());
+        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ":    " << xNamed->getName());
 }
 
 #endif
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 4909a8ee1a5d..593742e1deed 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -99,8 +99,7 @@ void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResour
     if (mpResourceContainer->find(rxResourceId) == mpResourceContainer->end())
     {
         SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Configuration::addResource() " <<
-            OUStringToOString(
-                FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+                FrameworkHelper::ResourceIdToString(rxResourceId));
         mpResourceContainer->insert(rxResourceId);
         PostEvent(rxResourceId, true);
     }
@@ -117,8 +116,7 @@ void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxRes
     if (iResource != mpResourceContainer->end())
     {
         SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Configuration::removeResource() " <<
-            OUStringToOString(
-                FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+                FrameworkHelper::ResourceIdToString(rxResourceId));
         PostEvent(rxResourceId,false);
         mpResourceContainer->erase(iResource);
     }
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index f0ed7671129e..4fd6ed2b6c4d 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -148,16 +148,14 @@ void ConfigurationClassifier::CopyResources (
         rTarget.push_back(*iResource);
 
         SAL_INFO("sd.fwk", OSL_THIS_FUNC << ":    copying " <<
-            OUStringToOString(FrameworkHelper::ResourceIdToString(*iResource),
-                RTL_TEXTENCODING_UTF8).getStr());
+            FrameworkHelper::ResourceIdToString(*iResource));
 
         const Reference<XResourceId>* aA = aBoundResources.getConstArray();
         for (sal_Int32 i=0; i<nL; ++i)
         {
             rTarget.push_back(aA[i]);
             SAL_INFO("sd.fwk", OSL_THIS_FUNC << ":    copying " <<
-                OUStringToOString(FrameworkHelper::ResourceIdToString(aA[i]),
-                    RTL_TEXTENCODING_UTF8).getStr());
+                FrameworkHelper::ResourceIdToString(aA[i]));
         }
     }
 }
@@ -174,8 +172,7 @@ void ConfigurationClassifier::TraceResourceIdVector (
     for (iResource=rResources.begin(); iResource!=rResources.end(); ++iResource)
     {
         OUString sResource (FrameworkHelper::ResourceIdToString(*iResource));
-        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " <<
-            OUStringToOString(sResource, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << sResource);
     }
 }
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index a9d451a8d4dd..fa1f75662a80 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -240,14 +240,12 @@ void SAL_CALL ConfigurationController::requestResourceActivation (
     if (rBHelper.bInDispose)
     {
         SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::requestResourceActivation(): ignoring " <<
-            OUStringToOString(
-                FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+                FrameworkHelper::ResourceIdToString(rxResourceId));
         return;
     }
 
     SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::requestResourceActivation() " <<
-        OUStringToOString(
-            FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+            FrameworkHelper::ResourceIdToString(rxResourceId));
 
     if (rxResourceId.is())
     {
@@ -290,8 +288,7 @@ void SAL_CALL ConfigurationController::requestResourceDeactivation (
     ThrowIfDisposed();
 
     SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::requestResourceDeactivation() " <<
-            OUStringToOString(
-                FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+                FrameworkHelper::ResourceIdToString(rxResourceId));
 
     if (rxResourceId.is())
     {
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index 394718cb0957..de2d7386fa45 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -108,16 +108,15 @@ void ConfigurationControllerResourceManager::ActivateResource (
        return;
    }
 
-    SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " << OUStringToOString(
-        FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " <<
+        FrameworkHelper::ResourceIdToString(rxResourceId));
 
     // 1. Get the factory.
     const OUString sResourceURL (rxResourceId->getResourceURL());
     Reference<XResourceFactory> xFactory (mpResourceFactoryContainer->GetFactory(sResourceURL));
     if ( ! xFactory.is())
     {
-        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ":    no factory found for " <<
-            OUStringToOString(sResourceURL, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ":    no factory found for " << sResourceURL);
         return;
     }
 
@@ -235,11 +234,11 @@ void ConfigurationControllerResourceManager::DeactivateResource (
 
 #if OSL_DEBUG_LEVEL >= 1
     if (bSuccess)
-        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": successfully deactivated " << OUStringToOString(
-            FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": successfully deactivated " <<
+            FrameworkHelper::ResourceIdToString(rxResourceId));
     else
-        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " << OUStringToOString(
-            FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr()
+        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " <<
+            FrameworkHelper::ResourceIdToString(rxResourceId)
             << " failed");
 #endif
 }
@@ -262,9 +261,8 @@ void ConfigurationControllerResourceManager::AddResource (
 
 #if OSL_DEBUG_LEVEL >= 2
     SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationControllerResourceManager::AddResource(): added " <<
-        OUStringToOString(
-            FrameworkHelper::ResourceIdToString(rxResource->getResourceId()),
-            RTL_TEXTENCODING_UTF8).getStr() << " -> " << rxResource.get());
+            FrameworkHelper::ResourceIdToString(rxResource->getResourceId()) <<
+            " -> " << rxResource.get());
 #endif
 }
 
@@ -279,9 +277,7 @@ ConfigurationControllerResourceManager::ResourceDescriptor
     {
 #if OSL_DEBUG_LEVEL >= 2
         SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationControllerResourceManager::RemoveResource(): removing " <<
-            OUStringToOString(
-                FrameworkHelper::ResourceIdToString(rxResourceId),
-                RTL_TEXTENCODING_UTF8).getStr() <<
+                FrameworkHelper::ResourceIdToString(rxResourceId) <<
                 " -> " << &iResource);
 #endif
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 79770425b02d..6c903675eec2 100644
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -62,7 +62,7 @@ void ConfigurationTracer::TraceBoundResources (
         OUString sLine (aResourceList[nIndex]->getResourceURL());
         for (int i=0; i<nIndentation; ++i)
             sLine = sIndentation + sLine;
-        SAL_INFO("sd.ui","" << OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_INFO("sd.ui", "" << sLine);
         TraceBoundResources(rxConfiguration, aResourceList[nIndex], nIndentation+1);
     }
 }
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 4535061fb7f7..81517fff0d04 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -320,9 +320,8 @@ void ConfigurationUpdater::CheckPureAnchors (
         if (bDeactiveCurrentResource)
         {
             SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": deactivating pure anchor " <<
-                OUStringToOString(
-                    FrameworkHelper::ResourceIdToString(xResourceId),
-                    RTL_TEXTENCODING_UTF8).getStr() << "because it has no children");
+                    FrameworkHelper::ResourceIdToString(xResourceId) <<
+                    "because it has no children");
             // Erase element from current configuration.
             for (sal_Int32 nI=nIndex; nI<nCount-2; ++nI)
                 aResources[nI] = aResources[nI+1];
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
index adf3ed13f5bf..15ce1e9fdfa0 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
@@ -92,9 +92,7 @@ void ResourceFactoryManager::AddFactory (
         maFactoryMap[rsURL] = rxFactory;
 
 #if defined VERBOSE && VERBOSE>=1
-        SAL_INFO("sd",("ResourceFactoryManager::AddFactory fixed %s %x\n",
-            OUStringToOString(rsURL, RTL_TEXTENCODING_UTF8).getStr(),
-            rxFactory.get());
+        SAL_INFO("sd", "ResourceFactoryManager::AddFactory fixed " << rsURL << " 0x" << std::hex << rxFactory.get());
 #endif
     }
 }
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 803758e0e5cb..564354cbc34d 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -128,16 +128,14 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues)
         "URL",
         aURLs);
 
-    SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::adding factory " <<
-        OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::adding factory " << sServiceName);
 
     // Add the resource URLs to the map.
     ::std::vector<OUString>::const_iterator iResource;
     for (iResource=aURLs.begin(); iResource!=aURLs.end(); ++iResource)
     {
         (*mpResourceToFactoryMap)[*iResource] = sServiceName;
-        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ":    " <<
-            OUStringToOString(*iResource, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ":    " << *iResource);
     }
 }
 
@@ -189,8 +187,7 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues)
         // at the configuration controller.
         xContext->getServiceManager()->createInstanceWithArgumentsAndContext(sServiceName, aArguments, xContext);
 
-        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::created startup service " <<
-            OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::created startup service " << sServiceName);
     }
     catch (Exception&)
     {
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 030bf6b8d515..73e87799e06a 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -688,8 +688,7 @@ void ToolBarManager::Implementation::PreUpdate()
         for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar)
         {
             OUString sFullName (GetToolBarResourceName(*iToolBar));
-            SAL_INFO("sd.view", OSL_THIS_FUNC << ":    turning off tool bar " <<
-                OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr());
+            SAL_INFO("sd.view", OSL_THIS_FUNC << ":    turning off tool bar " << sFullName);
             mxLayouter->destroyElement(sFullName);
             maToolBarList.MarkToolBarAsNotActive(*iToolBar);
         }
@@ -719,8 +718,7 @@ void ToolBarManager::Implementation::PostUpdate()
         for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar)
         {
             OUString sFullName (GetToolBarResourceName(*iToolBar));
-            SAL_INFO("sd.view", OSL_THIS_FUNC << ":    turning on tool bar " <<
-                OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr());
+            SAL_INFO("sd.view", OSL_THIS_FUNC << ":    turning on tool bar " << sFullName);
             mxLayouter->requestElement(sFullName);
             maToolBarList.MarkToolBarAsActive(*iToolBar);
         }
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 367bdb460682..8990f5aa76ef 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -1149,7 +1149,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack)
         if (*iEntry != NULL)
             SAL_INFO("sd.view", OSL_THIS_FUNC << ":    " <<
                 *iEntry << " : " <<
-                OUStringToOString((*iEntry)->GetName(),RTL_TEXTENCODING_UTF8).getStr());
+                (*iEntry)->GetName());
         else
             SAL_INFO("sd.view", OSL_THIS_FUNC << "     null");
 }