diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-03-17 08:03:01 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-03-17 08:03:01 +0000 |
commit | ca91efc3d39ba5037d8ab0f90afcddcd70caacd4 (patch) | |
tree | 62cf4ee58dadd467e750d31d8997f993bd31834c /i18npool | |
parent | b32f3ef00bda12dcbaf2da6d60a29f1334d433d1 (diff) |
INTEGRATION: CWS i18n11 (1.2.74); FILE MERGED
2004/01/06 22:30:13 khong 1.2.74.1: #105745# #107978# #109715# #110835# #112014# #112068# #112094# #112102# #112282# fix Japanese ambiguous search problems
Diffstat (limited to 'i18npool')
-rw-r--r-- | i18npool/source/search/textsearch.hxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index 470f732a988b..cc96e482824b 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -2,9 +2,9 @@ * * $RCSfile: textsearch.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2003-04-24 11:08:13 $ + * last change: $Author: obo $ $Date: 2004-03-17 09:03:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,12 +102,15 @@ class TextSearch: public cppu::WeakImplHelper2 ::com::sun::star::util::SearchOptions aSrchPara; ::rtl::OUString sSrchStr; + ::rtl::OUString sSrchStr2; mutable com::sun::star::uno::Reference< com::sun::star::i18n::XCharacterClassification > xCharClass; com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedTransliteration > xTranslit; + com::sun::star::uno::Reference< + com::sun::star::i18n::XExtendedTransliteration > xTranslit2; // define a function pointer for the different search nethods typedef ::com::sun::star::util::SearchResult @@ -119,9 +122,13 @@ class TextSearch: public cppu::WeakImplHelper2 // Members and methods for the normal (Boyer-Moore) search TextSearchJumpTable* pJumpTable; + TextSearchJumpTable* pJumpTable2; bool bIsForwardTab; + bool bUsePrimarySrchStr; void MakeForwardTab(); + void MakeForwardTab2(); void MakeBackwardTab(); + void MakeBackwardTab2(); sal_Int32 GetDiff( const sal_Unicode ) const; ::com::sun::star::util::SearchResult SAL_CALL NSrchFrwrd( const ::rtl::OUString& searchStr, |