[Libreoffice-commits] .: libvisio/libvisio-lineheight.patch libvisio/UnpackedTarball_visio.mk

[Libreoffice Gerrit user]

 libvisio/UnpackedTarball_visio.mk  |    8 ++++++++
 libvisio/libvisio-lineheight.patch |   11 +++++++++++
 2 files changed, 19 insertions(+)

New commits:
commit 5d309c7e2e8a3dbeb497c2216476ae83340925f1
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Dec 11 11:57:34 2012 +0100

    Fix a bug with fixed line-heights in Visio files
    
    Change-Id: I861c49d2b0dfc57d6e777b14742cb324e4d4d0a8

diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk
index aa9113b..3afd8af 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 0000000..922fac8
--- /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);
+