[Libreoffice-commits] core.git: cppuhelper/source

[Tor Lillqvist]

 cppuhelper/source/servicemanager.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 29e7b95e9cd24b5b3d436fd5cceac40d36b0ac02
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 10 20:04:02 2018 +0200

    Do use just std::cerr in cppuhelper::ServiceManager::preloadImplementations()
    
    As the 1aedb6c4345719a963a883b13fa983db3ab4b9a8 commit message said,
    the point is that we want this output even with a LO built for
    production where SAL_INFO() and SAL_WARN() are no-ops.
    
    Change-Id: I5f788c3914286ca8df2c7e290150adae0be42820

diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 7e2ad4db0440..eb2f1f9dfba7 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -11,6 +11,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iostream>
 #include <vector>
 
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -1838,16 +1839,16 @@ void cppuhelper::ServiceManager::preloadImplementations() {
             // Blacklist some components that are known to fail
             if (iterator->second->info->name == "com.sun.star.comp.configuration.backend.KDE4Backend")
             {
-                SAL_INFO("cppuhelper.preload", "Skipping " << iterator->second->info->name);
+                std::cerr << "preload: Skipping " << iterator->second->info->name << std::endl;
                 continue;
             }
 
             // load component library
-            SAL_INFO("cppuhelper.preload", "Loading " << aUri << " for " << iterator->second->info->name);
+            std::cerr << "preload: Loading " << aUri << " for " << iterator->second->info->name << std::endl;
             osl::Module aModule(aUri, SAL_LOADMODULE_NOW | SAL_LOADMODULE_GLOBAL);
 
             if (!aModule.is())
-                SAL_WARN("cppuhelper.preload", "Loading " << aUri << " for " << iterator->second->info->name << " failed");
+                std::cerr << "preload: Loading " << aUri << " for " << iterator->second->info->name << " failed" << std::endl;
 
             if (aModule.is() &&
                 !iterator->second->info->environment.isEmpty())