diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-12-18 10:36:20 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-12-18 10:37:43 +0100 |
| commit | 8e7a38669ae3c99ea3a90b2af15c6be2234ac284 (patch) | |
| tree | e21a8c60676f479532dd6777c39d7fbf804db1ef /libvisio | |
| parent | f15b317a7c081dc0601805ffb07cb6778a2bf122 (diff) | |
Fix the regression in fdo#47499: wrong fill colour
Change-Id: I986a5f4c944f9fe9e985c408a72f766d9b1eed12
Diffstat (limited to 'libvisio')
| -rw-r--r-- | libvisio/UnpackedTarball_visio.mk | 8 | ||||
| -rw-r--r-- | libvisio/libvisio-lineheight.patch | 11 |
2 files changed, 0 insertions, 19 deletions
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index 3afd8afe1c87..aa9113bafd6d 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,visio,\ - libvisio/libvisio-lineheight.patch \ -)) -# libvisio/libvisio-lineheight.patch: see upstream -# <https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commitdiff; -# h=257e1896942a7028f1d0669ac6d4f61f294cb14d> -# "Fixed line height is in inches :(" - # vim: set noet sw=4 ts=4: diff --git a/libvisio/libvisio-lineheight.patch b/libvisio/libvisio-lineheight.patch deleted file mode 100644 index 922fac80b0ac..000000000000 --- a/libvisio/libvisio-lineheight.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libvisio-0.0.23/src/lib/VSDContentCollector.cpp -+++ misc/build/libvisio-0.0.23/src/lib/VSDContentCollector.cpp -@@ -526,7 +526,7 @@ void libvisio::VSDContentCollector::_flushText() - break; - } - if ((*paraIt).spLine > 0) -- paraProps.insert("fo:line-height", (*paraIt).spLine, WPX_POINT); -+ paraProps.insert("fo:line-height", (*paraIt).spLine); - else - paraProps.insert("fo:line-height", -(*paraIt).spLine, WPX_PERCENT); - |