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

Tamás Zolnai tamas.zolnai at collabora.com
Sun Aug 20 11:07:06 UTC 2017


 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a7e8c5304b740cb4e03e25b7217ce6071c29c09b
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Sat Aug 19 11:35:32 2017 +0200

    This test intended to be an export test
    
    Change-Id: Ib233bd603185efdb85ed30f3d00c28512d57a0ac
    Reviewed-on: https://gerrit.libreoffice.org/41355
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 01f9fbb97ec1..43de0cc7ec55 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -827,7 +827,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf105095, "tdf105095.docx")
     CPPUNIT_ASSERT(xTextRange->getString().endsWith("\tfootnote"));
 }
 
-DECLARE_OOXMLIMPORT_TEST( testActiveXCheckbox, "activex_checkbox.docx" )
+DECLARE_OOXMLEXPORT_TEST( testActiveXCheckbox, "activex_checkbox.docx" )
 {
     uno::Reference<drawing::XControlShape> xControlShape( getShape(1), uno::UNO_QUERY );
     CPPUNIT_ASSERT( xControlShape.is() );
@@ -844,7 +844,8 @@ DECLARE_OOXMLIMPORT_TEST( testActiveXCheckbox, "activex_checkbox.docx" )
     CPPUNIT_ASSERT_EQUAL( sal_Int32( 0x316AC5 ), getProperty<sal_Int32>(xPropertySet, "BackgroundColor") );
 
     // Check Text color (active border system color)
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD4D0C8), getProperty<sal_Int32>(xPropertySet, "TextColor"));
+    if(!mbExported) // Bug: text color is not exported
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD4D0C8), getProperty<sal_Int32>(xPropertySet, "TextColor"));
 
     // Check state of the checkbox
     CPPUNIT_ASSERT_EQUAL(sal_Int16(1), getProperty<sal_Int16>(xPropertySet, "State"));


More information about the Libreoffice-commits mailing list