diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 14:05:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 14:05:36 +0000 |
| commit | a12f1034e075f6e19afa7054fae83054bb803901 (patch) | |
| tree | 8aeaff2dbfdd3fd8dba9ed269b1ff90d4f438470 /sfx2 | |
| parent | 9f214741a1f602fa2c484dbe7a9a8e159cf98343 (diff) | |
CWS-TOOLING: integrate CWS ab64_DEV300
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 57cde94552..5e520ad98a 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.82 $ + * $Revision: 1.82.78.1 $ * * This file is part of OpenOffice.org. * @@ -782,11 +782,20 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) INetProtocol nProtocol = aParser.GetProtocol(); if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP ) { - // #90162 Accept anything that is not invalid as help id, as both + // #i90162 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 ) + bool bAcceptAsURL = ( nProtocol != INET_PROT_NOT_VALID ); + + // #i94891 As in some extensions help ids like foo.bar.dummy without + // any : have been used that worked before the fix of #i90162 (see + // above) strings containing . will be also accepted to avoid brea- + // king the help of existing extensions. + if( !bAcceptAsURL ) + bAcceptAsURL = ( rURL.Search( '.' ) != STRING_NOTFOUND ); + + if ( bAcceptAsURL ) { aHelpURL = CreateHelpURL_Impl( rURL, GetHelpModuleName_Impl( ) ); } |