diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:17:30 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:17:30 +0000 |
| commit | 9e2d0f6541756b79f6a4efbb406ea8f783e08947 (patch) | |
| tree | cf278a805117c862bc6395f8883da919e9614c94 /extensions | |
| parent | 6f895e61ac7afe5cf17136ffbd6b39359852ea77 (diff) | |
INTEGRATION: CWS sb83 (1.8.36); FILE MERGED
2008/01/23 15:31:45 sb 1.8.36.1: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/update/check/updateprotocol.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index 0f9ce8d06d4b..7f0aec425d94 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -4,9 +4,9 @@ * * $RCSfile: updateprotocol.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: ihi $ $Date: 2007-11-19 16:50:00 $ + * last change: $Author: vg $ $Date: 2008-03-18 12:17:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,15 +79,10 @@ getBootstrapData( ::rtl::OUString & rInstallSetID) { rtl::OUString aPath, aPath2; - if( osl_getExecutableFile(&aPath.pData) != osl_Process_E_None ) + if( !rtl::Bootstrap::get(UNISTRING("BRAND_BASE_DIR"), aPath) ) return false; - sal_uInt32 lastIndex = aPath.lastIndexOf('/'); - if ( lastIndex > 0 ) - { - aPath = aPath.copy( 0, lastIndex+1 ); - aPath += UNISTRING( SAL_CONFIGFILE( "version" ) ); - } + aPath += UNISTRING( "/program/" SAL_CONFIGFILE( "version" ) ); rtl::Bootstrap aVersionFile(aPath); aVersionFile.getFrom(UNISTRING("ProductBuildid"), rBuildID, rtl::OUString()); |