mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb83 (1.7.12); FILE MERGED

Browse Source 
2008/01/23 15:29:56 sb 1.7.12.1: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
This commit is contained in:
Vladimir Glazounov
2008-03-18 13:29:13 +00:00
parent 5af5ccca36
commit eddc8cd758
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
comphelper/source/officeinstdir/officeinstallationdirectories.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: officeinstallationdirectories.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -336,7 +336,7 @@ void OfficeInstallationDirectories::initDirs()
*m_pOfficeDir = *m_pOfficeDir =
xExpander->expandMacros( xExpander->expandMacros(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"${$SYSBINDIR/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) ); "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) );
OSL_ENSURE( m_pOfficeDir->getLength() > 0, OSL_ENSURE( m_pOfficeDir->getLength() > 0,
"Unable to obtain office installation directory!" ); "Unable to obtain office installation directory!" );
@@ -346,7 +346,7 @@ void OfficeInstallationDirectories::initDirs()
*m_pUserDir = *m_pUserDir =
xExpander->expandMacros( xExpander->expandMacros(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"${$SYSBINDIR/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) ); "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) );
OSL_ENSURE( m_pUserDir->getLength() > 0, OSL_ENSURE( m_pUserDir->getLength() > 0,
"Unable to obtain office user data directory!" ); "Unable to obtain office user data directory!" );