diff options
| author | Dr. David Alan Gilbert <dave@treblig.org> | 2021-11-11 00:02:31 +0000 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-11-11 15:42:03 +0100 |
| commit | f75974f95f04efef92c2a17eed498d9dd189c7a0 (patch) | |
| tree | 8e86ab738df7a8269b8cf91a9904d494deaffaee | |
| parent | Replace some macros in dbaccess part 6 (diff) | |
| download | core-f75974f95f04efef92c2a17eed498d9dd189c7a0.tar.gz core-f75974f95f04efef92c2a17eed498d9dd189c7a0.zip | |
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 <xiscofauli@libreoffice.org>
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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); |