summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-12-11 11:57:34 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-12-11 11:57:41 +0100
commit5d309c7e2e8a3dbeb497c2216476ae83340925f1 (patch)
tree5f62347d986c854220d4dfdebff3f26c81b8d09c
parentf7cee036655926b428cbb7f0c930b74300001121 (diff)
Fix a bug with fixed line-heights in Visio files
Change-Id: I861c49d2b0dfc57d6e777b14742cb324e4d4d0a8
-rw-r--r--libvisio/UnpackedTarball_visio.mk8
-rw-r--r--libvisio/libvisio-lineheight.patch11
2 files changed, 19 insertions, 0 deletions
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk
index aa9113bafd6d..3afd8afe1c87 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,4 +11,12 @@ $(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
new file mode 100644
index 000000000000..922fac80b0ac
--- /dev/null
+++ b/libvisio/libvisio-lineheight.patch
@@ -0,0 +1,11 @@
+--- 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);
+