summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2024-12-13 16:11:48 +0100
committerMichael Weghorn <m.weghorn@posteo.de>2024-12-13 20:51:52 +0100
commit26c2b0af00e9aa14f5973d5fae96e5fb38151705 (patch)
treeff2ec0a2a7a3966e77b436ab1009a646cde5edf0 /include
parent007d1815a2fca1ddc5eabc29d08642049ab8966d (diff)
a11y: Move VCLXAccessibleComponent from toolkit to vcl
After commit 168512dce7f1f1453c045584d47bd78a0a6c73f7 Author: Michael Weghorn <m.weghorn@posteo.de> Date: Thu Dec 12 18:06:13 2024 +0100 a11y: Stop using VCLXWindow in vcl a11y classes and further related commits, VCLXAccessibleComponent no longer depends on anything in the toolkit module, so move it from there to vcl. This way, subclassing VCLXAccessibleComponent (as the a11y classes for vcl widgets do, currently located in accessibility/ ) no longer introduces a toolkit dependency. Change-Id: I4fd33fb1dc2265d75e8ca9ad87bcc70db61639d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178434 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'include')
-rw-r--r--include/IwyuFilter_include.yaml4
-rw-r--r--include/vcl/accessibility/vclxaccessiblecomponent.hxx (renamed from include/toolkit/awt/vclxaccessiblecomponent.hxx)10
2 files changed, 3 insertions, 11 deletions
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 1a53a2de24bd..49b5ee647d7f 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -335,10 +335,6 @@ excludelist:
- com/sun/star/datatransfer/dnd/XDropTargetListener.hpp
include/vcl/weld.hxx:
# base class has to be a complete type
- - com/sun/star/accessibility/XAccessibleRelationSet.hpp
- - com/sun/star/accessibility/XAccessible.hpp
- include/toolkit/awt/vclxaccessiblecomponent.hxx:
- # base class has to be a complete type
- com/sun/star/lang/XServiceInfo.hpp
include/toolkit/awt/vclxwindow.hxx:
# base class has to be a complete type
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/vcl/accessibility/vclxaccessiblecomponent.hxx
index b21a4afd5f6a..f658d73e962c 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/vcl/accessibility/vclxaccessiblecomponent.hxx
@@ -17,10 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
+#pragma once
-#include <toolkit/dllapi.h>
+#include <vcl/dllapi.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase.hxx>
#include <comphelper/accessiblecomponenthelper.hxx>
@@ -41,7 +40,7 @@ class AccessibleRelationSetHelper;
-class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent
+class VCL_DLLPUBLIC VCLXAccessibleComponent
:public cppu::ImplInheritanceHelper<
comphelper::OAccessibleExtendedComponentHelper, css::lang::XServiceInfo>
{
@@ -120,7 +119,4 @@ protected:
---------------------------------------------------------- */
-
-#endif // INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */