[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/defaultbootstrap.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 015283bb50e8d0d8127ea7c06deda202441f051e
Author: Stephan Bergmann
Date: Mon Apr 23 18:41:29 2012 +0200
Trying to parse legacy rdb as XML can cause InvalidRegistryException, too
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index a11f220..f156ce1 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1276,9 +1276,11 @@ void ServiceManager::readRdbFile(rtl::OUString const &
uri, bool optional) {
}
SAL_INFO("cppuhelper", "Ignored optional " << uri);
} catch (css::registry::InvalidRegistryException & e) {
-throw css::uno::DeploymentException(
-"InvalidRegistryException: " + e.Message,
-static_cast< cppu::OWeakObject * >(this));
+if (!readLegacyRdbFile(uri)) {
+throw css::uno::DeploymentException(
+"InvalidRegistryException: " + e.Message,
+static_cast< cppu::OWeakObject * >(this));
+}
} catch (css::uno::RuntimeException &) {
if (!readLegacyRdbFile(uri)) {
throw;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/defaultbootstrap.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 0bbf79005a697c6781047c01f05eb660836a18e1
Author: Stephan Bergmann
Date: Mon Apr 23 11:47:45 2012 +0200
Do not fail for legacy rdb that only contains root key
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index 4921011..a11f220 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1318,7 +1318,12 @@ bool ServiceManager::readLegacyRdbFile(rtl::OUString
const & uri) {
static_cast< cppu::OWeakObject * >(this));
}
RegistryKeyArray impls;
-if (rootKey.openSubKeys("IMPLEMENTATIONS", impls) != REG_NO_ERROR) {
+switch (rootKey.openSubKeys("IMPLEMENTATIONS", impls)) {
+case REG_NO_ERROR:
+break;
+case REG_KEY_NOT_EXISTS:
+return true;
+default:
throw css::uno::DeploymentException(
"Failure reading legacy rdb file " + uri,
static_cast< cppu::OWeakObject * >(this));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/defaultbootstrap.cxx |6 +++---
cppuhelper/source/servicefactory.cxx|2 +-
cppuhelper/source/servicefactory_detail.hxx |1 +
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 18a9e9e844d2f3ebad52e6c45095e3c50422db1a
Author: Stephan Bergmann
Date: Fri Apr 20 23:37:14 2012 +0200
Various clean up of previous commit
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index 8698f25..4921011 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1268,7 +1268,7 @@ void ServiceManager::readRdbFile(rtl::OUString const &
uri, bool optional) {
try {
Parser(
uri, css::uno::Reference< css::uno::XComponentContext >(), &data_);
-} catch (css::container::NoSuchElementException &SB) {
+} catch (css::container::NoSuchElementException &) {
if (!optional) {
throw css::uno::DeploymentException(
uri + ": no such file",
@@ -1279,7 +1279,7 @@ void ServiceManager::readRdbFile(rtl::OUString const &
uri, bool optional) {
throw css::uno::DeploymentException(
"InvalidRegistryException: " + e.Message,
static_cast< cppu::OWeakObject * >(this));
-} catch (css::uno::RuntimeException &SB) {
+} catch (css::uno::RuntimeException &) {
if (!readLegacyRdbFile(uri)) {
throw;
}
@@ -1593,7 +1593,7 @@ bool ServiceManager::removeLegacyFactory(
css::uno::Reference< css::lang::XComponent > comp;
{
osl::MutexGuard g(rBHelper.rMutex);
-DynamicImplementations::const_iterator i(
+DynamicImplementations::iterator i(
data_.dynamicImplementations.find(factoryInfo));
if (i == data_.dynamicImplementations.end()) {
return isDisposed();
diff --git a/cppuhelper/source/servicefactory.cxx
b/cppuhelper/source/servicefactory.cxx
index 2b7c9ed..062e7ff 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -374,7 +374,7 @@ void addFactories(
} // namespace
-SAL_DLLPUBLIC_EXPORT Reference< lang::XMultiComponentFactory >
bootstrapInitialSF(
+Reference< lang::XMultiComponentFactory > bootstrapInitialSF(
OUString const & rBootstrapPath )
SAL_THROW( (Exception) )
{
diff --git a/cppuhelper/source/servicefactory_detail.hxx
b/cppuhelper/source/servicefactory_detail.hxx
index 89485b5..607bb58 100644
--- a/cppuhelper/source/servicefactory_detail.hxx
+++ b/cppuhelper/source/servicefactory_detail.hxx
@@ -53,6 +53,7 @@ void add_access_control_entries(
rtl::Bootstrap const & bootstrap)
SAL_THROW((com::sun::star::uno::Exception));
+SAL_DLLPUBLIC_EXPORT
com::sun::star::uno::Reference< com::sun::star::lang::XMultiComponentFactory >
bootstrapInitialSF(rtl::OUString const & rBootstrapPath)
SAL_THROW((com::sun::star::uno::Exception));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/bootstrap.cxx |2 +-
cppuhelper/source/macro_expander.cxx |8 +++-
cppuhelper/source/macro_expander.hxx |9 +
cppuhelper/source/servicefactory.cxx |8
4 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit a26c2ee3c9ca783f0281dc0dd87c1747daac63a6
Author: Stephan Bergmann
Date: Wed Apr 18 15:59:58 2012 +0200
Put create_bootstrap_macro_expander_factory properly into a header
...and fix the typo in its name.
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index fad335b..783f647 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -100,7 +100,7 @@ Bootstrap const & get_unorc() SAL_THROW(())
{
#ifdef ANDROID
// Wouldn't it be lovely to avoid this fugly hard-coding.
-// The problem is that the 'create_boostrap_macro_expander_factory()'
+// The problem is that the 'create_bootstrap_macro_expander_factory()'
// required for bootstrapping services, calls cppu::get_unorc directly
// instead of re-using the BoostrapHandle from:
// defaultBootstrap_InitialComponentContext
diff --git a/cppuhelper/source/macro_expander.cxx
b/cppuhelper/source/macro_expander.cxx
index eab09c5..030e22f 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -181,11 +181,9 @@ Reference< XInterface > SAL_CALL service_create(
}
-namespace cppu
-{
+namespace cppuhelper { namespace detail {
-//##
-Reference< lang::XSingleComponentFactory >
create_boostrap_macro_expander_factory() SAL_THROW(())
+Reference< lang::XSingleComponentFactory >
create_bootstrap_macro_expander_factory() SAL_THROW(())
{
Reference< lang::XSingleComponentFactory >
free(::cppu::createSingleComponentFactory(
service_create,
@@ -203,6 +201,6 @@ Reference< lang::XSingleComponentFactory >
create_boostrap_macro_expander_factor
SAL_NO_ACQUIRE);
}
-}
+} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/macro_expander.hxx
b/cppuhelper/source/macro_expander.hxx
index 24e3ffc..84cec59 100644
--- a/cppuhelper/source/macro_expander.hxx
+++ b/cppuhelper/source/macro_expander.hxx
@@ -31,6 +31,12 @@
#include "sal/config.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace lang {
+class XSingleComponentFactory;
+} } } }
namespace rtl { class OUString; }
namespace cppuhelper {
@@ -54,6 +60,9 @@ namespace detail {
*/
::rtl::OUString expandMacros(rtl::OUString const & text);
+com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
+create_bootstrap_macro_expander_factory() SAL_THROW(());
+
}
}
diff --git a/cppuhelper/source/servicefactory.cxx
b/cppuhelper/source/servicefactory.cxx
index db8835f..6ac95e7 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -58,6 +58,8 @@
#include
#endif
+#include "macro_expander.hxx"
+
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
@@ -73,9 +75,6 @@ namespace cppu
Reference< security::XAccessController >
createDefaultAccessController() SAL_THROW(());
-Reference< lang::XSingleComponentFactory >
-create_boostrap_macro_expander_factory() SAL_THROW(());
-
OUString const & get_this_libpath();
@@ -435,7 +434,8 @@ Reference< XComponentContext > bootstrapInitialContext(
// macro expander singleton for loader
entry.bLateInitService = true;
entry.name = OUSTR("/singletons/com.sun.star.util.theMacroExpander");
-entry.value <<= create_boostrap_macro_expander_factory();
+entry.value
+<<= cppuhelper::detail::create_bootstrap_macro_expander_factory();
context_values.push_back( entry );
// tdmgr singleton
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/bootstrap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cb5c881a7f179391ee853f76e159254c97d776a3
Author: Michael Meeks
Date: Wed Apr 18 11:04:08 2012 +0100
avoid using the new rdb reading logic for empty/non-existent directories
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index cc64e07..fad335b 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -333,7 +333,7 @@ Reference< registry::XSimpleRegistry > readRdbDirectory(
}
nXML++;
}
-if (nXML == aURLs.size())
+if (nXML > 0 && nXML == aURLs.size())
{
OSL_TRACE (OSL_LOG_PREFIX "no legacy rdbs in directory '%s'\n",
rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8
).getStr());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/shlib.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 08f62fb29d448197e3353acd7fa8923cbd26939a
Author: Tor Lillqvist
Date: Tue Jan 3 11:47:00 2012 +0200
WaE: unused parameter 'rPath'
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 1213b0e..48596aa 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -487,6 +487,7 @@ Reference< XInterface > SAL_CALL
loadSharedLibComponentFactory(
Reference< XInterface >() );
}
#else
+(void) rPath;
oslModule lib;
OUString aModulePath(OUSTR("MAIN"));
if (! osl_getModuleHandle( NULL, &lib))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source cppu/source cpputools/source
cppu/source/uno/EnvStack.cxx |2 -
cppu/source/uno/lbenv.cxx|4 +--
cppu/source/uno/lbmap.cxx|6 ++---
cppuhelper/source/bootstrap.cxx |8 +++---
cppuhelper/source/component_context.cxx |2 -
cppuhelper/source/factory.cxx|2 -
cppuhelper/source/propertysetmixin.cxx |2 -
cppuhelper/source/propshlp.cxx |8 +++---
cppuhelper/source/servicefactory.cxx | 14 +--
cppuhelper/source/shlib.cxx |4 +--
cpputools/source/registercomponent/registercomponent.cxx | 16 ++---
cpputools/source/regsingleton/regsingleton.cxx |2 -
cpputools/source/unoexe/unoexe.cxx | 18 +++
13 files changed, 44 insertions(+), 44 deletions(-)
New commits:
commit 1b99d8800e399f45404ab62827163a873d2a1aec
Author: Olivier Hallot
Date: Thu Dec 15 17:29:53 2011 -0200
Fix for fdo43460 Part X getLength() to isEmpty()
Part X
Module
cppu
cppuhelper
cpputools
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index d1ff292..9542440 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -203,7 +203,7 @@ static int s_getNextEnv(uno_Environment ** ppEnv,
uno_Environment * pCurrEnv, un
res = 1;
}
-if (nextPurpose.getLength())
+if (!nextPurpose.isEmpty())
{
rtl::OUString next_envDcp(s_uno_envDcp);
next_envDcp += nextPurpose;
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 08e7035..ba3465c 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1031,7 +1031,7 @@ inline void EnvironmentsData::getRegisteredEnvironments(
iPos != aName2EnvMap.end(); ++iPos )
{
uno_Environment * pWeak = iPos->second;
-if (!rEnvDcp.getLength() ||
+if (rEnvDcp.isEmpty() ||
rEnvDcp.equals( pWeak->pTypeName ))
{
ppFound[nSize] = 0;
@@ -1116,7 +1116,7 @@ static uno_Environment * initDefaultEnvironment(
that->releaseInterface = unoenv_releaseInterface;
OUString envPurpose = cppu::EnvDcp::getPurpose(rEnvDcp);
-if (envPurpose.getLength())
+if (!envPurpose.isEmpty())
{
rtl::OUString libStem =
envPurpose.copy(envPurpose.lastIndexOf(':') + 1);
libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_uno_uno")
);
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index ec56c05..84e2cc7 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -312,7 +312,7 @@ static inline OUString getBridgeName(
SAL_THROW( () )
{
OUStringBuffer aBridgeName( 16 );
-if (rAddPurpose.getLength())
+if (!rAddPurpose.isEmpty())
{
aBridgeName.append( rAddPurpose );
aBridgeName.append( (sal_Unicode)'_' );
@@ -469,7 +469,7 @@ static Mapping getMediateMapping(
}
// connect to uno
-if (rAddPurpose.getLength()) // insert purpose mapping between new ano_uno
<-> uno
+if (!rAddPurpose.isEmpty()) // insert purpose mapping between new ano_uno
<-> uno
{
// create anonymous uno env
Environment aAnUno;
@@ -540,7 +540,7 @@ void SAL_CALL uno_getMapping(
}
// See if an identity mapping does fit.
-if (!aRet.is() && pFrom == pTo && !aAddPurpose.getLength())
+if (!aRet.is() && pFrom == pTo && aAddPurpose.isEmpty())
aRet = createIdentityMapping(pFrom);
if (!aRet.is())
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 399af07..2fb8ccd 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -81,13 +81,13 @@ namespace cppu
OUString const & get_this_libpath()
{
static OUString s_path;
-if (0 == s_path.getLength())
+if (s_path.isEmpty())
{
OUString path;
Module::getUrlFromAddress(
reinterpret_cast(get_this_libpath), path );
path = path.copy( 0, path.lastIndexOf( '/' ) );
MutexGuard guard( Mutex::getGlobalMutex() );
-if (0 == s_path.getLength())
+if (s_path.isEmpty())
s_path = path;
}
return s_path;
@@ -317,7 +317,7 @@ Reference< registry::XSimpleRegistry > nestRegistries(
sal_Int32 index;
Reference< registry::XSimpleRegistry > lastRegistry;
-if(write_rdb.getLength()) // is there a write registry given?
+if(!write_rdb.isEmpty()) // is there a write registry given?
{
lastRegistry.set(xSimRegFac->createInstance(), UNO_QUERY);
@@ -533,7 +533,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
throw BootstrapException(
OUSTR("cannot convert soffice installation path to URL!"));
}
-
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/bootstrap.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit b8c7548527f5fc14fe8fcbe74a749c7e3c10d385
Author: Michael Meeks
Date: Wed Dec 7 14:38:16 2011 +
ignore backup files in services/ directory to avoid debugging grief
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 8217ee7..399af07 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -289,6 +289,13 @@ Reference< registry::XSimpleRegistry > readRdbDirectory(
url),
css::uno::Reference< css::uno::XInterface >());
}
+rtl::OUString aName = stat.getFileName();
+
+// Ignore backup files - to allow people to edit their
+// services/ without extremely confusing behaviour
+if (aName.toChar() == '.' || aName.endsWithAsciiL("~", 1))
+continue;
+
if (stat.getFileType() != osl::FileStatus::Directory) { //TODO:
symlinks
last = readRdbFile(
stat.getFileURL(), fatalErrors, last, simpleRegistryFactory,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/bootstrap.cxx | 68
1 file changed, 22 insertions(+), 46 deletions(-)
New commits:
commit 793274a6cf555cb2af783a0ec6da14bbc6547a77
Author: Stephan Bergmann
Date: Wed Nov 2 10:36:50 2011 +0100
Minor clean up.
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 0da5cb0..90a16af 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -38,9 +38,6 @@
#include "rtl/string.hxx"
#include "rtl/ustrbuf.hxx"
#include "rtl/uri.hxx"
-#if OSL_DEBUG_LEVEL > 0
-#include "rtl/strbuf.hxx"
-#endif
#include "osl/diagnose.h"
#include "osl/file.hxx"
#include "osl/module.hxx"
@@ -150,7 +147,7 @@ inline beans::PropertyValue createPropertyValue(
name, -1, makeAny( value ), beans::PropertyState_DIRECT_VALUE );
}
-OUString findBoostrapArgument(
+OUString findBootstrapArgument(
const Bootstrap & bootstrap,
const OUString & arg_name,
sal_Bool * pFallenBack )
@@ -180,33 +177,22 @@ OUString findBoostrapArgument(
result_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(".rdb") );
result = result_buf.makeStringAndClear();
-#if OSL_DEBUG_LEVEL > 1
-OString result_dbg =
-OUStringToOString(result, RTL_TEXTENCODING_ASCII_US);
-OString arg_name_dbg =
-OUStringToOString(arg_name, RTL_TEXTENCODING_ASCII_US);
OSL_TRACE(
-"cppuhelper::findBoostrapArgument - "
-"setting %s relative to executable: %s\n",
-arg_name_dbg.getStr(),
-result_dbg.getStr() );
-#endif
+(OSL_LOG_PREFIX "findBootstrapArgument, setting \"%s\" relative to"
+ " executable \"%s\""),
+OUStringToOString(arg_name, RTL_TEXTENCODING_UTF8).getStr(),
+OUStringToOString(result, RTL_TEXTENCODING_UTF8).getStr());
}
else
{
if(pFallenBack)
*pFallenBack = sal_False;
-#if OSL_DEBUG_LEVEL > 1
-OString prefixed_arg_name_dbg = OUStringToOString(
-prefixed_arg_name, RTL_TEXTENCODING_ASCII_US );
-OString result_dbg = OUStringToOString(
-result, RTL_TEXTENCODING_ASCII_US );
OSL_TRACE(
-"cppuhelper::findBoostrapArgument - found %s in env: %s",
-prefixed_arg_name_dbg.getStr(),
-result_dbg.getStr() );
-#endif
+OSL_LOG_PREFIX "findBootstrapArgument, found \"%s\" in env \"%s\"",
+(OUStringToOString(prefixed_arg_name, RTL_TEXTENCODING_UTF8).
+ getStr()),
+OUStringToOString(result, RTL_TEXTENCODING_UTF8).getStr());
}
return result;
@@ -233,18 +219,13 @@ Reference< registry::XSimpleRegistry > nestRegistries(
{
lastRegistry->open(write_rdb, sal_False, forceWrite_rdb);
}
-catch (registry::InvalidRegistryException & invalidRegistryException)
+catch (registry::InvalidRegistryException & e)
{
-(void) invalidRegistryException;
-#if OSL_DEBUG_LEVEL > 1
-OString rdb_name_tmp = OUStringToOString(
-write_rdb, RTL_TEXTENCODING_ASCII_US);
-OString message_dbg = OUStringToOString(
-invalidRegistryException.Message, RTL_TEXTENCODING_ASCII_US);
+(void) e; // avoid warnings
OSL_TRACE(
-"warning: couldn't open %s cause of %s",
-rdb_name_tmp.getStr(), message_dbg.getStr() );
-#endif
+OSL_LOG_PREFIX "warning, could not open \"%s\": \"%s\"",
+OUStringToOString(write_rdb, RTL_TEXTENCODING_UTF8).getStr(),
+OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
}
if(!lastRegistry->isValid())
@@ -290,17 +271,13 @@ Reference< registry::XSimpleRegistry > nestRegistries(
else
lastRegistry = simpleRegistry;
}
-catch(registry::InvalidRegistryException & invalidRegistryException)
+catch(registry::InvalidRegistryException & e)
{
-#if OSL_DEBUG_LEVEL > 1
-OString rdb_name_tmp = OUStringToOString(
-rdb_name, RTL_TEXTENCODING_ASCII_US );
-OString message_dbg = OUStringToOString(
-invalidRegistryException.Message, RTL_TEXTENCODING_ASCII_US );
+(void) e; // avoid warnings
OSL_TRACE(
-"warning: couldn't open %s cause of %s",
-rdb_name_tmp.getStr(), message_dbg.getStr() );
-#endif
+OSL_LOG_PREFIX "warning, could not open \"%s\": \"%s\"",
+OUStringToOString(rdb_name, RTL_TEXTENCODING_UTF8).getStr(),
+OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
if (! optional)
{
// if a registry was explicitly given, the exception shall fly
@@ -308,7 +285,6 @@ Reference< registry::XSimpleRegistry > nestRegistries(
