summaryrefslogtreecommitdiff
path: root/extensions/source/update/check/updateprotocol.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-03-18 11:17:30 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-03-18 11:17:30 +0000
commita5e977412dfee84b23d2d9607c07f794d71bdb99 (patch)
tree435b90b88523456b04bb955b3efdd033a075c0dc /extensions/source/update/check/updateprotocol.cxx
parent39504183b0720ce4678fb051280a7e2c343a4f9a (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/source/update/check/updateprotocol.cxx')
-rw-r--r--extensions/source/update/check/updateprotocol.cxx13
1 files changed, 4 insertions, 9 deletions
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index 815bf5a85..0825c1772 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());