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

[Dr. David Alan Gilbert (via logerrit)]

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

New commits:
commit f75974f95f04efef92c2a17eed498d9dd189c7a0
Author:     Dr. David Alan Gilbert <d...@treblig.org>
AuthorDate: Thu Nov 11 00:02:31 2021 +0000
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Nov 11 15:42:03 2021 +0100

    ooxmlexport test: fix ?: identical values
    
    cppcheck spotted a pair of:
    
    CPPUNIT_ASSERT_EQUAL(sal_Int32(mbExported ? 11331 : 11331), 
xChildGroup->getPosition().Y);
    
    where the ?: has the same values; from 
https://gerrit.libreoffice.org/c/core/+/115668
    
    squash the ?:
    
    Change-Id: I3c1756bd63699408f722824684d71b74c6ea9b7d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125017
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 2cc4334b4a4a..9c9604cd9c8b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -368,12 +368,12 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeChildPosition, 
"dml-groupshape-childpo
     uno::Reference<drawing::XShapes> xGroup(getShape(1), uno::UNO_QUERY);
     uno::Reference<drawing::XShape> xChildGroup(xGroup->getByIndex(1), 
uno::UNO_QUERY);
     CPPUNIT_ASSERT_EQUAL(sal_Int32(-2123), xChildGroup->getPosition().X);
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(mbExported ? 11331 : 11331), 
xChildGroup->getPosition().Y);
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(11331), xChildGroup->getPosition().Y);
 
     xGroup.set(xChildGroup, uno::UNO_QUERY);
     xChildGroup.set(xGroup->getByIndex(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT_EQUAL(sal_Int32(-1859), xChildGroup->getPosition().X);
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(mbExported ? 11331 : 11331), 
xChildGroup->getPosition().Y);
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(11331), xChildGroup->getPosition().Y);
 
     xChildGroup.set(xGroup->getByIndex(1), uno::UNO_QUERY);
     CPPUNIT_ASSERT_EQUAL(sal_Int32(-2123), xChildGroup->getPosition().X);