diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-13 19:42:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-14 09:55:51 +0100 |
| commit | cdd824029edf880650afa46cb439049c7b9f9a93 (patch) | |
| tree | d4ac1a91d9f718bdd3f36d87c2cf54a9d67d5810 /external | |
| parent | a62b421440de305a910d4ace4c146012f9f25e14 (diff) | |
crashtesting: libstaroffice should use sender-lastname not send-lastname
https://github.com/fosnola/libstaroffice/pull/7
Change-Id: Id4fe0bd016cf57d1b48055775d03cfc859ac557b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86715
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 | 26 | ||||
| -rw-r--r-- | external/libstaroffice/UnpackedTarball_libstaroffice.mk | 3 |
2 files changed, 29 insertions, 0 deletions
diff --git a/external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 b/external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 new file mode 100644 index 000000000000..8bb967201f40 --- /dev/null +++ b/external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 @@ -0,0 +1,26 @@ +From ae4dc7ea2a45a7ae560a0c399c7d8a720f670996 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Mon, 13 Jan 2020 20:04:38 +0000 +Subject: [PATCH] text:send-lastname should be text:sender-lastname + +as detected by LibreOffice crashtesting +--- + src/lib/SWFieldManager.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/SWFieldManager.cxx b/src/lib/SWFieldManager.cxx +index 81f423b..071e20c 100644 +--- a/src/lib/SWFieldManager.cxx ++++ b/src/lib/SWFieldManager.cxx +@@ -293,7 +293,7 @@ bool Field::send(STOFFListenerPtr &listener, StarState &state) const + else if (m_type==30) { + if (m_subType>=0 && m_subType<=16) { + char const *wh[]= { +- "text:sender-company", "text:sender-firstname", "text:send-lastname", "text:sender-initials", "text:sender-street", ++ "text:sender-company", "text:sender-firstname", "text:sender-lastname", "text:sender-initials", "text:sender-street", + "text:sender-country", "text:sender-postal-code", "text:sender-city", "text:sender-title", "text:sender-position", + "text:sender-phone-private", "text:sender-phone-work", "text:sender-fax", "text:sender-email", "text:sender-state-or-province", + "text:sender-lastname" /*father name*/, "text:sender-street" /* appartement*/ +-- +2.24.1 + diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk index 0e51f67625ac..db499cba64d2 100644 --- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk +++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk @@ -31,9 +31,12 @@ endif # * external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 is upstream at # <https://github.com/fosnola/libstaroffice/pull/6> "Fix equality operator arguments": +# * external/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 is upstream at +# <https://github.com/fosnola/libstaroffice/pull/7> "text:send-lastname should be text:sender-lastname": $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice,\ external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 \ external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 \ + external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 \ )) # vim: set noet sw=4 ts=4: |