[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - xmloff/source

[Eike Rathke]

 xmloff/source/text/txtflde.cxx |   21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

New commits:
commit a51022cebf8b515a7913d767a8c5f6886dc64720
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jun 20 12:59:23 2017 +0200

    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/39011
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 11bdee3aeafb..959b2e75162b 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2221,23 +2221,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);