summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2019-08-28 16:24:59 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2019-08-29 11:43:01 +0200
commit761f38dbc6b5d96856414f04579c507ae390e107 (patch)
tree51388dcc3a067c91e1dec8d757789ed2d8823e1d /sw
parentf4da1acd98bf3955a8011642f31880a656e7aa77 (diff)
tdf#118169: ActiveX form control saved incorrectly with accented letters
Write out unicode strings without any compression. Change-Id: I93cadc40bacbd679724c3404fd870cba48065650 Reviewed-on: https://gerrit.libreoffice.org/78234 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 4b82652c4de94db553dfd7a63801ea81d366315a) Reviewed-on: https://gerrit.libreoffice.org/78238 Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlexport/data/tdf118169.docxbin0 -> 5650 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport13.cxx10
2 files changed, 10 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf118169.docx b/sw/qa/extras/ooxmlexport/data/tdf118169.docx
new file mode 100644
index 000000000000..2510fb3e59eb
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf118169.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index d58da46d89df..9d2500986e51 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -317,6 +317,16 @@ DECLARE_OOXMLEXPORT_TEST(tdf119809, "tdf119809.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty< uno::Sequence<OUString> >(xPropertySet, "StringItemList").getLength());
}
+DECLARE_OOXMLEXPORT_TEST(tdf118169, "tdf118169.docx")
+{
+ // Unicode characters were converted to question marks.
+ 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.CheckBox")));
+ CPPUNIT_ASSERT_EQUAL(OUString(u"őőőőőőőőőőőűűűű"), getProperty<OUString>(xPropertySet, "Label"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */