oox/source/ole/axbinarywriter.cxx | 4 ++-- sw/qa/extras/ooxmlexport/data/tdf118169.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-)
New commits: commit 761f38dbc6b5d96856414f04579c507ae390e107 Author: Tamás Zolnai <[email protected]> AuthorDate: Wed Aug 28 16:24:59 2019 +0200 Commit: Tamás Zolnai <[email protected]> CommitDate: Thu Aug 29 11:43:01 2019 +0200 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 <[email protected]> (cherry picked from commit 4b82652c4de94db553dfd7a63801ea81d366315a) Reviewed-on: https://gerrit.libreoffice.org/78238 Tested-by: Tamás Zolnai <[email protected]> diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx index d0e0c556e975..aa01666e9903 100644 --- a/oox/source/ole/axbinarywriter.cxx +++ b/oox/source/ole/axbinarywriter.cxx @@ -144,8 +144,8 @@ void AxBinaryPropertyWriter::writePairProperty( AxPairData& orPairData ) void AxBinaryPropertyWriter::writeStringProperty( OUString& orValue ) { - sal_uInt32 nSize = orValue.getLength(); - setFlag( nSize, AX_STRING_COMPRESSED ); + sal_uInt32 nSize = orValue.getLength() * 2; + setFlag( nSize, AX_STRING_COMPRESSED, false ); maOutStrm.writeAligned< sal_uInt32 >( nSize ); maLargeProps.push_back( ComplexPropVector::value_type( new StringProperty( orValue, nSize ) ) ); startNextProperty(); 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 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf118169.docx 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: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
