diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:29:13 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:29:13 +0000 |
| commit | eddc8cd7588f65c75f14b73986bd12c30076cba7 (patch) | |
| tree | 552f93e604b0df0cc04ea6c9c8cc02fcd886e18d /comphelper/source/officeinstdir | |
| parent | 5af5ccca36402495e2cd1d493c7a6451c98ae7e4 (diff) | |
INTEGRATION: CWS sb83 (1.7.12); FILE MERGED
2008/01/23 15:29:56 sb 1.7.12.1: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
Diffstat (limited to 'comphelper/source/officeinstdir')
| -rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index bf9e44106e16..c4671b08db7d 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -4,9 +4,9 @@ * * $RCSfile: officeinstallationdirectories.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2008-01-04 16:38:01 $ + * last change: $Author: vg $ $Date: 2008-03-18 14:29:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -336,7 +336,7 @@ void OfficeInstallationDirectories::initDirs() *m_pOfficeDir = xExpander->expandMacros( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "${$SYSBINDIR/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) ); + "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) ); OSL_ENSURE( m_pOfficeDir->getLength() > 0, "Unable to obtain office installation directory!" ); @@ -346,7 +346,7 @@ void OfficeInstallationDirectories::initDirs() *m_pUserDir = xExpander->expandMacros( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "${$SYSBINDIR/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) ); + "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) ); OSL_ENSURE( m_pUserDir->getLength() > 0, "Unable to obtain office user data directory!" ); |