[Libreoffice-commits] core.git: sw/qa

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Mar 26 20:08:05 UTC 2020


 sw/qa/extras/globalfilter/globalfilter.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 741d30b5e1b0dcdbafb300ed7c7ad46756ffd946
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Mar 26 16:50:06 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Mar 26 21:07:28 2020 +0100

    Simplify pointer equality comparison
    
    Change-Id: I40b0d398c3207b9062e6068b5e98bd814c6fd699
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91148
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index e69a7ef4634d..557fec699ce0 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -864,7 +864,7 @@ static auto verifyNestedFieldmark(OUString const& rTestName,
         node1.GetNode().GetTextNode()->GetText().indexOf(CH_TXT_ATR_FIELDSTART));
     CPPUNIT_ASSERT_EQUAL_MESSAGE(rTestName.toUtf8().getStr(),
             sal_Int32(1), innerPos.nContent.GetIndex());
-    ::sw::mark::IFieldmark const*const pInner(rIDMA.getFieldmarkAt(innerPos));
+    ::sw::mark::IFieldmark *const pInner(rIDMA.getFieldmarkAt(innerPos));
     CPPUNIT_ASSERT_MESSAGE(rTestName.toUtf8().getStr(), pInner);
     OUString const innerString(SwPaM(pInner->GetMarkPos(), pInner->GetOtherMarkPos()).GetText());
     CPPUNIT_ASSERT_EQUAL_MESSAGE(rTestName.toUtf8().getStr(), OUString(
@@ -899,7 +899,7 @@ static auto verifyNestedFieldmark(OUString const& rTestName,
         + u"baz" + OUStringChar(CH_TXT_ATR_FIELDEND)), outerString);
 
     // must return innermost mark
-    CPPUNIT_ASSERT_EQUAL(reinterpret_cast<sal_uIntPtr>(pInner), reinterpret_cast<sal_uIntPtr>(rIDMA.getFieldmarkFor(innerPos)));
+    CPPUNIT_ASSERT_EQUAL(pInner, rIDMA.getFieldmarkFor(innerPos));
 }
 
 void Test::testNestedFieldmark()


More information about the Libreoffice-commits mailing list