tdf#50097: DOCX: export form controls as MSO ActiveX controls

* Use the same structure for export what MSO uses
** Position and size information are exported as VML shape properties
** Different handling of inline and floating controls (pict or object)
** Do some changes on VML shape export to match how MSO exports these controls
** Write out activeX.xml and activeX.bin to store control properties
** Use persistStorage storage type defined in activeX.xml
* Drop grabbaging of activex.XML and activeX.bin
* Cleanup control related test code

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/41256
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit c0cc02e2934aeb12dda44818955e5964496c186a)

Change-Id: I38bb2b2ffd2676c5459b61ec2549c31348bab41c

This test intended to be an export test

Change-Id: Ib233bd603185efdb85ed30f3d00c28512d57a0ac
Reviewed-on: https://gerrit.libreoffice.org/41355
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit a7e8c5304b740cb4e03e25b7217ce6071c29c09b)

Fix two issues in ActiveX DOCX import / export code

* Inline anchored VML shape had wrong vertical position
** In MSO inline shapes are positioned to the top of the baseline
* During export all shape ids were the same (shape_0)
** VML shapes used to be exported only as fallback,
   I guess that's why it did not cause any issue before.
** Override the shapeid generator with a new one, which
   actually generates unique shapeids.

Reviewed-on: https://gerrit.libreoffice.org/41319
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 2d1fe7fb67ec1ff1b96912c0945d17d54aecb12e)

Change-Id: I752f39d092d0b61d91824141655dae662dbeafbc

DOCX: Fix an other test case of ActiveX control export

When LO control is anchored to the end of the run, it
is exported into a new run.

Reviewed-on: https://gerrit.libreoffice.org/41472
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit b129421764ae78a1422812169fce8eb4914a6b22)

Change-Id: I9269fd1b34924780aad61c452d1e2094dc8e4aad
Reviewed-on: https://gerrit.libreoffice.org/41484
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

1 files changed, 19 insertions, 1 deletions

diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 5b9028d0db03..ba28dbfa48d5 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/drawing/TextAdjust.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/drawing/CircleKind.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
@@ -423,7 +424,24 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         }
         else if ( rObj.GetType() == "drawing.Control" )
         {
-            break;
+            mpEscherEx->OpenContainer( ESCHER_SpContainer );
+            bool bInline = false;
+            const Reference< XPropertySet > xPropSet(rObj.mXPropSet, UNO_QUERY);
+            if(xPropSet.is())
+            {
+                text::TextContentAnchorType eAnchorType;
+                xPropSet->getPropertyValue("AnchorType") >>= eAnchorType;
+                bInline = eAnchorType == text::TextContentAnchorType_AS_CHARACTER;
+            }
+
+            if(bInline)
+            {
+                ADD_SHAPE( ESCHER_ShpInst_PictureFrame, SHAPEFLAG_HAVESPT | SHAPEFLAG_HAVEANCHOR );
+            }
+            else
+            {
+                ADD_SHAPE( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVESPT | SHAPEFLAG_HAVEANCHOR );
+            }
         }
         else if ( rObj.GetType() == "drawing.Connector" )
         {