diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-08-23 17:24:40 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-09-17 15:21:35 +0200 |
| commit | afe190f1545a159e67d48eeba5c6be133d262af0 (patch) | |
| tree | 116042de5545908b7c65f9e4a9e583680c62d1cc /sw | |
| parent | 4436a29401beffd0893ecae70cd09c7a49f49f22 (diff) | |
tdf#119809: FILESAVE DOCX The combo box ActiveX control is lost
The problem was with the empty combobox. The implemenation before this
commit imported a combobox only when the combobox had any item.
Reviewed-on: https://gerrit.libreoffice.org/78024
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 3ceefe9abff98fc24ffb5e8e405f4999faddc351)
Change-Id: I945098277d1ed34c65b43f0f6ad8eb361cf41b53
Reviewed-on: https://gerrit.libreoffice.org/78394
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf119809.docx | bin | 0 -> 22211 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 11 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf119809.docx b/sw/qa/extras/ooxmlexport/data/tdf119809.docx Binary files differnew file mode 100644 index 000000000000..977938253108 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf119809.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index 4942409a78d5..825907b4a781 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -13,6 +13,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> +#include <com/sun/star/drawing/XControlShape.hpp> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> @@ -131,6 +132,16 @@ DECLARE_OOXMLEXPORT_TEST(tdf127085, "tdf127085.docx") CPPUNIT_ASSERT_EQUAL(sal_Int16(50), getProperty<sal_Int16>(xShape, "FillTransparence")); } +DECLARE_OOXMLEXPORT_TEST(tdf119809, "tdf119809.docx") +{ + // Combobox without an item list lost during import + uno::Reference<drawing::XControlShape> xControlShape(getShape(1), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xPropertySet(xControlShape->getControl(), uno::UNO_QUERY); + uno::Reference<lang::XServiceInfo> xServiceInfo(xPropertySet, uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(true, bool(xServiceInfo->supportsService("com.sun.star.form.component.ComboBox"))); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty< uno::Sequence<OUString> >(xPropertySet, "StringItemList").getLength()); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |