diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:03:23 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:03:23 +0000 |
| commit | 7cb7943c9105728db6e0ca18f54585a71a0bd320 (patch) | |
| tree | 871a5a75fdc04b840d1e76e22e15201369feb210 | |
| parent | 432e50cd1145f983c0c925b013d15b9688ec7592 (diff) | |
INTEGRATION: CWS warnings01 (1.4.68); FILE MERGED
2006/03/14 15:20:35 fs 1.4.68.1: #i57457# warning-free code
| -rw-r--r-- | forms/source/xforms/computedexpression.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index 21bb9601a..c527be1c6 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.cxx @@ -4,9 +4,9 @@ * * $RCSfile: computedexpression.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:14:58 $ + * last change: $Author: hr $ $Date: 2006-06-19 13:03:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,6 +48,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 <unotools/textsearch.hxx> #include <comphelper/processfactory.hxx> @@ -67,8 +68,8 @@ using com::sun::star::xml::xpath::XXPathObject; using com::sun::star::uno::RuntimeException; using com::sun::star::uno::UNO_QUERY_THROW; using com::sun::star::xml::xpath::XPathObjectType_XPATH_UNDEFINED; - - +using com::sun::star::util::SearchOptions; +using com::sun::star::util::SearchAlgorithms_REGEXP; namespace xforms @@ -107,11 +108,10 @@ bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const OSL_ENSURE( pExpression != NULL, "no expression?" ); // call RegExp engine - utl::SearchParam aSearchParam( String( pExpression, - RTL_TEXTENCODING_ASCII_US ), - utl::SearchParam::SRCH_REGEXP ); - // invalid locale! (we don't use char classes) - utl::TextSearch aTextSearch( aSearchParam, 0 ); + SearchOptions aSearchOptions; + aSearchOptions.algorithmType = SearchAlgorithms_REGEXP; + aSearchOptions.searchString = String( pExpression, RTL_TEXTENCODING_ASCII_US ); + utl::TextSearch aTextSearch( aSearchOptions ); xub_StrLen nLength = static_cast<xub_StrLen>( msExpression.getLength() ); |