diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 11:17:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 11:17:44 +0000 |
| commit | ffb584f1ea6a7bf7b4cf3cd6c320ca0c9f88160e (patch) | |
| tree | af0c5823230838f9a133c94b1387706820848888 /sfx2/source/appl/sfxhelp.cxx | |
| parent | 98773bf5b64c2d0b03cb9c24021e151a5e3a3e78 (diff) | |
INTEGRATION: CWS ab53 (1.80.46); FILE MERGED
2008/06/06 10:58:44 ab 1.80.46.1: #i90162# Use INET_PROT_NOT_VALID as hint for keyword search
Diffstat (limited to 'sfx2/source/appl/sfxhelp.cxx')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 589a9c8695..c185006525 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sfxhelp.cxx,v $ - * $Revision: 1.80 $ + * $Revision: 1.81 $ * * This file is part of OpenOffice.org. * @@ -782,10 +782,19 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) INetProtocol nProtocol = aParser.GetProtocol(); if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP ) { - if ( rURL.Len() > 0 ) + // #90162 Accept anything that is not invalid as help id, as both + // uno: URLs used as commands/help ids in the Office and the scheme + // used in extension help ids (e.g. com.foocorp.foo-ext:FooDialogButton) + // are accepted as INET_PROT_UNO respectively INET_PROT_GENERIC + if ( nProtocol != INET_PROT_NOT_VALID ) + { aHelpURL = CreateHelpURL_Impl( rURL, GetHelpModuleName_Impl( ) ); + } else + { aHelpURL = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( ) ); + sKeyword = ::rtl::OUString( rURL ); + } } Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( |