strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Silence -Werror,-Wnon-virtual-dtor in generated so_activex.h (clang-cl)

Browse source 
Change-Id: If9472d25f469030102b26894793ba45ab0fafaa3
This commit is contained in:
Stephan Bergmann 2016-03-04 16:08:49 +01:00
parent 368d7e9747
commit f26996bd33
8 changed files with 62 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extensions/source/activex/SOActionsApproval.cxx
View file

@ -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)
{

8
extensions/source/activex/SOActionsApproval.h
View file

@ -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

10
extensions/source/activex/SOActiveX.cxx
View file

@ -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"

7
extensions/source/activex/SOActiveX.h
View file

@ -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)

9
extensions/source/activex/SOComWindowPeer.cxx
View file

@ -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)
{

8
extensions/source/activex/SOComWindowPeer.h
View file

@ -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

9
extensions/source/activex/SODispatchInterceptor.cxx
View file

@ -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)
{

8
extensions/source/activex/so_activex.cxx
View file

@ -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