sw/qa/core/macros-test.cxx | 4 ++-- sw/qa/extras/uiwriter/uiwriter.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit aa40976cb91cde4940d97203e94660be04bdda1d Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Wed Oct 23 13:23:08 2019 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Wed Oct 23 13:23:52 2019 +0200 Fix build; adapt to OUStringLiteral1 -> OUStringChar rename Change-Id: I67294848205cf0441abf1c90206bdad0001ade96 Reviewed-on: https://gerrit.libreoffice.org/81377 Reviewed-by: Stephan Bergmann <sberg...@redhat.com> Tested-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 58ea47a0449d..d5b9889f1726 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -504,7 +504,7 @@ void SwMacrosTest::testFindReplace() CPPUNIT_ASSERT(bFound); CPPUNIT_ASSERT(pPaM->HasMark()); CPPUNIT_ASSERT(pPaM->GetPoint()->nNode != pPaM->GetMark()->nNode); - CPPUNIT_ASSERT_EQUAL(OUString(OUStringLiteral1(CH_TXTATR_NEWLINE)), pPaM->GetText()); + CPPUNIT_ASSERT_EQUAL(OUString(OUStringChar(CH_TXTATR_NEWLINE)), pPaM->GetText()); // now do another Find, inside the selection from the first Find // opts.searchFlags = 71680; @@ -513,7 +513,7 @@ void SwMacrosTest::testFindReplace() CPPUNIT_ASSERT(bFound); CPPUNIT_ASSERT(pPaM->HasMark()); CPPUNIT_ASSERT(pPaM->GetPoint()->nNode != pPaM->GetMark()->nNode); - CPPUNIT_ASSERT_EQUAL(OUString(OUStringLiteral1(CH_TXTATR_NEWLINE)), pPaM->GetText()); + CPPUNIT_ASSERT_EQUAL(OUString(OUStringChar(CH_TXTATR_NEWLINE)), pPaM->GetText()); rIDCO.ReplaceRange(*pPaM, " ", true); diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 7bdd081dce2f..49ff03a594c1 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -2456,7 +2456,7 @@ void SwUiWriterTest::testTdf72788() pCursor->Move(fnMoveBackward); } //Check the text selection - CPPUNIT_ASSERT_EQUAL(OUString(u"is text" + OUStringLiteral1(CH_TXTATR_NEWLINE) + u"more"), pCursor->GetText()); + CPPUNIT_ASSERT_EQUAL(OUString(u"is text" + OUStringChar(CH_TXTATR_NEWLINE) + u"more"), pCursor->GetText()); //Apply a *Bold* attribute to selection SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT); rIDCO.InsertPoolItem(*pCursor, aWeightItem); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits