summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-10-20 11:12:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-10-20 23:04:11 +0200
commitb1eae75f53ad2ee88192241776ffa7d29725301a (patch)
treeb130ed008e3670cc81152b6f653c8347e7f80e4a /unotools
parentd9604fa1b4123da145fc9b52901b42888d25ca3b (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 'unotools')
-rw-r--r--unotools/source/config/configmgr.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 913f809aa412..00e46145e360 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -575,7 +575,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
/*---------------------------------------------------------------------------*/
void ConfigManager::getBasisAboutBoxProductVersion( OUString& rVersion )
{
- rtl::OUString aPackageVersion = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":OOOPackageVersion}" );
+ rtl::OUString aPackageVersion = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":OOOPackageVersion}" );
rtl::Bootstrap::expandMacros( aPackageVersion );
if ( aPackageVersion.getLength() )