xmloff/source/text/txtfldi.cxx | 2 +- xmloff/source/text/txtimp.cxx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 1379294741ff85d4c09d9ded7579ad50dea88fb7 Author: Eike Rathke <[email protected]> Date: Fri Dec 13 23:05:06 2013 +0100 fdo#72697 accept future <loext:sender-initials> ... of to-be <text:sender-initials> Change-Id: Ia601c0debc5d66682aa92e14fb063395f9f48ab5 diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index e1a82df..0369b42 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3638,7 +3638,7 @@ SvXMLImportContext* XMLAnnotationImportContext::CreateChildContext( pContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, aDateBuffer); } - else if( XML_NAMESPACE_TEXT == nPrefix ) + else if( XML_NAMESPACE_TEXT == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix ) { if( IsXMLToken( rLocalName, XML_SENDER_INITIALS ) ) pContext = new XMLStringBufferImportContext(GetImport(), nPrefix, diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index c6f43f6..1809197 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -151,7 +151,8 @@ static const SvXMLTokenMapEntry aTextPElemTokenMap[] = // sender fields { XML_NAMESPACE_TEXT, XML_SENDER_FIRSTNAME,XML_TOK_TEXT_SENDER_FIRSTNAME}, { XML_NAMESPACE_TEXT, XML_SENDER_LASTNAME, XML_TOK_TEXT_SENDER_LASTNAME }, - { XML_NAMESPACE_TEXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS }, + { XML_NAMESPACE_LO_EXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS }, + { XML_NAMESPACE_TEXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS }, { XML_NAMESPACE_TEXT, XML_SENDER_TITLE, XML_TOK_TEXT_SENDER_TITLE }, { XML_NAMESPACE_TEXT, XML_SENDER_POSITION, XML_TOK_TEXT_SENDER_POSITION }, { XML_NAMESPACE_TEXT, XML_SENDER_EMAIL, XML_TOK_TEXT_SENDER_EMAIL }, _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
