From d1a8ce5f59a3c39875842d01e1e12e467f351e9b Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Mon, 10 Oct 2011 12:23:46 +0300
Subject: WaE: C4584: foo is already a base-class of bar

'cppu::WeakImplHelper8<Ifc1,Ifc2,Ifc3,Ifc4,Ifc5,Ifc6,Ifc7,Ifc8>' :
base-class 'com::sun::star::script::XInvocation' is already a
base-class of 'com::sun::star::script::XAutomationInvocation'

So ignore that warning. No idea if the duplicate base class
XInvocation is intentional or not, and I certainly won't dare touch
it.

I guess the existing pragma to ignore warning C4548 was a typo, and
what was intended was this warning, C4584.
---
 extensions/source/ole/oleobjw.hxx | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'extensions')

diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 9282de1596ee..5e7769a58c07 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -30,16 +30,11 @@
 #define __OLEOBJW_HXX
 #include "ole2uno.hxx"
 
-#ifdef _MSC_VER
-#pragma warning (push,1)
-#pragma warning (disable:4548)
-#endif
-
 #include <tools/presys.h>
 #define _WIN32_WINNT 0x0403
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
-#undef _DEBUG
+#undef _DEBUG // why?
 #endif
 #include <atlbase.h>
 #include <vector>
@@ -47,8 +42,11 @@
 #include <tools/postsys.h>
 
 #ifdef _MSC_VER
-#pragma warning (pop)
+#pragma warning (push,1)
+// warning C4584: 'cppu::WeakImplHelper8<Ifc1,Ifc2,Ifc3,Ifc4,Ifc5,Ifc6,Ifc7,Ifc8>' : base-class 'com::sun::star::script::XInvocation' is already a base-class of 'com::sun::star::script::XAutomationInvocation'
+#pragma warning (disable:4584)
 #endif
+
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase8.hxx>
@@ -290,6 +288,11 @@ protected:
 };
 
 } // end namespace
+
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit