diff options
| author | Kai Sommerfeld <kso@openoffice.org> | 2010-10-11 14:43:36 +0200 |
|---|---|---|
| committer | Kai Sommerfeld <kso@openoffice.org> | 2010-10-11 14:43:36 +0200 |
| commit | eb61f9d1ec810d7156298f4840f70c9370ac97a0 (patch) | |
| tree | 0eab4e78c49438be4bba60828d83dc71faa999f3 /comphelper | |
| parent | 0dfab19f6f149433894bda6581c531745cf6be48 (diff) | |
#i98699# - Now works with 3 layer office.
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 3ce0d4de865a..b262a14bb73f 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -101,7 +101,7 @@ static bool makeCanonicalFileURL( rtl::OUString & rURL ) OfficeInstallationDirectories::OfficeInstallationDirectories( const uno::Reference< uno::XComponentContext > & xCtx ) -: m_aOfficeDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(baseinsturl)" ) ), +: m_aOfficeDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(brandbaseurl)" ) ), m_aUserDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(userdataurl)" ) ), m_xCtx( xCtx ), m_pOfficeDir( 0 ), @@ -322,8 +322,7 @@ void OfficeInstallationDirectories::initDirs() { *m_pOfficeDir = xExpander->expandMacros( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) ); + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ) ); OSL_ENSURE( m_pOfficeDir->getLength() > 0, "Unable to obtain office installation directory!" ); |