|
 |
f0633d |
From bedc707bffdfe906a15036a40da1b9179d91b4fc Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Eike Rathke <erack@redhat.com>
|
|
|
f0633d |
Date: Fri, 13 Dec 2013 23:05:06 +0100
|
|
|
f0633d |
Subject: [PATCH 065/109] fdo#72697 accept future <loext:sender-initials>
|
|
|
f0633d |
|
|
|
f0633d |
... of to-be <text:sender-initials>
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: Ia601c0debc5d66682aa92e14fb063395f9f48ab5
|
|
|
f0633d |
(cherry picked from commit 1379294741ff85d4c09d9ded7579ad50dea88fb7)
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7076
|
|
|
f0633d |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f0633d |
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f0633d |
---
|
|
|
f0633d |
xmloff/source/text/txtfldi.cxx | 2 +-
|
|
|
f0633d |
xmloff/source/text/txtimp.cxx | 3 ++-
|
|
|
f0633d |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
|
|
|
f0633d |
index 875677c..3d99acf 100644
|
|
|
f0633d |
--- a/xmloff/source/text/txtfldi.cxx
|
|
|
f0633d |
+++ b/xmloff/source/text/txtfldi.cxx
|
|
|
f0633d |
@@ -3669,7 +3669,7 @@ SvXMLImportContext* XMLAnnotationImportContext::CreateChildContext(
|
|
|
f0633d |
pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
|
|
|
f0633d |
rLocalName, aDateBuffer);
|
|
|
f0633d |
}
|
|
|
f0633d |
- else if( XML_NAMESPACE_TEXT == nPrefix )
|
|
|
f0633d |
+ else if( XML_NAMESPACE_TEXT == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
|
|
|
f0633d |
{
|
|
|
f0633d |
if( IsXMLToken( rLocalName, XML_SENDER_INITIALS ) )
|
|
|
f0633d |
pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
|
|
|
f0633d |
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
|
|
|
f0633d |
index b5028ae..24221a6 100644
|
|
|
f0633d |
--- a/xmloff/source/text/txtimp.cxx
|
|
|
f0633d |
+++ b/xmloff/source/text/txtimp.cxx
|
|
|
f0633d |
@@ -155,7 +155,8 @@ static SvXMLTokenMapEntry aTextPElemTokenMap[] =
|
|
|
f0633d |
// sender fields
|
|
|
f0633d |
{ XML_NAMESPACE_TEXT, XML_SENDER_FIRSTNAME,XML_TOK_TEXT_SENDER_FIRSTNAME},
|
|
|
f0633d |
{ XML_NAMESPACE_TEXT, XML_SENDER_LASTNAME, XML_TOK_TEXT_SENDER_LASTNAME },
|
|
|
f0633d |
- { XML_NAMESPACE_TEXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS },
|
|
|
f0633d |
+ { XML_NAMESPACE_LO_EXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS },
|
|
|
f0633d |
+ { XML_NAMESPACE_TEXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS },
|
|
|
f0633d |
{ XML_NAMESPACE_TEXT, XML_SENDER_TITLE, XML_TOK_TEXT_SENDER_TITLE },
|
|
|
f0633d |
{ XML_NAMESPACE_TEXT, XML_SENDER_POSITION, XML_TOK_TEXT_SENDER_POSITION },
|
|
|
f0633d |
{ XML_NAMESPACE_TEXT, XML_SENDER_EMAIL, XML_TOK_TEXT_SENDER_EMAIL },
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|