diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-04 16:08:49 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-04 16:15:28 +0100 |
commit | f26996bd3398afa789a5491968244563ccf70908 (patch) | |
tree | 0d41af56041c191437e1a932f92e060e2728a0ac /extensions/source/activex | |
parent | 368d7e97475a0282c868b32d006b237201cd0e39 (diff) |
Silence -Werror,-Wnon-virtual-dtor in generated so_activex.h (clang-cl)
Change-Id: If9472d25f469030102b26894793ba45ab0fafaa3
Diffstat (limited to 'extensions/source/activex')
-rw-r--r-- | extensions/source/activex/SOActionsApproval.cxx | 9 | ||||
-rw-r--r-- | extensions/source/activex/SOActionsApproval.h | 8 | ||||
-rw-r--r-- | extensions/source/activex/SOActiveX.cxx | 10 | ||||
-rw-r--r-- | extensions/source/activex/SOActiveX.h | 7 | ||||
-rw-r--r-- | extensions/source/activex/SOComWindowPeer.cxx | 9 | ||||
-rw-r--r-- | extensions/source/activex/SOComWindowPeer.h | 8 | ||||
-rw-r--r-- | extensions/source/activex/SODispatchInterceptor.cxx | 9 | ||||
-rw-r--r-- | extensions/source/activex/so_activex.cxx | 8 |
8 files changed, 62 insertions, 6 deletions
diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx index d0e24426252b..32f592c4746e 100644 --- a/extensions/source/activex/SOActionsApproval.cxx +++ b/extensions/source/activex/SOActionsApproval.cxx @@ -25,10 +25,17 @@ #include "stdafx2.h" -#include "so_activex.h" #include "SOActionsApproval.h" #include <sal/macros.h> +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "so_activex.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) { diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h index 68d9778b7bc1..d56ce3de7e05 100644 --- a/extensions/source/activex/SOActionsApproval.h +++ b/extensions/source/activex/SOActionsApproval.h @@ -33,8 +33,14 @@ #include <atlctl.h> +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif #include "so_activex.h" - +#if defined __clang__ +#pragma clang diagnostic pop +#endif // SOActionsApproval diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index 538ccd966175..0fdbb825940f 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -23,12 +23,20 @@ #pragma warning (disable:4265) #include "stdafx2.h" -#include "so_activex.h" #include "SOActiveX.h" #include "SOComWindowPeer.h" #include "SODispatchInterceptor.h" #include "SOActionsApproval.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "so_activex.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + #pragma warning (pop) #define STAROFFICE_WINDOWCLASS "SOParentWindow" diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h index bacee8180134..23824a20a9ee 100644 --- a/extensions/source/activex/SOActiveX.h +++ b/extensions/source/activex/SOActiveX.h @@ -33,7 +33,14 @@ #include <atlctl.h> +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif #include "so_activex.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif #pragma warning (pop) diff --git a/extensions/source/activex/SOComWindowPeer.cxx b/extensions/source/activex/SOComWindowPeer.cxx index 1b7266af8013..afee0bad4f48 100644 --- a/extensions/source/activex/SOComWindowPeer.cxx +++ b/extensions/source/activex/SOComWindowPeer.cxx @@ -24,10 +24,17 @@ #include <cstddef> #include "stdafx2.h" -#include "so_activex.h" #include "SOComWindowPeer.h" #include <sal/macros.h> +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "so_activex.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) { diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h index b038378bb5e1..b1c6f86801a8 100644 --- a/extensions/source/activex/SOComWindowPeer.h +++ b/extensions/source/activex/SOComWindowPeer.h @@ -33,8 +33,14 @@ #include <atlctl.h> +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif #include "so_activex.h" - +#if defined __clang__ +#pragma clang diagnostic pop +#endif // SOComWindowPeer diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx index 1ffb66258a8b..035d613853ca 100644 --- a/extensions/source/activex/SODispatchInterceptor.cxx +++ b/extensions/source/activex/SODispatchInterceptor.cxx @@ -25,12 +25,19 @@ #include "stdio.h" #include "stdafx2.h" -#include "so_activex.h" #include "SOActiveX.h" #include "SODispatchInterceptor.h" #include "com_uno_helper.h" #include <sal/macros.h> +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "so_activex.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid) { diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index a423020812b7..21229a889c3a 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -27,7 +27,15 @@ #include "stdafx2.h" #include "resource.h" #include <initguid.h> + +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif #include "so_activex.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif #if defined __clang__ #pragma clang diagnostic push |