diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-30 12:15:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-31 10:00:07 +0200 |
| commit | 8b52d4e73a06d433d128d61a4939e92e4a497d71 (patch) | |
| tree | 7888aa54b430ea537ad7c8adb59379163d4d4a64 /sw/qa | |
| parent | fd405ab457183f1c0d48d47bbd3308edb2e30242 (diff) | |
convert SwDocPositions to scoped enum
Change-Id: Idd9414b4a10398130337e474fb8fd4063e3bd4f8
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/core/macros-test.cxx | 4 | ||||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 2f4d95369622..b73205545e93 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -558,7 +558,7 @@ void SwMacrosTest::testFindReplace() // find newline on 1st paragraph bool bFound = pPaM->Find( - opts, false, DOCPOS_CURR, DOCPOS_END, bCancel); + opts, false, SwDocPositions::Curr, SwDocPositions::End, bCancel); CPPUNIT_ASSERT(bFound); CPPUNIT_ASSERT(pPaM->HasMark()); CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText()); @@ -566,7 +566,7 @@ void SwMacrosTest::testFindReplace() // now do another Find, inside the selection from the first Find // opts.searchFlags = 71680; bFound = pPaM->Find( - opts, false, DOCPOS_CURR, DOCPOS_END, bCancel, FND_IN_SEL); + opts, false, SwDocPositions::Curr, SwDocPositions::End, bCancel, FND_IN_SEL); CPPUNIT_ASSERT(bFound); CPPUNIT_ASSERT(pPaM->HasMark()); CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText()); diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index b2ebfffca846..3ef3363e5ff1 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -1967,14 +1967,14 @@ void SwUiWriterTest::testSearchWithTransliterate() 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); + sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,SwDocPositions::Start,SwDocPositions::End); SwShellCursor* pShellCursor = pWrtShell->getShellCursor(true); CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCursor->GetText()); CPPUNIT_ASSERT_EQUAL(0,(int)case1); SearchOpt.searchString = "paragraph"; SearchOpt.transliterateFlags = css::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL; //transliteration option set so that all search strings are found - sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END); + sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,SwDocPositions::Start,SwDocPositions::End); pShellCursor = pWrtShell->getShellCursor(true); CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCursor->GetText()); CPPUNIT_ASSERT_EQUAL(1,(int)case2); @@ -2002,19 +2002,19 @@ void SwUiWriterTest::testTdf73660() searchOpt.searchFlag = css::util::SearchFlags::NORM_WORD_ONLY; //case 1 searchOpt.searchString = "First"; - CPPUNIT_ASSERT_EQUAL(sal_uLong(1), pWrtShell->SearchPattern(searchOpt,true,DOCPOS_START,DOCPOS_END)); + CPPUNIT_ASSERT_EQUAL(sal_uLong(1), pWrtShell->SearchPattern(searchOpt,true,SwDocPositions::Start,SwDocPositions::End)); //case 2 searchOpt.searchString = "Second"; - CPPUNIT_ASSERT_EQUAL(sal_uLong(1), pWrtShell->SearchPattern(searchOpt,true,DOCPOS_START,DOCPOS_END)); + CPPUNIT_ASSERT_EQUAL(sal_uLong(1), pWrtShell->SearchPattern(searchOpt,true,SwDocPositions::Start,SwDocPositions::End)); //case 3 searchOpt.searchString = "Third"; - CPPUNIT_ASSERT_EQUAL(sal_uLong(1), pWrtShell->SearchPattern(searchOpt,true,DOCPOS_START,DOCPOS_END)); + CPPUNIT_ASSERT_EQUAL(sal_uLong(1), pWrtShell->SearchPattern(searchOpt,true,SwDocPositions::Start,SwDocPositions::End)); //case 4 searchOpt.searchString = "Fourth"; - CPPUNIT_ASSERT_EQUAL(sal_uLong(1), pWrtShell->SearchPattern(searchOpt,true,DOCPOS_START,DOCPOS_END)); + CPPUNIT_ASSERT_EQUAL(sal_uLong(1), pWrtShell->SearchPattern(searchOpt,true,SwDocPositions::Start,SwDocPositions::End)); //case 5 searchOpt.searchString = "Fifth"; - CPPUNIT_ASSERT_EQUAL(sal_uLong(1), pWrtShell->SearchPattern(searchOpt,true,DOCPOS_START,DOCPOS_END)); + CPPUNIT_ASSERT_EQUAL(sal_uLong(1), pWrtShell->SearchPattern(searchOpt,true,SwDocPositions::Start,SwDocPositions::End)); } void SwUiWriterTest::testNewDocModifiedState() |