summaryrefslogtreecommitdiff
path: root/configmgr/source/components.cxx
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-03-18 11:17:44 +0100
committersb <sb@openoffice.org>2010-03-18 11:17:44 +0100
commitad9699488ff66d8f8a90253ce06d2f1a8ee63297 (patch)
treeb4db506e9133a9cc62285bfe4833c1eb2be4c41c /configmgr/source/components.cxx
parentbbbc4c556a88b781c23f97772d4fe48ba310746e (diff)
sb121: #i110198# generally ignore unknown elements in xcu data
Diffstat (limited to 'configmgr/source/components.cxx')
-rw-r--r--configmgr/source/components.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 51cc76bef602..a6956e5a13f9 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -316,7 +316,6 @@ Components::Components(
context_(context)
{
OSL_ASSERT(context.is());
-/*SB*/try{
parseXcsXcuLayer(
0,
expand(
@@ -381,13 +380,11 @@ Components::Components(
":UNO_USER_PACKAGES_CACHE}/registry/"
"com.sun.star.comp.deployment.configuration."
"PackageRegistryBackend/configmgr.ini"))));
-/*SB*/}catch(css::uno::Exception&e){fprintf(stderr,"caught <%s>\n",rtl::OUStringToOString(e.Message,RTL_TEXTENCODING_UTF8).getStr());throw;}
try {
parseModificationLayer();
} catch (css::uno::Exception & e) { //TODO: more specific exception catching
- // Silently ignore unreadable parts of a corrupted
- // registrymodifications.xcu file, instead of completely preventing OOo
- // from starting:
+ // Silently ignore unreadable parts of a corrupted user modification
+ // layer, instead of completely preventing OOo from starting:
OSL_TRACE(
"configmgr error reading user modification layer: %s",
rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());