diff options
| author | David Tardon <dtardon@redhat.com> | 2018-02-28 14:25:44 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-03-02 14:09:10 +0100 |
| commit | 265b67c1737d25ebaf302fb59c1dfe59dfb4f449 (patch) | |
| tree | 21941a30d6c6531a52b965e6be74d55020e1a156 /external | |
| parent | 9992411eccfc8f2717a91acc0a079be844e8f4db (diff) | |
tdf#116018 fix mising shapes in .pub import
Change-Id: I58447c13bf693ef0bf92922599f4318598f8b288
Reviewed-on: https://gerrit.libreoffice.org/50524
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libmspub/0001-tdf-116018-close-shape-group-correctly.patch.1 | 30 | ||||
| -rw-r--r-- | external/libmspub/UnpackedTarball_libmspub.mk | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/external/libmspub/0001-tdf-116018-close-shape-group-correctly.patch.1 b/external/libmspub/0001-tdf-116018-close-shape-group-correctly.patch.1 new file mode 100644 index 000000000000..19948836bc8c --- /dev/null +++ b/external/libmspub/0001-tdf-116018-close-shape-group-correctly.patch.1 @@ -0,0 +1,30 @@ +From a2e4fb779cff37a2cfc6ddf747d7715c545578a6 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Wed, 28 Feb 2018 13:40:08 +0100 +Subject: [PATCH] tdf#116018 close shape group correctly + +Regression since commit bbe7f806b95ef427153ba18bff80e674b1704ae5 . + +Change-Id: Ib6d3f58373c7cb0e1ba7a7a720187cc68d9bc7b1 +--- + src/lib/MSPUBCollector.cpp | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp +index fae688d..405470e 100644 +--- a/src/lib/MSPUBCollector.cpp ++++ b/src/lib/MSPUBCollector.cpp +@@ -558,9 +558,7 @@ bool MSPUBCollector::endGroup() + { + return false; + } +- auto parent = m_currentShapeGroup->getParent(); +- if (parent) +- m_currentShapeGroup = parent; ++ m_currentShapeGroup = m_currentShapeGroup->getParent(); + return true; + } + +-- +2.14.3 + diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk index 5ea3053d6f69..ecf1066e2eb3 100644 --- a/external/libmspub/UnpackedTarball_libmspub.mk +++ b/external/libmspub/UnpackedTarball_libmspub.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,0)) $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\ external/libmspub/ubsan.patch \ + external/libmspub/0001-tdf-116018-close-shape-group-correctly.patch.1 \ )) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmspub)) |