diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:25:54 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:25:54 +0000 |
| commit | 60fe740b81808ba33e89dc09d447db5eae857e97 (patch) | |
| tree | b774f69ca6f51e0120f1ef633d2dfd9922413c80 /sfx2 | |
| parent | df76e6e99d1fa216f5a7c2e342601efbe1f43989 (diff) | |
INTEGRATION: CWS fwk16 (1.110.62); FILE MERGED
2005/06/23 06:50:50 pb 1.110.62.3: RESYNC: (1.110-1.111); FILE MERGED
2005/06/21 09:17:08 pb 1.110.62.2: fix: #i49956# search strings with dots need another handling
2005/06/06 09:35:20 pb 1.110.62.1: fix: #i47631# set only valid factory on search page
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 3b59c3f24e89..a13de7678b7c 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: newhelp.cxx,v $ * - * $Revision: 1.111 $ + * $Revision: 1.112 $ * - * last change: $Author: hr $ $Date: 2005-06-09 13:54:10 $ + * last change: $Author: kz $ $Date: 2005-07-12 14:25:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -365,20 +365,23 @@ namespace sfx2 nStartPos = aBoundary.startPos; String sSearchToken( rSearchString.Copy( (USHORT)aBoundary.startPos, (USHORT)aBoundary.endPos - (USHORT)aBoundary.startPos ) ); - if ( bForSearch && sSearchToken.GetChar( sSearchToken.Len() - 1 ) != '*' ) - sSearchToken += '*'; - - if ( sSearchToken.Len() > 1 || - ( sSearchToken.Len() > 0 && sSearchToken.GetChar( 0 ) != '*' ) ) + if ( sSearchToken.Len() > 0 && ( sSearchToken.Len() > 1 || sSearchToken.GetChar(0) != '.' ) ) { - if ( sSearchStr.Len() > 0 ) + if ( bForSearch && sSearchToken.GetChar( sSearchToken.Len() - 1 ) != '*' ) + sSearchToken += '*'; + + if ( sSearchToken.Len() > 1 || + ( sSearchToken.Len() > 0 && sSearchToken.GetChar( 0 ) != '*' ) ) { - if ( bForSearch ) - sSearchStr += ' '; - else - sSearchStr += '|'; + if ( sSearchStr.Len() > 0 ) + { + if ( bForSearch ) + sSearchStr += ' '; + else + sSearchStr += '|'; + } + sSearchStr += sSearchToken; } - sSearchStr += sSearchToken; } aBoundary = xBreak->nextWord( rSearchString, nStartPos, aLocale, WordType::ANYWORD_IGNOREWHITESPACES ); @@ -2030,7 +2033,9 @@ void SfxHelpIndexWindow_Impl::SetFactory( const String& rFactory, sal_Bool bActi if ( rFactory.Len() > 0 ) { GetIndexPage()->SetFactory( rFactory ); - GetSearchPage()->SetFactory( rFactory ); + // the index page did a check if rFactory is valid, + // so the index page always returns a valid factory + GetSearchPage()->SetFactory( GetIndexPage()->GetFactory() ); if ( bActive ) SetActiveFactory(); } |