Kaydet (Commit) 29e7b95e authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Do use just std::cerr in cppuhelper::ServiceManager::preloadImplementations()

As the 1aedb6c4 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
üst 4a114d62
......@@ -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())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment