diff options
| author | Eike Rathke <erack@redhat.com> | 2016-02-24 22:37:57 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-02-24 22:42:05 +0100 |
| commit | 21edff2a37c9c22d200df2638e31f7ff3afe85b6 (patch) | |
| tree | 8b3ded0d95c55ddf739e4baf71d5726fa79d80ab /sc | |
| parent | eb3e47dbf798103d09bb8f3461959726e917a75f (diff) | |
let SvxSearchItem use SearchOptions2
And all those places that interface to SvxSearchItem.
Change-Id: I08915824a596cd0f247a89f44e4684cd22b98082
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/table6.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index d99fa4258289..d094a7e513d3 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -35,8 +35,6 @@ #include "postit.hxx" #include "stringutil.hxx" -using ::com::sun::star::util::SearchOptions; - namespace { bool lcl_GetTextWithBreaks( const EditTextObject& rData, ScDocument* pDoc, OUString& rVal ) @@ -727,7 +725,7 @@ bool ScTable::SearchAndReplace( else { // SearchParam no longer needed - SearchOptions contains all settings - css::util::SearchOptions aSearchOptions = rSearchItem.GetSearchOptions(); + css::util::SearchOptions2 aSearchOptions = rSearchItem.GetSearchOptions(); aSearchOptions.Locale = *ScGlobal::GetLocale(); if (aSearchOptions.searchString.isEmpty()) @@ -744,7 +742,7 @@ bool ScTable::SearchAndReplace( ( css::i18n::TransliterationModules_IGNORE_CASE | css::i18n::TransliterationModules_IGNORE_WIDTH ); - pSearchText = new utl::TextSearch( utl::TextSearch::UpgradeToSearchOptions2( aSearchOptions) ); + pSearchText = new utl::TextSearch( aSearchOptions ); if (nCommand == SvxSearchCmd::FIND) bFound = Search(rSearchItem, rCol, rRow, rMark, rUndoStr, pUndoDoc); |