diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:14:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:14:48 +0000 |
| commit | 5af5ccca36402495e2cd1d493c7a6451c98ae7e4 (patch) | |
| tree | 4f1fda59d2e6ba23dde19aad0dc5ddb5ee1ce9b5 /vcl/win/source/gdi/salgdi3.cxx | |
| parent | bd7bf10a5aa5e0ea3231b6b5bf773852ca1694d8 (diff) | |
INTEGRATION: CWS sb83 (1.91.18); FILE MERGED
2008/03/17 09:05:53 sb 1.91.18.2: RESYNC: (1.91-1.92); FILE MERGED
2008/01/23 15:33:31 sb 1.91.18.1: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
Diffstat (limited to 'vcl/win/source/gdi/salgdi3.cxx')
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 8d81f9b9076e..5e8cf9036573 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salgdi3.cxx,v $ * - * $Revision: 1.92 $ + * $Revision: 1.93 $ * - * last change: $Author: kz $ $Date: 2008-03-05 17:13:26 $ + * last change: $Author: vg $ $Date: 2008-03-18 14:14:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2150,8 +2150,9 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) osl::DirectoryItem aDirItem; String aEmptyString; - ::rtl::OUString aBootStrap = aExecutableFile.copy( 0, aExecutableFile.lastIndexOf('/')+1 ); - aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( SAL_CONFIGFILE( "bootstrap" ) ) ); + ::rtl::OUString aBootStrap; + rtl::Bootstrap::get( String( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aBootStrap ); + aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); rtl::Bootstrap aBootstrap( aBootStrap ); ::rtl::OUString aUserPath; aBootstrap.getFrom( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserInstallation" ) ), aUserPath ); |