[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa

[Noel Grandin (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2d529b76d20695b4f8cc9d1a66691515e2259659
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jan 27 16:20:49 2020 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue Jan 28 11:48:19 2020 +0100

    fix bug in testTdf128304
    
    Assuming the test actually meant to use these vars
    
    Comes from
        commit b203b9c83d0000c8465dcd92fb6b029a2f28c724
        Date:   Fri Dec 13 07:23:35 2019 +0800
        tdf#128304 export TB_RL writing mode as eaVirt
    
    Change-Id: I0649f189019ea764e7ed554dac43932b717eed2c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87535
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 44a520fe7ffd8bca45babdf325ec307c30c1a006)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87585
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index ee5b55b00139..6696bae7e527 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -915,15 +915,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf128304, "tdf128304.odt")
     CPPUNIT_ASSERT_EQUAL(css::text::WritingMode::WritingMode_TB_RL, eMode);
 
     uno::Reference<beans::XPropertySet> xProps2(getShape(2), uno::UNO_QUERY);
-    CPPUNIT_ASSERT(xProps1->getPropertyValue("TextWritingMode") >>= eMode);
+    CPPUNIT_ASSERT(xProps2->getPropertyValue("TextWritingMode") >>= eMode);
     CPPUNIT_ASSERT_EQUAL(css::text::WritingMode::WritingMode_TB_RL, eMode);
 
     uno::Reference<beans::XPropertySet> xProps3(getShape(3), uno::UNO_QUERY);
-    CPPUNIT_ASSERT(xProps1->getPropertyValue("TextWritingMode") >>= eMode);
+    CPPUNIT_ASSERT(xProps3->getPropertyValue("TextWritingMode") >>= eMode);
     CPPUNIT_ASSERT_EQUAL(css::text::WritingMode::WritingMode_TB_RL, eMode);
 
     uno::Reference<beans::XPropertySet> xProps4(getShape(4), uno::UNO_QUERY);
-    CPPUNIT_ASSERT(xProps1->getPropertyValue("TextWritingMode") >>= eMode);
+    CPPUNIT_ASSERT(xProps4->getPropertyValue("TextWritingMode") >>= eMode);
     CPPUNIT_ASSERT_EQUAL(css::text::WritingMode::WritingMode_TB_RL, eMode);
 }