So just drop the duplicate XInvocation base class then

2 files changed, 3 insertions, 13 deletions

diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 1820fddffe03..275c6a87bc89 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -166,7 +166,7 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t)
     // properties. Note: Currently the basic runtime doesn't call put properties directly, it should... after all the basic runtime should know whether it is calling a put or get property.
     // For the moment for ease of merging we will let the XDirectInvoke and XAuthomationInvocation interfaces stay side by side ( and for the momemnt at least I would prefer the basic
     // runtime to call XAutomationInvocation instead of XDirectInvoke
-    return WeakImplHelper8<XInvocation, XBridgeSupplier2,
+    return WeakImplHelper7<XBridgeSupplier2,
         XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >::queryInterface(t);
 }
 
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 5e7769a58c07..bbbf08d3f047 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -41,15 +41,9 @@
 #include <boost/unordered_map.hpp>
 #include <tools/postsys.h>
 
-#ifdef _MSC_VER
-#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>
+#include <cppuhelper/implbase7.hxx>
 
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
@@ -82,7 +76,7 @@ typedef boost::unordered_multimap<OUString, unsigned int, hashOUString_Impl, equ
 // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
 // If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
 // The interface is not a real interface in terms of an abstract class but is realized through IDispatch.
-class IUnknownWrapper_Impl : public WeakImplHelper8< XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >,
+class IUnknownWrapper_Impl : public WeakImplHelper7< XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >,
 
                              public UnoConversionUtilities<IUnknownWrapper_Impl>
 
@@ -289,10 +283,6 @@ protected:
 
 } // end namespace
 
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */