diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-25 09:12:26 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-25 09:12:26 +0000 |
| commit | 800f826c7a46f5186af072ab56b8927c8d54e8aa (patch) | |
| tree | 3943648155b81307a8cb9d05e7c000df81080c98 /sfx2/source/appl/sfxhelp.cxx | |
| parent | 15235c90b9fd50bcd0c8e1c75f53be9c7856f559 (diff) | |
INTEGRATION: CWS os118 (1.81.6); FILE MERGED
2008/07/17 10:00:38 pb 1.81.6.1: fix: #i91715# ignore '.HelpId:' strings
Diffstat (limited to 'sfx2/source/appl/sfxhelp.cxx')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index c185006525..57cde94552 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -1,13 +1,13 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sfxhelp.cxx,v $ - * $Revision: 1.81 $ + * $Revision: 1.82 $ * * This file is part of OpenOffice.org. * @@ -130,7 +130,7 @@ rtl::OUString HelpLocaleString() { // detect installed locale Any aLocale = - ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( + ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( ::utl::ConfigManager::LOCALE ); bool bOk = (aLocale >>= aLocaleStr); if ( bOk ) @@ -148,7 +148,7 @@ rtl::OUString HelpLocaleString() { bOk = false; String sLang(aLocaleStr); - xub_StrLen nSepPos = sLang.Search( '-' ); + xub_StrLen nSepPos = sLang.Search( '-' ); if (nSepPos != STRING_NOTFOUND) { bOk = true; @@ -793,7 +793,12 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) else { aHelpURL = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( ) ); - sKeyword = ::rtl::OUString( rURL ); + + // pb i91715: strings begin with ".HelpId:" are not words of the basic ide + // they are helpid-strings used by the testtool -> so we ignore them + static const String sHelpIdScheme( DEFINE_CONST_OUSTRING(".HelpId:") ); + if ( rURL.Search( sHelpIdScheme ) != 0 ) + sKeyword = ::rtl::OUString( rURL ); } } |