import RTF_DODHGT

Change-Id: I6e97c33569e46171ed702b573d42ced805cded78

2 files changed, 28 insertions, 0 deletions

diff --git a/sw/qa/extras/rtfimport/data/do-dhgt.rtf b/sw/qa/extras/rtfimport/data/do-dhgt.rtf
new file mode 100644
index 000000000000..d46c6c7a1918
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/do-dhgt.rtf
@@ -0,0 +1,9 @@
+{\rtf1

+{\*\do\dobxcolumn\dobypara\dodhgt251658240\dprect\dpx1275\dpy-135\dpxsize1770\dpysize855

+\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr79\dpfillbgcg129\dpfillbgcb189\dpfillpat1\dplinew60\dplinecor242\dplinecog242\dplinecob242}

+{\*\do\dobxcolumn\dobypara\dodhgt251657727\dprect\dpx2475\dpy150\dpxsize2025\dpysize1080

+\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr155\dpfillbgcg187\dpfillbgcb89\dpfillpat1\dplinew60\dplinecor242\dplinecog242\dplinecob242}

+{\*\do\dobxcolumn\dobypara\dodhgt251657215\dprect\dpx1560\dpy420\dpxsize2325\dpysize1365

+\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr192\dpfillbgcg80\dpfillbgcb77\dpfillpat1\dplinew60\dplinecor242\dplinecog242\dplinecob242}

+\par

+}

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 976a4f8d893a..6e620d387af1 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -116,6 +116,7 @@ public:
     void testFdo55493();
     void testCopyPastePageStyle();
     void testShptxtPard();
+    void testDoDhgt();
 
     CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -171,6 +172,7 @@ public:
     CPPUNIT_TEST(testFdo55493);
     CPPUNIT_TEST(testCopyPastePageStyle);
     CPPUNIT_TEST(testShptxtPard);
+    CPPUNIT_TEST(testDoDhgt);
 #endif
     CPPUNIT_TEST_SUITE_END();
 
@@ -905,6 +907,23 @@ void Test::testShptxtPard()
     CPPUNIT_ASSERT_EQUAL(OUString("shape text"), xText->getString());
 }
 
+void Test::testDoDhgt()
+{
+    load("do-dhgt.rtf");
+    uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
+    uno::Reference<container::XIndexAccess> xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+    for (int i = 0; i < xDraws->getCount(); ++i)
+    {
+        sal_Int32 nFillColor = getProperty<sal_Int32>(xDraws->getByIndex(i), "FillColor");
+        if (nFillColor == 0xc0504d) // red
+            CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xDraws->getByIndex(i), "ZOrder"));
+        else if (nFillColor == 0x9bbb59) // green
+            CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<sal_Int32>(xDraws->getByIndex(i), "ZOrder"));
+        else if (nFillColor == 0x4f81bd) // blue
+            CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty<sal_Int32>(xDraws->getByIndex(i), "ZOrder"));
+    }
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();