diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2013-04-18 09:58:02 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2013-04-18 09:58:02 +0000 |
| commit | 2af65172af2cfc768e4f44507a02e1b17a9806ba (patch) | |
| tree | fd4c4c673a8a83bee9427170d8963559017474cf /unotools | |
| parent | 581c83c696bd850066d425427c10374b6587b45d (diff) | |
#121996# integrate first part to remove 3layer office
Notes
Notes:
prefer: a66f9903bba9dc7eeff6683ebddcd34d4ad70068
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index f89732d3d532..48ce1e8f0893 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -148,7 +148,7 @@ namespace utl // s_pData = &s_theData; rtl::OUString uri; rtl::Bootstrap::get( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OOO_BASE_DIR")), uri); s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" BOOTSTRAP_DATA_NAME))); } return *s_pData; @@ -908,7 +908,7 @@ sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rVa // try to open version.ini (versionrc) rtl::OUString uri; rtl::Bootstrap::get( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OOO_BASE_DIR")), uri); rtl::Bootstrap aData( uri + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE("version"))) ); if ( aData.getHandle() == NULL ) diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 7ca0cac7515a..5503cd3f000f 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -487,7 +487,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) rtl::OUString name( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "${BRAND_BASE_DIR}/program/edition/edition.ini"))); + "${OOO_BASE_DIR}/program/edition/edition.ini"))); rtl::Bootstrap::expandMacros(name); if (rtl::Bootstrap(name).getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EDITIONNAME")), |