From 8246bdb500a6d83ea9b61f58fb74e051432e32d7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 6 Nov 2012 16:15:57 +0100 Subject: fdo#55138: Do not double-expand bootstrap variables For some reason that escapes me now, the old code double-expanded URLs in CONFIGURATION_LAYERS and in extension layer's configmgr.ini SCHEMA/DATA. That produced wrong results when the pathnames represented by those URLs contain any "$" characters, as apparently routinely happens on Windows with roaming profiles. Change-Id: Iff149e7d8736cbcda579376cdc89e24cf99ccc97 --- configmgr/source/components.hxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'configmgr/source/components.hxx') diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx index c898a84b4657..70f7669b9a63 100644 --- a/configmgr/source/components.hxx +++ b/configmgr/source/components.hxx @@ -43,10 +43,7 @@ namespace com { namespace sun { namespace star { class XComponentContext; } } } } -namespace rtl { - class Bootstrap; - class OUString; -} +namespace rtl { class OUString; } namespace configmgr { @@ -132,7 +129,7 @@ private: void parseFileList( int layer, FileParser * parseFile, rtl::OUString const & urls, - rtl::Bootstrap const & ini, bool recordAdditions); + bool recordAdditions); void parseXcdFiles(int layer, rtl::OUString const & url); -- cgit