diff options
| author | Eike Rathke <erack@redhat.com> | 2016-02-25 16:18:57 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-02-25 17:33:37 +0100 |
| commit | c09404917318b026902c2f26bdc16d0e52eb4720 (patch) | |
| tree | 4d7c0ccde3bbc8f78f3c9edfc080c504b1090981 /forms | |
| parent | b3ee4ba346ca21a89158a86c7fc1fc3b25d3e371 (diff) | |
use SearchOptions2
Change-Id: I58d39616dc15fc973e1377ed205452a683baf080
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/xforms/computedexpression.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index d67c8ba41c8a..31b9aaf389b2 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/util/SearchAlgorithms.hpp> +#include <com/sun/star/util/SearchAlgorithms2.hpp> #include <osl/diagnose.h> @@ -52,8 +52,7 @@ using com::sun::star::xml::xpath::XPathExtension; using com::sun::star::xml::xpath::XXPathExtension; using com::sun::star::xml::xpath::XXPathObject; using com::sun::star::xml::xpath::XPathObjectType_XPATH_UNDEFINED; -using com::sun::star::util::SearchOptions; -using com::sun::star::util::SearchAlgorithms_REGEXP; +using com::sun::star::util::SearchOptions2; namespace xforms @@ -87,10 +86,10 @@ bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const assert(pExpression && "no expression?"); // call RegExp engine - SearchOptions aSearchOptions; - aSearchOptions.algorithmType = SearchAlgorithms_REGEXP; + SearchOptions2 aSearchOptions; + aSearchOptions.AlgorithmType2 = css::util::SearchAlgorithms2::REGEXP; aSearchOptions.searchString = OUString( pExpression, strlen(pExpression), RTL_TEXTENCODING_ASCII_US ); - utl::TextSearch aTextSearch( utl::TextSearch::UpgradeToSearchOptions2( aSearchOptions) ); + utl::TextSearch aTextSearch( aSearchOptions ); sal_Int32 nLength = msExpression.getLength(); sal_Int32 nStart = 0; |