diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-04 09:57:47 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-04 10:11:14 +0100 |
commit | c6086ca6535692496fbd718d174d8eb5a5dea7c7 (patch) | |
tree | 979f4b0b8b416d75042c4e9121629d2b99e0d932 | |
parent | ba57e60a6ea1dfb236a36c1cc620554104bf848b (diff) |
Silence -Werror,-Wnon-virtual-dtor in generated UAccCOM.h (clang-cl)
Change-Id: I9466931485ed5421be589def16185d5c036bdcb8
19 files changed, 168 insertions, 18 deletions
diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx index 3cbab61ec213..3b1bf98e5ab3 100644 --- a/winaccessibility/inc/AccObject.hxx +++ b/winaccessibility/inc/AccObject.hxx @@ -32,7 +32,15 @@ #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include "accHelper.hxx" + +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif #include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif class AccEventListener; class AccObjectManagerAgent; diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx index da853832858b..e0fd8e7c9081 100644 --- a/winaccessibility/inc/AccObjectWinManager.hxx +++ b/winaccessibility/inc/AccObjectWinManager.hxx @@ -26,7 +26,15 @@ #include <osl/mutex.hxx> #include <rtl/ref.hxx> #include "ResIDGenerator.hxx" -#include "UAccCOM.h" + +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif class ResIDGenerator; class AccObjectManagerAgent; diff --git a/winaccessibility/source/UAccCOM/AccAction.cxx b/winaccessibility/source/UAccCOM/AccAction.cxx index bc21c6bb82dd..06cfa3b0176b 100644 --- a/winaccessibility/source/UAccCOM/AccAction.cxx +++ b/winaccessibility/source/UAccCOM/AccAction.cxx @@ -21,9 +21,17 @@ * AccAction.cpp : Implementation of CAccAction */ #include "stdafx.h" -#include "UAccCOM.h" #include "AccAction.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + using namespace com::sun::star::accessibility; using namespace com::sun::star::uno; diff --git a/winaccessibility/source/UAccCOM/AccComponent.cxx b/winaccessibility/source/UAccCOM/AccComponent.cxx index 083d9ac0f76a..140388157266 100644 --- a/winaccessibility/source/UAccCOM/AccComponent.cxx +++ b/winaccessibility/source/UAccCOM/AccComponent.cxx @@ -21,9 +21,17 @@ * AccComponent.cpp : Implementation of CUAccCOMApp and DLL registration. */ #include "stdafx.h" -#include "UAccCOM.h" #include "AccComponent.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + /** * Returns the location of the upper left corner of the object's bounding * box relative to the parent. diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx index e640ff0d94d7..d223524f47ee 100644 --- a/winaccessibility/source/UAccCOM/AccEditableText.cxx +++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx @@ -21,9 +21,17 @@ * AccEditableText.cpp : Implementation of CUAccCOMApp and DLL registration. */ #include "stdafx.h" -#include "UAccCOM.h" #include "AccEditableText.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.cxx b/winaccessibility/source/UAccCOM/AccHyperLink.cxx index c2902c4fa583..bb3058d0d9df 100644 --- a/winaccessibility/source/UAccCOM/AccHyperLink.cxx +++ b/winaccessibility/source/UAccCOM/AccHyperLink.cxx @@ -18,9 +18,17 @@ */ #include "stdafx.h" -#include "UAccCOM.h" #include "AccHyperLink.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/winaccessibility/source/UAccCOM/AccHypertext.cxx b/winaccessibility/source/UAccCOM/AccHypertext.cxx index 1e923c7869dd..c690184f3da1 100644 --- a/winaccessibility/source/UAccCOM/AccHypertext.cxx +++ b/winaccessibility/source/UAccCOM/AccHypertext.cxx @@ -18,11 +18,19 @@ */ #include "stdafx.h" -#include "UAccCOM.h" #include "AccHypertext.h" #include "AccHyperLink.h" #include "acccommon.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + #include <vcl/svapp.hxx> diff --git a/winaccessibility/source/UAccCOM/AccImage.cxx b/winaccessibility/source/UAccCOM/AccImage.cxx index d1a6f6b5702e..b4854f0d5c78 100644 --- a/winaccessibility/source/UAccCOM/AccImage.cxx +++ b/winaccessibility/source/UAccCOM/AccImage.cxx @@ -18,9 +18,17 @@ */ #include "stdafx.h" -#include "UAccCOM.h" #include "AccImage.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx b/winaccessibility/source/UAccCOM/AccRelation.cxx index 81e7fed1e037..7d7ab00f2f0e 100644 --- a/winaccessibility/source/UAccCOM/AccRelation.cxx +++ b/winaccessibility/source/UAccCOM/AccRelation.cxx @@ -18,9 +18,17 @@ */ #include "stdafx.h" -#include "UAccCOM.h" #include "AccRelation.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx index b04b49b6a04a..4ccc2541c15b 100644 --- a/winaccessibility/source/UAccCOM/AccTable.cxx +++ b/winaccessibility/source/UAccCOM/AccTable.cxx @@ -21,9 +21,17 @@ * AccTable.cpp : Implementation of CAccTable. */ #include "stdafx.h" -#include "UAccCOM.h" #include "AccTable.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/winaccessibility/source/UAccCOM/AccText.cxx b/winaccessibility/source/UAccCOM/AccText.cxx index a8cd87136f10..39bce542e36d 100644 --- a/winaccessibility/source/UAccCOM/AccText.cxx +++ b/winaccessibility/source/UAccCOM/AccText.cxx @@ -18,9 +18,17 @@ */ #include "stdafx.h" -#include "UAccCOM.h" #include "AccText.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + using namespace com::sun::star::accessibility; using namespace com::sun::star::uno; diff --git a/winaccessibility/source/UAccCOM/AccValue.cxx b/winaccessibility/source/UAccCOM/AccValue.cxx index f89bd7671629..481e993bf352 100644 --- a/winaccessibility/source/UAccCOM/AccValue.cxx +++ b/winaccessibility/source/UAccCOM/AccValue.cxx @@ -18,10 +18,18 @@ */ #include "stdafx.h" -#include "UAccCOM.h" #include "AccValue.h" #include "MAccessible.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx index b4fc9603bccc..b13c8ad9dba9 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.cxx +++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx @@ -18,10 +18,18 @@ */ #include "stdafx.h" -#include "UAccCOM.h" #include "EnumVariant.h" #include "MAccessible.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + #include <vcl/svapp.hxx> using namespace com::sun::star::uno; diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h index 7113aabf064f..dc560a5478a1 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.h +++ b/winaccessibility/source/UAccCOM/EnumVariant.h @@ -23,9 +23,16 @@ #include "resource.h" // main symbols #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include "UAccCOM.h" #include <AccObjectManagerAgent.hxx> +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif /** * CEnumVariant implements IEnumVARIANT interface. diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index e279911f326d..3bd658d763e3 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -18,9 +18,17 @@ */ #include "stdafx.h" -#include "UAccCOM.h" #include "MAccessible.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + #include <algorithm> #include <cstddef> diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx index f56396627572..44af32e994a7 100644 --- a/winaccessibility/source/UAccCOM/UAccCOM.cxx +++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx @@ -20,11 +20,19 @@ #include "stdafx.h" #include "resource.h" #include <initguid.h> -#include "UAccCOM.h" #include <accHelper.hxx> #if defined __clang__ #pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + +#if defined __clang__ +#pragma clang diagnostic push #pragma clang diagnostic ignored "-Wextra-tokens" // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code #endif diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.cxx b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx index 85d168e0a0ee..20fde3967e28 100644 --- a/winaccessibility/source/UAccCOM/UNOXWrapper.cxx +++ b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx @@ -18,9 +18,17 @@ */ #include "stdafx.h" -#include "UAccCOM.h" #include "UNOXWrapper.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif + using namespace ::com::sun::star; diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h index 67abc4877018..5a63e42a2c2f 100644 --- a/winaccessibility/source/UAccCOM/UNOXWrapper.h +++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h @@ -23,7 +23,15 @@ #include "resource.h" // main symbols #include <com/sun/star/accessibility/XAccessible.hpp> -#include "UAccCOM.h" + +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif /** * CUNOXWrapper implements IUNOXWrapper interface. diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx b/winaccessibility/source/service/AccObjectManagerAgent.cxx index 949505f7e865..be64b311cf02 100644 --- a/winaccessibility/source/service/AccObjectManagerAgent.cxx +++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx @@ -20,7 +20,14 @@ #include "AccObjectManagerAgent.hxx" #include "AccObjectWinManager.hxx" -#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif +#include "UAccCOM.h" +#if defined __clang__ +#pragma clang diagnostic pop +#endif using namespace com::sun::star::uno; using namespace com::sun::star::accessibility; |