[Libreoffice-commits] core.git: writerperfect/source

Fridrich Å trba fridrich.strba at bluewin.ch
Thu Jul 25 06:48:49 PDT 2013


 writerperfect/source/common/WPXSvStream.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 93d0e38ccc06060f20073a9461c53f471a1b9c03
Author: Fridrich Å trba <fridrich.strba at 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
    
    Change-Id: I1bc3f7081552795fc2ed33f033a093fa5b40fda8

diff --git a/writerperfect/source/common/WPXSvStream.cxx b/writerperfect/source/common/WPXSvStream.cxx
index a79ac6c..e0c8d8c 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)


More information about the Libreoffice-commits mailing list