diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-09 14:13:01 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-09 14:13:01 +0000 |
| commit | 04a8169cc520932c6505c27ef7dfad35b2a4fcee (patch) | |
| tree | 5644bf6d0cc8fa5ad18a0b03c838ddad2888a80c /sfx2/source/appl/sfxhelp.cxx | |
| parent | 49db1122ae53ff2a69c4329f4ac328e8890dca2f (diff) | |
INTEGRATION: CWS fwkpp2fix01 (1.56.58); FILE MERGED
2004/10/27 10:50:43 cd 1.56.58.2: #o36114# Use correct module string variable
2004/10/26 11:17:03 cd 1.56.58.1: #i36114# Help::Start must be called with command URL instead of HelpID
Diffstat (limited to 'sfx2/source/appl/sfxhelp.cxx')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 46 |
1 files changed, 40 insertions, 6 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index d9d965253e..3c620fa5f8 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfxhelp.cxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * - * last change: $Author: pb $ $Date: 2004-10-26 10:15:01 $ + * last change: $Author: rt $ $Date: 2004-11-09 15:13:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -602,8 +602,34 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rMo String aHelpURL; sal_Bool bHasAnchor = sal_False; String aAnchor; + + String aModuleName( rModuleName ); + if ( aModuleName.Len() == 0 ) + { + // no active module (quicklaunch?) -> detect default module + SvtModuleOptions aModOpt; + if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + aModuleName = DEFINE_CONST_UNICODE("swriter"); + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + aModuleName = DEFINE_CONST_UNICODE("scalc"); + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + aModuleName = DEFINE_CONST_UNICODE("simpress"); + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + aModuleName = DEFINE_CONST_UNICODE("sdraw"); + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) + aModuleName = DEFINE_CONST_UNICODE("smath"); + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCHART ) ) + aModuleName = DEFINE_CONST_UNICODE("schart"); + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SBASIC ) ) + aModuleName = DEFINE_CONST_UNICODE("sbasic"); + else + { + DBG_ERRORFILE( "no installed module found" ); + } + } + aHelpURL = String::CreateFromAscii("vnd.sun.star.help://"); - aHelpURL += rModuleName; + aHelpURL += aModuleName; if ( !aCommandURL.Len() ) aHelpURL += String::CreateFromAscii("/start"); @@ -690,10 +716,16 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) String aHelpURL(rURL ); INetURLObject aParser (aHelpURL); ::rtl::OUString sKeyword; - if ( aParser.GetProtocol() != INET_PROT_VND_SUN_STAR_HELP ) + INetProtocol nProtocol = aParser.GetProtocol(); + if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP ) { - aHelpURL = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( 0 ) ); - sKeyword = ::rtl::OUString( rURL ); + if ( nProtocol == INET_PROT_UNO ) + aHelpURL = CreateHelpURL_Impl( rURL, GetHelpModuleName_Impl( 0 ) ); + else + { + aHelpURL = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( 0 ) ); + sKeyword = ::rtl::OUString( rURL ); + } } Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( @@ -858,6 +890,8 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "swriter" )); else if ( aFactoryShortName.equalsAscii( "sglobal" )) aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "swriter" )); + else if ( aFactoryShortName.equalsAscii( "dbapp" )) + aFactoryShortName = aDefaultModule; else if ( aFactoryShortName.equalsAscii( "dbquery" )) aFactoryShortName = aDefaultModule; else if ( aFactoryShortName.equalsAscii( "dbrelation" )) |