summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--writerperfect/source/stream/WPXSvStream.cxx4
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index e97379df37b1..21b68cbf1324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6996,7 +6996,7 @@ AC_MSG_CHECKING([which libwpd to use])
if test "$with_system_libwpd" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_LIBWPD=YES
- PKG_CHECK_MODULES( WPD, libwpd-0.9 libwpd-stream-0.9 )
+ PKG_CHECK_MODULES( WPD, libwpd-0.9 >= 0.9.5 libwpd-stream-0.9 >= 0.9.5 )
elif test $_os = iOS; then
AC_MSG_RESULT([none])
else
diff --git a/writerperfect/source/stream/WPXSvStream.cxx b/writerperfect/source/stream/WPXSvStream.cxx
index b058b87a52f3..5354b72f38d2 100644
--- a/writerperfect/source/stream/WPXSvStream.cxx
+++ b/writerperfect/source/stream/WPXSvStream.cxx
@@ -99,12 +99,8 @@ int WPXSvInputStream::seek(long offset, WPX_SEEK_TYPE seekType)
sal_Int64 tmpOffset = offset;
if (seekType == WPX_SEEK_CUR)
tmpOffset += tmpPosition;
-#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 (seekType == WPX_SEEK_END)
tmpOffset += mnLength;
-#endif
int retVal = 0;
if (tmpOffset < 0)