diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-01-16 08:25:42 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thb@documentfoundation.org> | 2014-01-16 09:14:05 +0000 |
| commit | 14d1995e2f26af5362be97059674eb01bd946455 (patch) | |
| tree | 7607eea01f40a69991e7e63218de64b0426c74cc | |
| parent | 03d5ffdca7261af6af9124a75e1a079337609d06 (diff) | |
libodfgen produces strings in utf8 encoding
Change-Id: Iad17f4b4786473205669bd5b080b0a64d4a6a441
Reviewed-on: https://gerrit.libreoffice.org/7455
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 9e5e7c9b556bf9386fb5ad3ecd28b3d43aeeb393)
Reviewed-on: https://gerrit.libreoffice.org/7456
(cherry picked from commit 0501b81caf787ace5d2c8da65329d9f6adbace4e)
Reviewed-on: https://gerrit.libreoffice.org/7458
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Reviewed-by: Thorsten Behrens <thb@documentfoundation.org>
Tested-by: Thorsten Behrens <thb@documentfoundation.org>
| -rw-r--r-- | writerperfect/source/common/DocumentHandler.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/writerperfect/source/common/DocumentHandler.cxx b/writerperfect/source/common/DocumentHandler.cxx index 4fd98da571f5..073b9429571b 100644 --- a/writerperfect/source/common/DocumentHandler.cxx +++ b/writerperfect/source/common/DocumentHandler.cxx @@ -41,17 +41,20 @@ void DocumentHandler::startElement(const char *psName, const WPXPropertyList &xP // filter out libwpd elements if (strncmp(i.key(), "libwpd", 6) != 0) { - pAttrList->AddAttribute(OUString::createFromAscii(i.key()), - OUString::createFromAscii(i()->getStr().cstr())); + OUString sName(i.key(), strlen(i.key()), RTL_TEXTENCODING_UTF8); + OUString sValue(i()->getStr().cstr(), strlen(i()->getStr().cstr()), RTL_TEXTENCODING_UTF8); + pAttrList->AddAttribute(sName, sValue); } } - mxHandler->startElement(OUString::createFromAscii(psName), xAttrList); + OUString sElementName(psName, strlen(psName), RTL_TEXTENCODING_UTF8); + mxHandler->startElement(sElementName, xAttrList); } void DocumentHandler::endElement(const char *psName) { - mxHandler->endElement(OUString::createFromAscii(psName)); + OUString sElementName(psName, strlen(psName), RTL_TEXTENCODING_UTF8); + mxHandler->endElement(sElementName); } void DocumentHandler::characters(const WPXString &sCharacters) |