strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i101955# adapt to Windows .ini (vs rc) ini-file names

Browse source
This commit is contained in:
sb 2009-08-27 17:03:38 +02:00
parent 24d60f1533
commit 75014efe95
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
configmgr2/source/components.cxx
View file

@ -150,16 +150,18 @@ Components::Components() {
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"${$OOO_BASE_DIR/program/unorc:UNO_SHARED_PACKAGES_CACHE}/"
"registry/com.sun.star.comp.deployment.configuration."
"${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
":UNO_SHARED_PACKAGES_CACHE}/registry/"
"com.sun.star.comp.deployment.configuration."
"PackageRegistryBackend/registry"))));
parseXcsXcuIniLayer(
9,
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"${$OOO_BASE_DIR/program/unorc:UNO_SHARED_PACKAGES_CACHE}/"
"registry/com.sun.star.comp.deployment.configuration."
"${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
":UNO_SHARED_PACKAGES_CACHE}/registry/"
"com.sun.star.comp.deployment.configuration."
"PackageRegistryBackend/configmgrrc"))));
parseSystemLayer();
parseXcsXcuLayer( //TODO: migrate
@ -167,24 +169,26 @@ Components::Components() {
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"${$OOO_BASE_DIR/program/unorc:UNO_USER_PACKAGES_CACHE}/"
"registry/com.sun.star.comp.deployment.configuration."
"${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
":UNO_USER_PACKAGES_CACHE}/registry/"
"com.sun.star.comp.deployment.configuration."
"PackageRegistryBackend/registry"))));
parseXcsXcuIniLayer(
13,
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"${$OOO_BASE_DIR/program/unorc:UNO_USER_PACKAGES_CACHE}/"
"registry/com.sun.star.comp.deployment.configuration."
"${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
":UNO_USER_PACKAGES_CACHE}/registry/"
"com.sun.star.comp.deployment.configuration."
"PackageRegistryBackend/configmgrrc"))));
parseXcsXcuLayer(
15,
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/"
"user/registry"))));
"${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
":UserInstallation}/user/registry"))));
parseModificationLayer();
}
@ -392,8 +396,8 @@ rtl::OUString Components::getModificationFileUrl() const {
return expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/"
"registrymodifications.xcu")));
"${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
":UserInstallation}/user/registrymodifications.xcu")));
}
void Components::parseModificationLayer() {