[Libreoffice-commits] libcdr.git: configure.ac src/lib

[Fridrich Å trba]

 configure.ac             |    4 ++--
 src/lib/CDRZipStream.cpp |    4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 7a9f8be1d17e8e74d2d0e60da36152a300a4de6c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jul 25 16:06:59 2013 +0200

    Hard depend on libwpd 0.9.5

diff --git a/configure.ac b/configure.ac
index c963784..689e44d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,8 @@ PKG_PROG_PKG_CONFIG([0.20])
 # 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
 ])
 AC_SUBST(WPD_CFLAGS)
 AC_SUBST(WPD_LIBS)
diff --git a/src/lib/CDRZipStream.cpp b/src/lib/CDRZipStream.cpp
index d904057..eacd342 100644
--- a/src/lib/CDRZipStream.cpp
+++ b/src/lib/CDRZipStream.cpp
@@ -160,11 +160,7 @@ WPXInputStream *libcdr::CDRZipStream::getDocumentOLEStream(const char *name)
 
 bool libcdr::CDRZipStreamImpl::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
   {