diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:18:53 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:18:53 +0000 |
| commit | 86d929492aad312a89ccde7545176aa463092a5c (patch) | |
| tree | 447277ebcd7ef2af51d4b7c50a7c43f9d9b0edb9 | |
| parent | d6c0bc2477681c408a7d4cabc8a7432374f3a207 (diff) | |
INTEGRATION: CWS sb83 (1.17.198); FILE MERGED
2008/02/22 05:56:37 sb 1.17.198.2: RESYNC: (1.17-1.18); FILE MERGED
2007/12/04 08:25:03 sb 1.17.198.1: #i84200# Compute $(prog) as $(inst) + /program.
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 73db3aca50eb..be5fc326a157 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -4,9 +4,9 @@ * * $RCSfile: substitutepathvars.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: ihi $ $Date: 2008-02-04 13:42:42 $ + * last change: $Author: vg $ $Date: 2008-03-18 12:18:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1246,17 +1246,13 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Detect the program directory // Set $(prog), $(progpath), $(progurl) - rtl::OUString aProgName; - ::vos::OStartupInfo aInfo; - aInfo.getExecutableFile( aProgName ); - sal_Int32 lastIndex = aProgName.lastIndexOf('/'); - if ( lastIndex >= 0 ) + INetURLObject aProgObj( + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ] ); + if ( !aProgObj.HasError() && + aProgObj.insertName( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("program")) ) ) { - ::rtl::OUString aTmpProgPath; - aTmp = aProgName.copy( 0, lastIndex ); - INetURLObject aObj( aTmp ); - - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = ConvertOSLtoUCBURL( aObj.GetMainURL(INetURLObject::NO_DECODE) ); + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE); aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROG ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; } |