diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:51:31 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:51:31 +0000 |
| commit | 6692fc7f41d7c1f9906ebe69c626ee69b603fb63 (patch) | |
| tree | bd1840bca2b3ff59880423a040840789aae3636e /desktop | |
| parent | 640daa60fb35824e585aaae85a9ba4e73f4313cc (diff) | |
INTEGRATION: CWS sb83 (1.28.36); FILE MERGED
2008/01/23 15:18:54 sb 1.28.36.1: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/splash/splash.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index e03370376520..1a743a274359 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -4,9 +4,9 @@ * * $RCSfile: splash.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: kz $ $Date: 2007-10-09 15:23:34 $ + * last change: $Author: vg $ $Date: 2008-03-18 13:51:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -297,10 +297,10 @@ OUString implReadBootstrapKey( const ::rtl::Bootstrap& _rIniFile, const OUString void SplashScreen::loadConfig() { // detect execute path - ::vos::OStartupInfo().getExecutableFile( _sExecutePath ); - sal_uInt32 nLastIndex = _sExecutePath.lastIndexOf( '/' ); - if ( nLastIndex > 0 ) - _sExecutePath = _sExecutePath.copy( 0, nLastIndex + 1 ); + ::rtl::Bootstrap::get( + OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), + _sExecutePath ); + _sExecutePath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" ) ); // read keys from soffice.ini (sofficerc) OUString sIniFileName = _sExecutePath; |