diff options
| author | Eike Rathke <erack@redhat.com> | 2016-02-24 22:37:57 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-02-24 22:42:05 +0100 |
| commit | 21edff2a37c9c22d200df2638e31f7ff3afe85b6 (patch) | |
| tree | 8b3ded0d95c55ddf739e4baf71d5726fa79d80ab /sw/qa | |
| parent | eb3e47dbf798103d09bb8f3461959726e917a75f (diff) | |
let SvxSearchItem use SearchOptions2
And all those places that interface to SvxSearchItem.
Change-Id: I08915824a596cd0f247a89f44e4684cd22b98082
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/core/macros-test.cxx | 9 | ||||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 8d408c3ba68b..687ac8661103 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -18,7 +18,8 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.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/frame/Desktop.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XStorable.hpp> @@ -451,7 +452,7 @@ void SwMacrosTest::testFindReplace() pPaM->Move(fnMoveBackward, fnGoDoc); bool bCancel(false); - util::SearchOptions opts( + util::SearchOptions2 opts( util::SearchAlgorithms_REGEXP, 65536, "$", @@ -460,7 +461,9 @@ void SwMacrosTest::testFindReplace() 2, 2, 2, - 1073745152); + 1073745152, + util::SearchAlgorithms2::REGEXP, + '\\'); // find newline on 1st paragraph bool bFound = pPaM->Find( diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 71ed6801aa16..304393e216cc 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -69,7 +69,8 @@ #include "com/sun/star/util/XNumberFormatTypes.hpp" #include "com/sun/star/util/NumberFormat.hpp" #include "com/sun/star/util/XNumberFormatsSupplier.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/SearchFlags.hpp> #include "com/sun/star/util/SearchAlgorithms.hpp" #include "com/sun/star/i18n/TransliterationModulesExtra.hpp" @@ -1819,7 +1820,7 @@ void SwUiWriterTest::testSearchWithTransliterate() aIdx = SwNodeIndex(pDoc->GetNodes().GetEndOfContent(), -1); aPaM = SwPaM(aIdx); pDoc->getIDocumentContentOperations().InsertString(aPaM,"This is Other PARAGRAPH"); - css::util::SearchOptions SearchOpt; + css::util::SearchOptions2 SearchOpt; SearchOpt.algorithmType = css::util::SearchAlgorithms_ABSOLUTE; SearchOpt.searchFlag = 0x00000001; SearchOpt.searchString = "other"; @@ -1828,6 +1829,8 @@ void SwUiWriterTest::testSearchWithTransliterate() SearchOpt.deletedChars = 0; SearchOpt.insertedChars = 0; SearchOpt.transliterateFlags = css::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL; + SearchOpt.AlgorithmType2 = css::util::SearchAlgorithms2::ABSOLUTE; + SearchOpt.WildcardEscapeCharacter = 0; //transliteration option set so that at least one of the search strings is not found sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END); SwShellCursor* pShellCursor = pWrtShell->getShellCursor(true); |