diff options
| author | Eike Rathke <erack@redhat.com> | 2013-12-13 23:05:06 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-12-13 23:09:13 +0100 |
| commit | be63a5d34d4659b2fb8341a6e662b926e9d7f852 (patch) | |
| tree | 14ae5ac27a42c84a646a647d342960252bca9807 /xmloff/source/text | |
| parent | e7e6e9ab60cc9475d20eb330817954003f90076f (diff) | |
fdo#72697 accept future <loext:sender-initials>
... of to-be <text:sender-initials>
Change-Id: Ia601c0debc5d66682aa92e14fb063395f9f48ab5
(cherry picked from commit 1379294741ff85d4c09d9ded7579ad50dea88fb7)
Diffstat (limited to 'xmloff/source/text')
| -rw-r--r-- | xmloff/source/text/txtfldi.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index bea669e5bbca..73aa7aaa7d60 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3658,7 +3658,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 ff88ffcea469..192013e337d4 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -154,7 +154,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 }, |