tdf#99810 DOCX export: fix lost arrow shape

by saving connector shape as shape element
wps:wps instead of the invalid wps:cxnSp.

Co-author-by: Szabolcs Tóth

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

1 files changed, 23 insertions, 13 deletions

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 215d56595ebc..00a44d3fccfa 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1309,19 +1309,29 @@ ShapeExport& ShapeExport::WriteConnectorShape( const Reference< XShape >& xShape
         aRect.setHeight( aStartPoint.Y - aEndPoint.Y );
     }
 
-    pFS->startElementNS(mnXmlNamespace, XML_cxnSp);
+    // tdf#99810 connector shape (cxnSp) is not valid with namespace 'wps'
+    const auto nShapeNode = (mnXmlNamespace == XML_wps ? XML_wsp : XML_cxnSp);
+    pFS->startElementNS(mnXmlNamespace, nShapeNode);
 
-    // non visual shape properties
-    pFS->startElementNS(mnXmlNamespace, XML_nvCxnSpPr);
-    pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
-                          XML_id, OString::number(GetNewShapeID(xShape)),
-                          XML_name, GetShapeName(xShape));
-    // non visual connector shape drawing properties
-    pFS->startElementNS(mnXmlNamespace, XML_cNvCxnSpPr);
-    WriteConnectorConnections( aConnectorEntry, GetShapeID( rXShapeA ), GetShapeID( rXShapeB ) );
-    pFS->endElementNS( mnXmlNamespace, XML_cNvCxnSpPr );
-    pFS->singleElementNS(mnXmlNamespace, XML_nvPr);
-    pFS->endElementNS( mnXmlNamespace, XML_nvCxnSpPr );
+    if (mnXmlNamespace == XML_wps)
+    {
+        // non visual connector shape drawing properties
+        pFS->singleElementNS(mnXmlNamespace, XML_cNvCnPr);
+    }
+    else
+    {
+        // non visual shape properties
+        pFS->startElementNS(mnXmlNamespace, XML_nvCxnSpPr);
+        pFS->singleElementNS(mnXmlNamespace, XML_cNvPr,
+            XML_id, OString::number(GetNewShapeID(xShape)),
+            XML_name, GetShapeName(xShape));
+        // non visual connector shape drawing properties
+        pFS->startElementNS(mnXmlNamespace, XML_cNvCxnSpPr);
+        WriteConnectorConnections(aConnectorEntry, GetShapeID(rXShapeA), GetShapeID(rXShapeB));
+        pFS->endElementNS(mnXmlNamespace, XML_cNvCxnSpPr);
+        pFS->singleElementNS(mnXmlNamespace, XML_nvPr);
+        pFS->endElementNS(mnXmlNamespace, XML_nvCxnSpPr);
+    }
 
     // visual shape properties
     pFS->startElementNS(mnXmlNamespace, XML_spPr);
@@ -1336,7 +1346,7 @@ ShapeExport& ShapeExport::WriteConnectorShape( const Reference< XShape >& xShape
     // write text
     WriteTextBox( xShape, mnXmlNamespace );
 
-    pFS->endElementNS( mnXmlNamespace, XML_cxnSp );
+    pFS->endElementNS(mnXmlNamespace, nShapeNode);
 
     return *this;
 }