diff options
author | Mark Hung <marklh9@gmail.com> | 2016-01-10 00:28:14 +0800 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-01-12 16:08:36 +0000 |
commit | 7ec5ba47783ac8b2d0141109d0efe6b20b363ced (patch) | |
tree | bb4735b2f6c276251f92e5647dc78a6f24235ab0 | |
parent | cbc0c1b64bff517b27104c6335d45fb59a884931 (diff) |
Fix FastSaxSerializer::write() for non-BMP unicode characters.
Change-Id: I6ee9d028813c970b9ac5b9f0574af932e73111bd
Reviewed-on: https://gerrit.libreoffice.org/21293
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r-- | sax/source/tools/fastserializer.cxx | 25 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/data/nonbmpchar.docx | bin | 0 -> 4194 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 9 |
3 files changed, 11 insertions, 23 deletions
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx index 37ed847c6066..8437ff0284e4 100644 --- a/sax/source/tools/fastserializer.cxx +++ b/sax/source/tools/fastserializer.cxx @@ -94,29 +94,8 @@ namespace sax_fastparser { void FastSaxSerializer::write( const OUString& sOutput, bool bEscape ) { - const sal_Int32 nLength = sOutput.getLength(); - for (sal_Int32 i = 0; i < nLength; ++i) - { - const sal_Unicode cUnicode = sOutput[ i ]; - const char cChar = cUnicode; - if (cUnicode & 0xff80) - { - write( OString(&cUnicode, 1, RTL_TEXTENCODING_UTF8) ); - } - else if(bEscape) switch( cChar ) - { - case '<': writeBytes( "<", 4 ); break; - case '>': writeBytes( ">", 4 ); break; - case '&': writeBytes( "&", 5 ); break; - case '\'': writeBytes( "'", 6 ); break; - case '"': writeBytes( """, 6 ); break; - case '\n': writeBytes( " ", 5 ); break; - case '\r': writeBytes( " ", 5 ); break; - default: writeBytes( &cChar, 1 ); break; - } - else - writeBytes( &cChar, 1 ); - } + write( sOutput.toUtf8(), bEscape ); + } void FastSaxSerializer::write( const OString& sOutput, bool bEscape ) diff --git a/sw/qa/extras/ooxmlexport/data/nonbmpchar.docx b/sw/qa/extras/ooxmlexport/data/nonbmpchar.docx Binary files differnew file mode 100644 index 000000000000..a6b5d416c15e --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/nonbmpchar.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 9deea3e1eb2a..68c0e2d03611 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -1011,6 +1011,15 @@ DECLARE_OOXMLEXPORT_TEST(testOO106020, "ooo106020-1.odt") assertXPath(pXmlDoc, "//w:tbl", 1); } +DECLARE_OOXMLEXPORT_TEST(testNonBMPChar, "nonbmpchar.docx") +{ + sal_uInt32 nCh = 0x24b62; + OUString aExpected( &nCh, 1); + // Assert that UTF8 encoded non-BMP Unicode character is correct + uno::Reference<text::XTextRange> xTextRange1 = getRun(getParagraph(1), 1); + CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange1->getString()); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |