diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-10 12:23:46 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-10 12:53:07 +0300 |
| commit | d1a8ce5f59a3c39875842d01e1e12e467f351e9b (patch) | |
| tree | c5461bca9ad6372c3b034bd8f0fc067c8da18d0d /extensions | |
| parent | 6c29671175ca42e4918df2cf5df5325b58350a87 (diff) | |
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.
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/ole/oleobjw.hxx | 17 |
1 files changed, 10 insertions, 7 deletions
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: */ |