diff options
| author | Eike Rathke <erack@redhat.com> | 2016-02-25 16:08:08 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-02-25 17:33:36 +0100 |
| commit | c20c697294dc0eae789cbdcca382c3f60ed3d497 (patch) | |
| tree | b6482ecda73d22bd48bf67f02b132cb3fe6659e5 /basic | |
| parent | 2d24d5804054bf93e3d0058ebf3ec73e3dca3a77 (diff) | |
change to SearchOptions2
Change-Id: I07a72492f1cdc566109bf8e9247368558f420abe
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index b3c092b4715c..b4ce32ca21d5 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -28,7 +28,8 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/script/XDefaultMethod.hpp> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/util/SearchOptions.hpp> +#include <com/sun/star/util/SearchOptions2.hpp> +#include <com/sun/star/util/SearchAlgorithms2.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> @@ -1550,9 +1551,9 @@ void SbiRuntime::StepLIKE() OUString pattern = VBALikeToRegexp(refVar1->GetOUString()); OUString value = refVar2->GetOUString(); - css::util::SearchOptions aSearchOpt; + css::util::SearchOptions2 aSearchOpt; - aSearchOpt.algorithmType = css::util::SearchAlgorithms_REGEXP; + aSearchOpt.AlgorithmType2 = css::util::SearchAlgorithms2::REGEXP; aSearchOpt.Locale = Application::GetSettings().GetLanguageTag().getLocale(); aSearchOpt.searchString = pattern; @@ -1568,7 +1569,7 @@ void SbiRuntime::StepLIKE() aSearchOpt.transliterateFlags |= css::i18n::TransliterationModules_IGNORE_CASE; } SbxVariable* pRes = new SbxVariable; - utl::TextSearch aSearch( utl::TextSearch::UpgradeToSearchOptions2( aSearchOpt)); + utl::TextSearch aSearch( aSearchOpt); sal_Int32 nStart=0, nEnd=value.getLength(); bool bRes = aSearch.SearchForward(value, &nStart, &nEnd); pRes->PutBool( bRes ); |