diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:12:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:12:39 +0000 |
| commit | bd7bf10a5aa5e0ea3231b6b5bf773852ca1694d8 (patch) | |
| tree | 82d1579da6f958f6157c70f30c1eb34b43622454 /vcl/unx | |
| parent | 962f311136a72ffc8359a375f18541746bea07a2 (diff) | |
INTEGRATION: CWS sb83 (1.54.58); FILE MERGED
2008/03/17 09:05:14 sb 1.54.58.2: RESYNC: (1.54-1.55); FILE MERGED
2008/01/23 15:33:30 sb 1.54.58.1: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/source/app/saldata.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx index bd91b773f9da..e4c78d57f1f3 100644 --- a/vcl/unx/source/app/saldata.cxx +++ b/vcl/unx/source/app/saldata.cxx @@ -4,9 +4,9 @@ * * $RCSfile: saldata.cxx,v $ * - * $Revision: 1.55 $ + * $Revision: 1.56 $ * - * last change: $Author: obo $ $Date: 2008-02-27 10:32:55 $ + * last change: $Author: vg $ $Date: 2008-03-18 14:12:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -891,9 +891,8 @@ const char* X11SalData::getFrameClassName() if( !aClassName.getLength() ) { rtl::OUString aIni, aProduct; - osl_getExecutableFile( &aIni.pData ); - aIni = aIni.copy( 0, aIni.lastIndexOf( SAL_PATHDELIMITER )+1 ); - aIni += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_CONFIGFILE( "bootstrap" ) ) ); + rtl::Bootstrap::get( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aIni ); + aIni += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); rtl::Bootstrap aBootstrap( aIni ); aBootstrap.getFrom( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ProductKey" ) ), aProduct ); |