diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-23 16:15:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-01 07:28:03 +0000 |
| commit | 4c09fc48e9fa9114f32f2973090cbe75177cdd37 (patch) | |
| tree | 09d4ee3c2d75d038f45ba13a086a344d35aeadb6 /reportdesign | |
| parent | d97380c66904328e9d706a0b03a6800dc048aa7d (diff) | |
typesafe wrappers for css::i18nutil::TransliterationModules
and related css::util::SearchOptions2
The TransliterationModules enum has it's constants spread over multiple
UNO enum/constant-collections - TransliterationModules and
TransliterationModulesExtra, which means that most code simply uses
sal_Int32.
Wrap them up into a better bundle so that only the lowest layer needs to
deal directly with the UNO constants.
Change-Id: I1edeab79fcc7817a4a97c933ef84ab7015bb849b
Reviewed-on: https://gerrit.libreoffice.org/34582
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/inspection/GeometryHandler.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index bb111ce12f8f..32c4801bc250 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -32,6 +32,7 @@ #include "uistrings.hrc" #include "reportformula.hxx" +#include <i18nutil/searchopt.hxx> #include <unotools/textsearch.hxx> #include <unotools/configmgr.hxx> @@ -58,7 +59,6 @@ #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/SearchOptions2.hpp> #include <com/sun/star/util/SearchAlgorithms2.hpp> #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> @@ -1889,7 +1889,7 @@ bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< repo try { const OUString sFormula( _xFunction->getFormula() ); - util::SearchOptions2 aSearchOptions; + i18nutil::SearchOptions2 aSearchOptions; aSearchOptions.AlgorithmType2 = util::SearchAlgorithms2::REGEXP; aSearchOptions.searchFlag = 0x00000100; ::std::vector< DefaultFunction >::const_iterator aIter = m_aDefaultFunctions.begin(); @@ -2108,7 +2108,7 @@ bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunct if ( aInitalFormula.IsPresent ) { const OUString sFormula( aFind.first->second.first->getFormula() ); - util::SearchOptions2 aSearchOptions; + i18nutil::SearchOptions2 aSearchOptions; aSearchOptions.AlgorithmType2 = util::SearchAlgorithms2::REGEXP; aSearchOptions.searchFlag = 0x00000100; aSearchOptions.searchString = m_aCounterFunction.m_sSearchString; |