|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
From 0fb375bd77846318e4a31a76d606726389c77994 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Message-Id: <0fb375bd77846318e4a31a76d606726389c77994.1498070696.git.erack@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
From: Eike Rathke <erack@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Date: Tue, 20 Jun 2017 12:59:23 +0200
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Subject: [PATCH] Resolves: tdf#107438 write <text:sender-initials> for fields
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
MIME-Version: 1.0
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
This is a multi-part message in MIME format.
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
--------------erAck-patch-parts
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Content-Type: text/plain; charset=UTF-8; format=fixed
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Content-Transfer-Encoding: 8bit
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Only in <office:annotation> context write <loext:sender-initials>
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Broken since
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
commit 5f8476c00f482ab5c8707de2ebdcd41faa4057fc
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Date: Fri Dec 13 23:21:46 2013 +0100
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
and
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
commit 49f9694e34d07468cff4a7e4de332f11be3e0dd8
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Date: Fri Dec 13 23:30:34 2013 +0100
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Change-Id: I48b146b779878bf0faa5830a721559d8e864dd33
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
(cherry picked from commit 29f250c428953750ce89dec7ee961723478609c1)
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
---
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
xmloff/source/text/txtflde.cxx | 21 ++++-----------------
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
1 file changed, 4 insertions(+), 17 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
--------------erAck-patch-parts
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Content-Type: text/x-patch; name="0001-Resolves-tdf-107438-write-text-sender-initials-for-f.patch"
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Content-Transfer-Encoding: 8bit
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
Content-Disposition: attachment; filename="0001-Resolves-tdf-107438-write-text-sender-initials-for-f.patch"
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
index c198d27..2bf2589 100644
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
--- a/xmloff/source/text/txtflde.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
+++ b/xmloff/source/text/txtflde.cxx
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
@@ -2229,23 +2229,10 @@ void XMLTextFieldExport::ExportElement(enum XMLTokenEnum eElementName,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
if (eElementName != XML_TOKEN_INVALID)
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
{
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
// Element
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- if (eElementName == XML_SENDER_INITIALS)
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- {
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- if (SvtSaveOptions().GetODFDefaultVersion() > SvtSaveOptions::ODFVER_012)
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- {
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- eElementName, false, false );
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- // export content
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- GetExport().Characters(sContent);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- }
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- }
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- else
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- {
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- eElementName, false, false );
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- // export content
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- GetExport().Characters(sContent);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
- }
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
+ SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
+ eElementName, false, false );
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
+ // export content
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
+ GetExport().Characters(sContent);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
} else {
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
// always export content
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
GetExport().Characters(sContent);
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
--------------erAck-patch-parts--
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|
|
![](https://seccdn.libravatar.org/avatar/b9abe9e9d14e330a6e2696b8d58d85d6b9fde5a53c05d6258ea609b6e39bfa87?s=16&d=retro) |
cef05d3 |
|