diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:13:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:13:45 +0000 |
| commit | 920ca9e7dfb85f1d85e71572bb4f0f9ac44ef111 (patch) | |
| tree | f9f47c6f9fa661611137047a2d05fc5c28752705 /psprint | |
| parent | 5b8cb996f4a5787d71596d40edd4ef2d579a029b (diff) | |
INTEGRATION: CWS sb83 (1.29.92); FILE MERGED
2008/02/22 05:54:37 sb 1.29.92.2: RESYNC: (1.29-1.30); FILE MERGED
2008/01/23 15:34:12 sb 1.29.92.1: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/helper/helper.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/psprint/source/helper/helper.cxx b/psprint/source/helper/helper.cxx index 942923cb5270..45ac6f07a2c6 100644 --- a/psprint/source/helper/helper.cxx +++ b/psprint/source/helper/helper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: helper.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: ihi $ $Date: 2008-02-04 13:35:18 $ + * last change: $Author: vg $ $Date: 2008-03-18 12:13:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,9 +75,8 @@ const OUString& getOfficePath( enum whichOfficePath ePath ) { bOnce = true; OUString aIni; - osl_getExecutableFile( &aIni.pData ); - aIni = aIni.copy( 0, aIni.lastIndexOf( '/' )+1 ); - aIni += OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_CONFIGFILE( "bootstrap" ) ) ); + Bootstrap::get( OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aIni ); + aIni += OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); Bootstrap aBootstrap( aIni ); aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomDataUrl" ) ), aConfigPath ); aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseInstallation" ) ), aNetPath ); |