diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-17 21:47:22 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-17 23:11:15 +0200 |
| commit | c0cc02e2934aeb12dda44818955e5964496c186a (patch) | |
| tree | 16f450bbe38e14d336bdbac3220b642b9a302a87 /sd | |
| parent | 8c0cc5cd7befffc6e8e6361ba67807a799cc997f (diff) | |
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
Change-Id: I38bb2b2ffd2676c5459b61ec2549c31348bab41c
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/41256
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Module_sd.mk | 2 | ||||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 8e2cb1122008..c1e67695fe7e 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Module_add_check_targets,sd,\ CppunitTest_sd_filters_test \ CppunitTest_sd_misc_tests \ CppunitTest_sd_html_export_tests \ - CppunitTest_sd_activex_controls_tests \ )) endif @@ -56,6 +55,7 @@ $(eval $(call gb_Module_add_screenshot_targets,sd, \ $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\ JunitTest_sd_unoapi \ + CppunitTest_sd_activex_controls_tests \ )) # vim: set noet sw=4 ts=4: diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index a4de6d9b5978..839d90db74a8 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -70,7 +70,6 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/table/XTableRows.hpp> #include <com/sun/star/style/NumberingType.hpp> -#include <com/sun/star/drawing/XControlShape.hpp> #include <stlpool.hxx> #include <comphelper/processfactory.hxx> |