diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:17:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:17:16 +0000 |
| commit | 6f895e61ac7afe5cf17136ffbd6b39359852ea77 (patch) | |
| tree | ade2b150691f4dda13dd750b08cfe99764d24d1b /extensions/source/update | |
| parent | 3813a9b87235dcbf4dcecbaff8962b4e37e230e2 (diff) | |
INTEGRATION: CWS sb83 (1.17.32); FILE MERGED
2008/02/01 13:23:37 sb 1.17.32.2: RESYNC: (1.17-1.18); FILE MERGED
2008/01/23 15:31:44 sb 1.17.32.1: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
Diffstat (limited to 'extensions/source/update')
| -rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 65a89e66c1bf..4df6f8df188e 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -4,9 +4,9 @@ * * $RCSfile: updatecheck.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: vg $ $Date: 2008-01-28 15:31:10 $ + * last change: $Author: vg $ $Date: 2008-03-18 12:17:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -154,14 +154,10 @@ namespace static rtl::OUString getBootstrapValue(const rtl::OUString& aFile, const rtl::OUString& aValue) { rtl::OUString aPath, aRet; - if( osl_getExecutableFile(&aPath.pData) == osl_Process_E_None ) + if( rtl::Bootstrap::get(UNISTRING("BRAND_BASE_DIR"), aPath) ) { - sal_uInt32 lastIndex = aPath.lastIndexOf('/'); - if ( lastIndex > 0 ) - { - aPath = aPath.copy( 0, lastIndex+1 ); - aPath += aFile; - } + aPath += UNISTRING("/program/"); + aPath += aFile; rtl::Bootstrap aVersionFile(aPath); aVersionFile.getFrom(aValue, aRet, rtl::OUString()); |