diff options
Diffstat (limited to 'include/unotools/textsearch.hxx')
| -rw-r--r-- | include/unotools/textsearch.hxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx index 145e6607d49c..71048c226f0d 100644 --- a/include/unotools/textsearch.hxx +++ b/include/unotools/textsearch.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/XTextSearch2.hpp> -#include <com/sun/star/util/SearchOptions2.hpp> class CharClass; @@ -39,6 +38,11 @@ namespace com { } } } +namespace i18nutil { + struct SearchOptions; + struct SearchOptions2; +} +enum class TransliterationFlags; namespace utl { @@ -107,7 +111,7 @@ private: int nLEV_LongerZ; // asian flags - used for the transliteration - long nTransliterationFlags; + TransliterationFlags nTransliterationFlags; public: SearchParam( const OUString &rText, @@ -132,7 +136,7 @@ public: // signed return for API use sal_Int32 GetWildEscChar() const { return static_cast<sal_Int32>(m_cWildEscChar); } - long GetTransliterationFlags() const { return nTransliterationFlags; } + TransliterationFlags GetTransliterationFlags() const { return nTransliterationFlags; } }; // Utility class for searching a substring in a string. @@ -147,7 +151,7 @@ public: class UNOTOOLS_DLLPUBLIC TextSearch { static css::uno::Reference< css::util::XTextSearch2 > - getXTextSearch( const css::util::SearchOptions2& rPara ); + getXTextSearch( const i18nutil::SearchOptions2& rPara ); css::uno::Reference < css::util::XTextSearch2 > xTextSearch; @@ -161,7 +165,7 @@ public: TextSearch( const SearchParam & rPara, LanguageType nLanguage ); TextSearch( const SearchParam & rPara, const CharClass& rCClass ); - TextSearch( const css::util::SearchOptions2& rPara ); + TextSearch( const i18nutil::SearchOptions2& rPara ); ~TextSearch(); /* search in the (selected) text the search string: @@ -190,7 +194,7 @@ public: sal_Int32* pStart, sal_Int32* pEnd, css::util::SearchResult* pRes = nullptr ); - void SetLocale( const css::util::SearchOptions2& rOpt, + void SetLocale( const i18nutil::SearchOptions2& rOpt, const css::lang::Locale& rLocale ); /* replace back references in the replace string by the sub expressions from the search result */ @@ -200,7 +204,7 @@ public: SearchOptions2 yet. Better fix your module if you want to support wildcard search. */ - static css::util::SearchOptions2 UpgradeToSearchOptions2( const css::util::SearchOptions& rOptions ); + static i18nutil::SearchOptions2 UpgradeToSearchOptions2( const i18nutil::SearchOptions& rOptions ); }; |