configure.ac | 4 ++--
src/lib/VSDZipStream.cpp | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 6fdf57fb028536659727b681a335823189576c14
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Thu Jul 25 15:42:18 2013 +0200
Hard depend on libwpd 0.9.5
diff --git a/configure.ac b/configure.ac
index 77bbe05..b310448 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,8 +58,8 @@ AC_SUBST(GPERF)
# Find additional apps
# ====================
PKG_CHECK_MODULES([WPD],[
- libwpd-0.9
- libwpd-stream-0.9
+ libwpd-0.9 >= 0.9.5
+ libwpd-stream-0.9 >= 0.9.5
])
PKG_CHECK_MODULES([WPG],[
diff --git a/src/lib/VSDZipStream.cpp b/src/lib/VSDZipStream.cpp
index f00f906..3b3e08a 100644
--- a/src/lib/VSDZipStream.cpp
+++ b/src/lib/VSDZipStream.cpp
@@ -161,11 +161,7 @@ WPXInputStream
*libvisio::VSDZipStream::getDocumentOLEStream(const char *name)
bool libvisio::VSDZipStreamImpl::findCentralDirectoryEnd()
{
-#if defined(LIBWPD_STREAM_VERSION_MAJOR) &&
defined(LIBWPD_STREAM_VERSION_MINOR) && defined(LIBWPD_STREAM_VERSION_REVISION)
\
- && (LIBWPD_STREAM_VERSION_MAJOR > 0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 &&
(LIBWPD_STREAM_VERSION_MINOR > 9 \
- || (LIBWPD_STREAM_VERSION_MINOR == 9 && LIBWPD_STREAM_VERSION_REVISION >=
5))))
if (m_cdir_offset || m_input->seek(-1024, WPX_SEEK_END))
-#endif
m_input->seek(m_cdir_offset, WPX_SEEK_SET);
try
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
