diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-20 11:12:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-20 23:04:11 +0200 |
| commit | b1eae75f53ad2ee88192241776ffa7d29725301a (patch) | |
| tree | b130ed008e3670cc81152b6f653c8347e7f80e4a /configmgr | |
| parent | d9604fa1b4123da145fc9b52901b42888d25ca3b (diff) | |
Undo basis/brand split: moved ini files from basis program/ to brand program/.
Moved uno ini, folded fundamentalbasis ini into fundamental ini, merged
version inis.
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/components.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 650df69836de..0b5ea7830c4d 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -548,7 +548,7 @@ Components::Components( expand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno") + "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno") ":BUNDLED_EXTENSIONS_USER}/registry/" "com.sun.star.comp.deployment.configuration." "PackageRegistryBackend/configmgr.ini"))), @@ -558,7 +558,7 @@ Components::Components( expand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno") + "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno") ":SHARED_EXTENSIONS_USER}/registry/" "com.sun.star.comp.deployment.configuration." "PackageRegistryBackend/configmgr.ini"))), @@ -568,7 +568,7 @@ Components::Components( expand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno") + "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno") ":UNO_USER_PACKAGES_CACHE}/registry/" "com.sun.star.comp.deployment.configuration." "PackageRegistryBackend/registry")))); @@ -579,7 +579,7 @@ Components::Components( expand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno") + "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno") ":UNO_USER_PACKAGES_CACHE}/registry/" "com.sun.star.comp.deployment.configuration." "PackageRegistryBackend/configmgr.ini"))), |