summaryrefslogtreecommitdiff
path: root/libvisio
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-12-18 10:36:20 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-12-18 10:36:31 +0100
commit687138f72c607e02f9dabf0ca6c936209e4c76b7 (patch)
tree053138a6086ba88aa96e55294c6df8ae70b141d0 /libvisio
parentfa655c0038ad6f9d4e26b78e5438953615e9bdb7 (diff)
Fix the regression in fdo#47499: wrong fill colour
Change-Id: I986a5f4c944f9fe9e985c408a72f766d9b1eed12
Diffstat (limited to 'libvisio')
-rw-r--r--libvisio/UnpackedTarball_visio.mk8
-rw-r--r--libvisio/libvisio-lineheight.patch11
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);
-