diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-25 12:07:37 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-25 12:07:37 +0000 |
| commit | 7668c882d3e28106f612d0b47978a3eece57d613 (patch) | |
| tree | 1aed103646280486eacef9dfc8ba0cb03474256e /sfx2/source/appl/appserv.cxx | |
| parent | dc1fd541c59c00d66213b457d8c61cf1502ecdf2 (diff) | |
INTEGRATION: CWS pbfinal01 (1.53.38); FILE MERGED
2005/02/01 13:58:52 pb 1.53.38.1: fix: #118597# remove 'Beta Forum' hack
Diffstat (limited to 'sfx2/source/appl/appserv.cxx')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 256fb682f8d0..c660dcc5945a 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appserv.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: kz $ $Date: 2005-01-18 16:02:49 $ + * last change: $Author: vg $ $Date: 2005-02-25 13:07:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -475,35 +475,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( pHelp ) { ULONG nHelpId = ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE ) ? 66056 : 0; - // --> PB 2004-11-25 #118595# HACK!!! only for SO8 Beta - rtl::OUString sProduct; - utl::ConfigManager::GetDirectConfigProperty( utl::ConfigManager::PRODUCTNAME ) >>= sProduct; - if ( nHelpId > 0 && - ( sProduct.equalsAscii( "StarOffice" ) || sProduct.equalsAscii( "StarSuite" ) ) ) - { - Reference< XSystemShellExecute > xSystemShellExecute( - ::comphelper::getProcessServiceFactory()->createInstance( - DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute") ), UNO_QUERY ); - if ( xSystemShellExecute.is() ) - { - try - { - xSystemShellExecute->execute( - DEFINE_CONST_UNICODE("http://www.support-central.de/betaforum"), - ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS ); - } - catch (IllegalArgumentException&) - { - DBG_ERRORFILE( "xSystemShellExecute->execute(): illegal arguments" ); - } - catch (SystemShellExecuteException&) - { - DBG_ERRORFILE( "xSystemShellExecute->execute(): general error" ); - } - } - } - // <-- - else if ( 66056 == nHelpId ) + if ( 66056 == nHelpId ) { // show Support page with new URL String sHelpURL = SfxHelp::CreateHelpURL( nHelpId, String() ); |