tdf#66039 DOCX: import textboxes (with tables, images etc.) in group shapes

Text boxes in group shapes were imported as shapes, losing
complex text content: tables (tdf#66039), colors (tdf#73022),
images (tdf#81958), lists, paragraph styles, hyperlinks
(tdf#122960) and track changes.

Note: a few unit tests have been deactivated temporarily.
Test document "groupshape-trackedchanges.docx" of
testGroupshapeTrackedchanges is imported correctly now:
with track changes, and the test was modified accordingly.

Follow-up to commit 2951cbdf3a6e2b62461665546b47e1d253fcb834
"tdf#143574 OOXML export/import of textboxes in group shapes".

Change-Id: I6eb918dbf64393fd723fe43f798f93b5b9a12575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125051
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>

2 files changed, 11 insertions, 16 deletions

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 62808b697d49..baf7d12383b7 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1829,14 +1829,14 @@ CPPUNIT_TEST_FIXTURE(Test, testGroupShapeTextHighlight)
         0xFF00FFUL, // magenta
         0x0000FFUL, // blue
         0xFF0000UL, // red
-        0x00008BUL, // dark blue
-        0x008B8BUL, // dark cyan
-        0x006400UL, // dark green
+        0x000080UL, // dark blue
+        0x008080UL, // dark cyan
+        0x008000UL, // dark green
         0x800080UL, // dark magenta
-        0x8B0000UL, // dark red
+        0x800000UL, // dark red
         0x808000UL, // dark yellow
-        0xA9A9A9UL, // dark grey
-        0xD3D3D3UL, // light grey
+        0x808080UL, // dark grey
+        0xC0C0C0UL, // light grey
         0x000000UL  // black
     };
 
@@ -1852,7 +1852,7 @@ CPPUNIT_TEST_FIXTURE(Test, testGroupShapeTextHighlight)
         uno::Reference<text::XTextRange> firstRun = getRun(firstParagraph, 1);
         uno::Reference<beans::XPropertySet> props(firstRun, uno::UNO_QUERY_THROW);
 
-        CPPUNIT_ASSERT_EQUAL(xColors[idx], props->getPropertyValue("CharBackColor").get<sal_uInt32>());
+        CPPUNIT_ASSERT_EQUAL(xColors[idx], props->getPropertyValue("CharHighlight").get<sal_uInt32>());
     }
 }
 
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 81bd1ec640fa..bb677a125beb 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -661,10 +661,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf121804)
     // This failed with a NoSuchElementException, super/subscript property was
     // lost on import, so the whole paragraph was a single run.
     uno::Reference<text::XTextRange> xSecondRun = getRun(xFirstPara, 2);
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(30),
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(14000),
                          getProperty<sal_Int32>(xSecondRun, "CharEscapement"));
     uno::Reference<text::XTextRange> xThirdRun = getRun(xFirstPara, 3);
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(-25),
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(-14000),
                          getProperty<sal_Int32>(xThirdRun, "CharEscapement"));
 }
 
@@ -902,8 +902,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf129912)
     }
 }
 
-#if 0
-// TODO: Link import in frames in groupshapes.
 CPPUNIT_TEST_FIXTURE(Test, testTdf126426)
 {
     load(mpTestDocumentPath, "tdf126426.docx");
@@ -913,8 +911,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf126426)
 
     // get second shape in group
     uno::Reference<text::XTextRange> xRange(xGroup->getByIndex(1), uno::UNO_QUERY_THROW);
-    uno::Reference<container::XEnumerationAccess> xParaEnumAccess(xRange,
-                                                                  uno::UNO_QUERY_THROW);
+    uno::Reference<container::XEnumerationAccess> xParaEnumAccess(xRange, uno::UNO_QUERY_THROW);
     uno::Reference<container::XEnumeration> xParaEnum = xParaEnumAccess->createEnumeration();
 
     uno::Reference<text::XTextRange> xPara(xParaEnum->nextElement(), uno::UNO_QUERY_THROW);
@@ -930,8 +927,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf126426)
         // Link and this content was completely missong before
         uno::Reference<text::XTextRange> xRun(xRunEnum->nextElement(), uno::UNO_QUERY_THROW);
         CPPUNIT_ASSERT_EQUAL(OUString("Link"), xRun->getString());
-        auto xURLField = getProperty<uno::Reference<text::XTextField>>(xRun, "TextField");
-        auto aURL = getProperty<OUString>(xURLField, "URL");
+        auto aURL = getProperty<OUString>(xRun, "HyperLinkURL");
         CPPUNIT_ASSERT_EQUAL(OUString("http://libreoffice.org/"), aURL);
     }
     {
@@ -941,7 +937,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf126426)
         CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty<sal_Int32>(xRun, "CharColor"));
     }
 }
-#endif
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();