diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-25 15:43:58 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2013-11-05 11:36:01 +0100 |
commit | aa0af361255696210825bfbb9c5e709936733708 (patch) | |
tree | afe6db3706d1e2121a026162ab991d8e3b1540cf | |
parent | 38b91d99b99afaf80ec5cd862199c5a074f36ff6 (diff) |
Use inconditionally the libwpd >= 0.9.5 path
Since libwpd does not output the version number anymore
(cherry picked from commit 93d0e38ccc06060f20073a9461c53f471a1b9c03)
Conflicts:
writerperfect/source/common/WPXSvStream.cxx
Change-Id: I1bc3f7081552795fc2ed33f033a093fa5b40fda8
Reviewed-on: https://gerrit.libreoffice.org/5103
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | writerperfect/source/stream/WPXSvStream.cxx | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 8c2edf94daf5..a88cb6af01a0 100644 --- a/configure.ac +++ b/configure.ac @@ -7110,7 +7110,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) |