configure.ac | 2 +-
writerperfect/source/stream/WPXSvStream.cxx | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 9a3d3ee99d5e751bd2cb6e64110d944f2dd6b427
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Thu Jul 25 15:43:58 2013 +0200
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 <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index e97379d..21b68cb 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 b058b87..5354b72 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
