summaryrefslogtreecommitdiff
path: root/winaccessibility/source/UAccCOM
diff options
context:
space:
mode:
Diffstat (limited to 'winaccessibility/source/UAccCOM')
-rw-r--r--winaccessibility/source/UAccCOM/AccAction.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/AccComponent.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/AccEditableText.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/AccHyperLink.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/AccHypertext.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/AccImage.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/AccRelation.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/AccTable.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/AccText.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/AccValue.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/EnumVariant.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/EnumVariant.h10
-rw-r--r--winaccessibility/source/UAccCOM/MAccessible.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/UAccCOM.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/UNOXWrapper.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/UNOXWrapper.h8
-rw-r--r--winaccessibility/source/UAccCOM/stdafx.h1
17 files changed, 15 insertions, 144 deletions
diff --git a/winaccessibility/source/UAccCOM/AccAction.cxx b/winaccessibility/source/UAccCOM/AccAction.cxx
index 97bfc4f40aed..094e102519f8 100644
--- a/winaccessibility/source/UAccCOM/AccAction.cxx
+++ b/winaccessibility/source/UAccCOM/AccAction.cxx
@@ -21,16 +21,8 @@
* AccAction.cpp : Implementation of CAccAction
*/
#include "stdafx.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
+#include "AccAction.h"
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 2ca64cd7df1c..e1e7af6abfdb 100644
--- a/winaccessibility/source/UAccCOM/AccComponent.cxx
+++ b/winaccessibility/source/UAccCOM/AccComponent.cxx
@@ -21,16 +21,8 @@
* AccComponent.cpp : Implementation of CUAccCOMApp and DLL registration.
*/
#include "stdafx.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
+#include "AccComponent.h"
/**
* Returns the location of the upper left corner of the object's bounding
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx
index 2bfd843660e1..3dd1883b9fb3 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.cxx
+++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx
@@ -21,16 +21,8 @@
* AccEditableText.cpp : Implementation of CUAccCOMApp and DLL registration.
*/
#include "stdafx.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 "AccEditableText.h"
#include <vcl/svapp.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.cxx b/winaccessibility/source/UAccCOM/AccHyperLink.cxx
index 6857540c321c..5546c93e5804 100644
--- a/winaccessibility/source/UAccCOM/AccHyperLink.cxx
+++ b/winaccessibility/source/UAccCOM/AccHyperLink.cxx
@@ -18,16 +18,8 @@
*/
#include "stdafx.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 "AccHyperLink.h"
#include <vcl/svapp.hxx>
diff --git a/winaccessibility/source/UAccCOM/AccHypertext.cxx b/winaccessibility/source/UAccCOM/AccHypertext.cxx
index 722f13b5cf5e..75d816112e85 100644
--- a/winaccessibility/source/UAccCOM/AccHypertext.cxx
+++ b/winaccessibility/source/UAccCOM/AccHypertext.cxx
@@ -18,19 +18,11 @@
*/
#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 666524a71192..a8d27a81cc78 100644
--- a/winaccessibility/source/UAccCOM/AccImage.cxx
+++ b/winaccessibility/source/UAccCOM/AccImage.cxx
@@ -18,16 +18,8 @@
*/
#include "stdafx.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 "AccImage.h"
#include <vcl/svapp.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx b/winaccessibility/source/UAccCOM/AccRelation.cxx
index 543a5b1aebe6..ef3265000bab 100644
--- a/winaccessibility/source/UAccCOM/AccRelation.cxx
+++ b/winaccessibility/source/UAccCOM/AccRelation.cxx
@@ -18,16 +18,8 @@
*/
#include "stdafx.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 "AccRelation.h"
#include <vcl/svapp.hxx>
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx
index 472f0d8f23ca..2022eb7e24eb 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -21,16 +21,8 @@
* AccTable.cpp : Implementation of CAccTable.
*/
#include "stdafx.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 "AccTable.h"
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
diff --git a/winaccessibility/source/UAccCOM/AccText.cxx b/winaccessibility/source/UAccCOM/AccText.cxx
index fc6c39285a80..0cddc52a8fc5 100644
--- a/winaccessibility/source/UAccCOM/AccText.cxx
+++ b/winaccessibility/source/UAccCOM/AccText.cxx
@@ -18,16 +18,8 @@
*/
#include "stdafx.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
+#include "AccText.h"
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 c18440e6558f..8465fb5718f7 100644
--- a/winaccessibility/source/UAccCOM/AccValue.cxx
+++ b/winaccessibility/source/UAccCOM/AccValue.cxx
@@ -18,18 +18,10 @@
*/
#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 885a1ebc3cb8..e5d2b9524657 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.cxx
+++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx
@@ -18,18 +18,10 @@
*/
#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 <sal/log.hxx>
#include <vcl/svapp.hxx>
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h
index bf7a45feb155..49822d529621 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.h
+++ b/winaccessibility/source/UAccCOM/EnumVariant.h
@@ -22,16 +22,8 @@
#include "Resource.h" // main symbols
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#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
+#include <AccObjectManagerAgent.hxx>
/**
* CEnumVariant implements IEnumVARIANT interface.
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index a1b24aa0d62e..cf53ec077973 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -17,16 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#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 "MAccessible.h"
#include <algorithm>
#include <cstddef>
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx
index 944db5c94c10..2914e16c36f7 100644
--- a/winaccessibility/source/UAccCOM/UAccCOM.cxx
+++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx
@@ -20,16 +20,8 @@
#include "stdafx.h"
#include "Resource.h"
#include <initguid.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
+#include <accHelper.hxx>
#if defined __clang__
#pragma clang diagnostic push
diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.cxx b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx
index c009a005e4d1..df55dc09a43c 100644
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.cxx
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx
@@ -17,16 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#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
+#include "UNOXWrapper.h"
using namespace ::com::sun::star;
diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h
index 42983f88ace6..b319d4e2b66f 100644
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.h
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h
@@ -23,15 +23,7 @@
#include "Resource.h" // main symbols
#include <com/sun/star/accessibility/XAccessible.hpp>
-
-#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/UAccCOM/stdafx.h b/winaccessibility/source/UAccCOM/stdafx.h
index 53044645f326..6a68376a8ee5 100644
--- a/winaccessibility/source/UAccCOM/stdafx.h
+++ b/winaccessibility/source/UAccCOM/stdafx.h
@@ -45,7 +45,6 @@
#pragma clang diagnostic ignored "-Winvalid-noreturn"
#pragma clang diagnostic ignored "-Wmicrosoft"
#pragma clang diagnostic ignored "-Wnon-pod-varargs"
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
#include <atlbase.h>
// You may derive a class from CComModule and use it if you want to override