writerperfect/source/filter/DocumentHandler.hxx | 6 ------
writerperfect/source/stream/WPXSvStream.h | 12 +-----------
2 files changed, 1 insertion(+), 17 deletions(-)
New commits:
commit 7989bba5b65b6fd27fb99197087456da0b2eee17
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Wed Jul 4 20:56:08 2012 +0200
No need to suppress warnings anymore
The corresponding classes in libwpd-0.9.x have virtual destructor
if they have virtual functions.
Change-Id: Ibf97b45e7ce7d5949ac8bea0a8c204b548f567e4
diff --git a/writerperfect/source/filter/DocumentHandler.hxx
b/writerperfect/source/filter/DocumentHandler.hxx
index 13dac59..d781f30 100644
--- a/writerperfect/source/filter/DocumentHandler.hxx
+++ b/writerperfect/source/filter/DocumentHandler.hxx
@@ -22,13 +22,7 @@
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#if defined _MSC_VER
-#pragma warning( push, 1 )
-#endif
#include <libwpd/libwpd.h>
-#if defined _MSC_VER
-#pragma warning( pop )
-#endif
#include "OdfDocumentHandler.hxx"
diff --git a/writerperfect/source/stream/WPXSvStream.h
b/writerperfect/source/stream/WPXSvStream.h
index 6206a00..248e081 100644
--- a/writerperfect/source/stream/WPXSvStream.h
+++ b/writerperfect/source/stream/WPXSvStream.h
@@ -4,19 +4,9 @@
#include <sot/storage.hxx>
#include <com/sun/star/io/XInputStream.hpp>
-
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_H_
#include <com/sun/star/io/XSeekable.hpp>
-#endif
-
-#if defined _MSC_VER
-#pragma warning( push, 1 )
-#endif
-#include <libwpd-stream/WPXStream.h>
-#if defined _MSC_VER
-#pragma warning( pop )
-#endif
+#include <libwpd-stream/libwpd-stream.h>
typedef struct
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
