diff options
author | Eike Rathke <erack@redhat.com> | 2017-06-20 12:59:23 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-06-27 13:58:56 +0200 |
commit | f7dd446502971eca44d06dd205ebf3e8c63075a2 (patch) | |
tree | 25b8a956a5b1aabb085e9968016cc07270011295 /xmloff | |
parent | f14e2ad6e0afea83f01f2de89f574a2f01aec288 (diff) |
Resolves: tdf#107438 write <text:sender-initials> for fields
Only in <office:annotation> context write <loext:sender-initials>
Broken since
commit 5f8476c00f482ab5c8707de2ebdcd41faa4057fc
Date: Fri Dec 13 23:21:46 2013 +0100
and
commit 49f9694e34d07468cff4a7e4de332f11be3e0dd8
Date: Fri Dec 13 23:30:34 2013 +0100
Change-Id: I48b146b779878bf0faa5830a721559d8e864dd33
(cherry picked from commit 29f250c428953750ce89dec7ee961723478609c1)
Reviewed-on: https://gerrit.libreoffice.org/39012
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit cfb44fa3fa5449319c61023b9f9fb52ae87acc04)
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/text/txtflde.cxx | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 26cea156ca73..d73e37058cb4 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -2230,23 +2230,10 @@ void XMLTextFieldExport::ExportElement(enum XMLTokenEnum eElementName, if (eElementName != XML_TOKEN_INVALID) { // Element - if (eElementName == XML_SENDER_INITIALS) - { - if (SvtSaveOptions().GetODFDefaultVersion() > SvtSaveOptions::ODFVER_012) - { - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT, - eElementName, false, false ); - // export content - GetExport().Characters(sContent); - } - } - else - { - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, - eElementName, false, false ); - // export content - GetExport().Characters(sContent); - } + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, + eElementName, false, false ); + // export content + GetExport().Characters(sContent); } else { // always export content GetExport().Characters(sContent); |