diff options
| author | Eike Rathke <erack@redhat.com> | 2016-02-25 16:31:19 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-02-25 17:33:38 +0100 |
| commit | f75b30c2e82e3e148a3d3acea163d4bb11ea5576 (patch) | |
| tree | 7c083317ec726f07246f5764c894d467e9b21841 /reportdesign | |
| parent | 25d4142ce1fa2c1581ea03b66db6be694ac5fedb (diff) | |
use SearchOptions2
Change-Id: I4d3820d097d520fdf7cce8b41d734dd4e2e8866f
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/inspection/GeometryHandler.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 6e5fbbca0a8e..4c51faff7e0d 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -57,7 +57,8 @@ #include <com/sun/star/sdb/FilterDialog.hpp> #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/util/SearchOptions.hpp> +#include <com/sun/star/util/SearchOptions2.hpp> +#include <com/sun/star/util/SearchAlgorithms2.hpp> #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/container/XNameContainer.hpp> @@ -1851,21 +1852,21 @@ bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< repo try { const OUString sFormula( _xFunction->getFormula() ); - util::SearchOptions aSearchOptions; - aSearchOptions.algorithmType = util::SearchAlgorithms_REGEXP; + util::SearchOptions2 aSearchOptions; + aSearchOptions.AlgorithmType2 = util::SearchAlgorithms2::REGEXP; aSearchOptions.searchFlag = 0x00000100; ::std::vector< DefaultFunction >::const_iterator aIter = m_aDefaultFunctions.begin(); ::std::vector< DefaultFunction >::const_iterator aDeEnd = m_aDefaultFunctions.end(); for (; aIter != aDeEnd; ++aIter) { aSearchOptions.searchString = aIter->m_sSearchString; - utl::TextSearch aTextSearch( utl::TextSearch::UpgradeToSearchOptions2( aSearchOptions)); + utl::TextSearch aTextSearch( aSearchOptions); sal_Int32 start = 0; sal_Int32 end = sFormula.getLength(); if ( aTextSearch.SearchForward(sFormula,&start,&end) && start == 0 && end == sFormula.getLength()) // default function found { aSearchOptions.searchString = "\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"; - utl::TextSearch aDataSearch( utl::TextSearch::UpgradeToSearchOptions2( aSearchOptions)); + utl::TextSearch aDataSearch( aSearchOptions); aDataSearch.SearchForward(sFormula,&start,&end ); ++start; _rDataField = sFormula.copy(start,end-start-1); @@ -2072,11 +2073,11 @@ bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunct if ( aInitalFormula.IsPresent ) { const OUString sFormula( aFind.first->second.first->getFormula() ); - util::SearchOptions aSearchOptions; - aSearchOptions.algorithmType = util::SearchAlgorithms_REGEXP; + util::SearchOptions2 aSearchOptions; + aSearchOptions.AlgorithmType2 = util::SearchAlgorithms2::REGEXP; aSearchOptions.searchFlag = 0x00000100; aSearchOptions.searchString = m_aCounterFunction.m_sSearchString; - utl::TextSearch aTextSearch( utl::TextSearch::UpgradeToSearchOptions2( aSearchOptions)); + utl::TextSearch aTextSearch( aSearchOptions); sal_Int32 start = 0; sal_Int32 end = sFormula.getLength(); if ( aTextSearch.SearchForward(sFormula,&start,&end) && start == 0 && end == sFormula.getLength()) // counter function found |