diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-04 08:29:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-04 14:10:44 +0200 |
| commit | 59b072e22b0610abc7ffdbc75873ef5cbba58de7 (patch) | |
| tree | 663c2d01a983508f9b22ec87fae29b16ab5a1683 /comphelper/source/officeinstdir | |
| parent | baa411b59c3840a4dddf5447a0b4583eb5edea74 (diff) | |
yyyyy
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
Diffstat (limited to 'comphelper/source/officeinstdir')
| -rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 7ba751c0951b..01d3efbe7a0c 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -281,9 +281,7 @@ void OfficeInstallationDirectories::initDirs() uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(m_xCtx); - *m_pOfficeBrandDir = - xExpander->expandMacros( - OUString( "$BRAND_BASE_DIR" ) ); + *m_pOfficeBrandDir = xExpander->expandMacros( "$BRAND_BASE_DIR" ); OSL_ENSURE( !m_pOfficeBrandDir->isEmpty(), "Unable to obtain office brand installation directory!" ); @@ -292,7 +290,7 @@ void OfficeInstallationDirectories::initDirs() *m_pUserDir = xExpander->expandMacros( - OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ); + "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ); OSL_ENSURE( !m_pUserDir->isEmpty(), "Unable to obtain office user data directory!" ); |