summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-07-25 15:43:58 +0200
committerDavid Tardon <dtardon@redhat.com>2013-07-25 14:20:01 +0000
commit32afec7662fed6eea0714a8bf23e9f040672cb5a (patch)
tree437d7ad75ddfc24b18f03e8185a7d2b9ed2f2164
parentd49366dffaebbe98165a2dbd816107b97bbb0cb8 (diff)
Use inconditionally the libwpd >= 0.9.5 path
Since libwpd does not output the version number anymore Change-Id: I1bc3f7081552795fc2ed33f033a093fa5b40fda8 (cherry picked from commit 93d0e38ccc06060f20073a9461c53f471a1b9c03) Reviewed-on: https://gerrit.libreoffice.org/5102 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--configure.ac2
-rw-r--r--writerperfect/source/common/WPXSvStream.cxx4
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index b4ce4a289e41..03d2ef8fd8c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7221,7 +7221,7 @@ libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.1])
dnl ===================================================================
dnl Check for system libwpd
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${OUTDIR}/lib -lwpdlib"])
+libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 >= 0.9.5 libwpd-stream-0.9 >= 0.9.5],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${OUTDIR}/lib -lwpdlib"])
dnl ===================================================================
dnl Check for system lcms2
diff --git a/writerperfect/source/common/WPXSvStream.cxx b/writerperfect/source/common/WPXSvStream.cxx
index a79ac6ce504c..e0c8d8c19a85 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -134,12 +134,8 @@ int WPXSvInputStreamImpl::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)