summaryrefslogtreecommitdiff
path: root/writerperfect/source
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:19:27 +0000
commit9a3d3ee99d5e751bd2cb6e64110d944f2dd6b427 (patch)
treef73884a29b90137e04741a61245ef54dc44eebcf /writerperfect/source
parent7520b77f18d1c20c6fc0dbeecaab2ca8311d27fd (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>
Diffstat (limited to 'writerperfect/source')
-rw-r--r--writerperfect/source/stream/WPXSvStream.cxx4
1 files changed, 0 insertions, 4 deletions
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)