accessibility/Library_acc.mk | 1 - accessibility/inc/extended/accessibleiconchoicectrl.hxx | 2 +- accessibility/inc/extended/accessiblelistbox.hxx | 2 +- accessibility/inc/extended/textwindowaccessibility.hxx | 2 +- accessibility/inc/pch/precompiled_acc.hxx | 1 - accessibility/inc/standard/vclxaccessiblebox.hxx | 2 +- accessibility/inc/standard/vclxaccessibleheaderbar.hxx | 2 +- accessibility/inc/standard/vclxaccessiblelist.hxx | 2 +- accessibility/inc/standard/vclxaccessiblescrollbar.hxx | 2 +- accessibility/inc/standard/vclxaccessiblestatusbar.hxx | 2 +- accessibility/inc/standard/vclxaccessibletabcontrol.hxx | 2 +- accessibility/inc/standard/vclxaccessibletabpagewindow.hxx | 2 +- accessibility/inc/standard/vclxaccessibletextcomponent.hxx | 2 +- accessibility/inc/standard/vclxaccessibletoolbox.hxx | 2 +- accessibility/source/extended/AccessibleBrowseBox.cxx | 6 ++++-- accessibility/source/helper/acc_factory.cxx | 2 +- accessibility/source/inc/floatingwindowaccessible.hxx | 2 +- dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 2 +- dbaccess/source/ui/inc/JAccess.hxx | 2 +- dbaccess/source/ui/inc/TableWindowAccess.hxx | 2 +- include/IwyuFilter_include.yaml | 4 ---- include/vcl/accessibility/vclxaccessiblecomponent.hxx | 10 +++------- solenv/clang-format/excludelist | 4 ++-- sw/source/uibase/docvw/SidebarWinAcc.hxx | 2 +- test/source/a11y/AccessibilityTools.cxx | 2 +- toolkit/Library_tk.mk | 1 - vcl/Library_vcl.mk | 1 + vcl/source/accessibility/vclxaccessiblecomponent.cxx | 4 +--- winaccessibility/source/service/AccTopWindowListener.cxx | 2 +- 29 files changed, 31 insertions(+), 41 deletions(-)
New commits: commit e9fd0df2369a96e80f0cc178104b356e27dc506c Author: Michael Weghorn <[email protected]> AuthorDate: Fri Dec 13 16:41:13 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Dec 13 20:51:58 2024 +0100 a11y: No longer let accessibility module depend on toolkit In the AccessibleBrowseBox ctor, no longer use the VCLUnoHelper::GetInterface helper from the toolkit module, but do the same inline. (Assigning to AccessibleBrowseBoxBase::m_xFocusWindow after the AccessibleBrowseBoxBase base class ctor has been called looks a little odd to me as that one would add a focus listener for that window if already set/passed when called - but leave the logic unchanged for now.) With this, Library_acc no longer depends on the toolkit module, so drop the dependency from the make file. Change-Id: I8e7759c2d92a344bef51d154df0045c78f0471fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178435 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 5acdf2a7be99..34b32ca27954 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,acc,\ sot \ svl \ svt \ - tk \ tl \ utl \ vcl \ diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index c3b48b6b8d86..d000546fc2fe 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -20,9 +20,9 @@ #include <extended/AccessibleBrowseBox.hxx> #include <extended/AccessibleBrowseBoxTable.hxx> #include <extended/AccessibleBrowseBoxHeaderBar.hxx> +#include <com/sun/star/awt/XVclWindowPeer.hdl> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <utility> -#include <toolkit/helper/vclunohelper.hxx> #include <vcl/accessibletableprovider.hxx> #include <vcl/unohelp.hxx> #include <sal/types.h> @@ -44,7 +44,9 @@ AccessibleBrowseBox::AccessibleBrowseBox( : AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,nullptr, AccessibleBrowseBoxObjType::BrowseBox ), m_aCreator(_rxCreator) { - m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance()); + css::uno::Reference<css::awt::XWindow> xWindow( + mpBrowseBox->GetWindowInstance()->GetComponentInterface(), css::uno::UNO_QUERY); + m_xFocusWindow = xWindow; } void AccessibleBrowseBox::setCreator( const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator ) commit 26c2b0af00e9aa14f5973d5fae96e5fb38151705 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Dec 13 16:11:48 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Dec 13 20:51:52 2024 +0100 a11y: Move VCLXAccessibleComponent from toolkit to vcl After commit 168512dce7f1f1453c045584d47bd78a0a6c73f7 Author: Michael Weghorn <[email protected]> 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 <[email protected]> diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx index e83946a19135..8cf4e343670f 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx @@ -21,8 +21,8 @@ #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <cppuhelper/implbase.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/vclevent.hxx> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> // class AccessibleListBox ----------------------------------------------- diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index 61f4839ec481..dd7f63c51fd4 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -21,8 +21,8 @@ #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <cppuhelper/implbase.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/vclevent.hxx> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <unordered_map> diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 1bfe2a031721..1a6fa921bb7d 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -19,8 +19,8 @@ #pragma once -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <svl/lstner.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/textdata.hxx> #include <vcl/texteng.hxx> #include <vcl/textview.hxx> diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index ca08b4d1858e..c132d5b6d2a7 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -310,7 +310,6 @@ #include <svl/SfxBroadcaster.hxx> #include <svl/hint.hxx> #include <svl/svldllapi.h> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <toolkit/awt/vclxwindows.hxx> #include <toolkit/dllapi.h> diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index c107245b2432..e5b360ecc9ae 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -23,8 +23,8 @@ #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <cppuhelper/implbase.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/toolkit/lstbox.hxx> class VCLXAccessibleList; diff --git a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx index d89354fca9e9..33ac4130e746 100644 --- a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx +++ b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx @@ -18,8 +18,8 @@ */ #pragma once +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/headbar.hxx> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> typedef std::vector<css::uno::WeakReference<css::accessibility::XAccessible>> ListItems; diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 2a1652d04112..b0389c06692c 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -23,7 +23,7 @@ #include <vector> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <cppuhelper/implbase.hxx> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> class VCLXAccessibleListItem; diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx index 4cbc63033160..761ed2760627 100644 --- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx @@ -19,12 +19,12 @@ #pragma once -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <cppuhelper/implbase.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/toolkit/scrbar.hxx> diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx index 5b13f10317f4..855795602842 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx @@ -19,7 +19,7 @@ #pragma once -#include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/status.hxx> #include <vcl/vclptr.hxx> diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index bc56e7746e48..5dfa69d3cd93 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -19,9 +19,9 @@ #pragma once -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <cppuhelper/implbase.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/tabctrl.hxx> #include <vcl/vclptr.hxx> diff --git a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx index 457cb5b944bc..3d7aa600e526 100644 --- a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx @@ -19,7 +19,7 @@ #pragma once -#include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> #include <vcl/vclptr.hxx> diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx index 356c968c1413..f8c9f99ba4ba 100644 --- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx +++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx @@ -20,9 +20,9 @@ #pragma once #include <com/sun/star/accessibility/AccessibleScrollType.hpp> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <comphelper/accessibletexthelper.hxx> #include <cppuhelper/implbase.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index efe684f5b31b..da0090ef5f7c 100644 --- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -19,7 +19,7 @@ #pragma once #include <map> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/toolbox.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <cppuhelper/implbase.hxx> diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 3b8ff10ae776..c68d98b7e333 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -38,7 +38,6 @@ #include <standard/vclxaccessibleradiobutton.hxx> #include <standard/vclxaccessiblescrollbar.hxx> #include <standard/vclxaccessibletoolbox.hxx> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <standard/vclxaccessiblestatusbar.hxx> #include <standard/vclxaccessibletabcontrol.hxx> #include <standard/vclxaccessibletabpagewindow.hxx> @@ -60,6 +59,7 @@ #include <vcl/toolkit/fixed.hxx> #include <vcl/toolkit/fixedhyper.hxx> #include <extended/AccessibleGridControl.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/accessibletable.hxx> #include <floatingwindowaccessible.hxx> diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx index c36e862360c7..240eb27df61f 100644 --- a/accessibility/source/inc/floatingwindowaccessible.hxx +++ b/accessibility/source/inc/floatingwindowaccessible.hxx @@ -19,7 +19,7 @@ #pragma once -#include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> class FloatingWindowAccessible final : public VCLXAccessibleComponent { diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index e586e6ae2390..a73e7edaea02 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <cppuhelper/implbase.hxx> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/vclptr.hxx> using css::accessibility::AccessibleRelationType; diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index 6d0d52ec0233..ce187baddbde 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -19,8 +19,8 @@ #pragma once #include "JoinTableView.hxx" -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <cppuhelper/implbase.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/vclptr.hxx> namespace dbaui diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index e9de5af64037..fa3dc1bee032 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <cppuhelper/implbase.hxx> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/vclptr.hxx> using css::accessibility::AccessibleRelationType; 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 similarity index 95% rename from include/toolkit/awt/vclxaccessiblecomponent.hxx rename to 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: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 7a6c09e66031..cda45a1ab572 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -6055,7 +6055,6 @@ include/test/util/xreplaceable.hxx include/test/util/xsearchable.hxx include/test/xmldiff.hxx include/test/xmltesttools.hxx -include/toolkit/awt/vclxaccessiblecomponent.hxx include/toolkit/awt/vclxdevice.hxx include/toolkit/awt/vclxfont.hxx include/toolkit/awt/vclxmenu.hxx @@ -6226,6 +6225,7 @@ include/vcl/ITiledRenderable.hxx include/vcl/ImageTree.hxx include/vcl/Scanline.hxx include/vcl/abstdlg.hxx +include/vcl/accessibility/vclxaccessiblecomponent.hxx include/vcl/accessiblefactory.hxx include/vcl/accessibletable.hxx include/vcl/accessibletableprovider.hxx @@ -13536,7 +13536,6 @@ toolkit/source/awt/asynccallback.cxx toolkit/source/awt/scrollabledialog.cxx toolkit/source/awt/stylesettings.cxx toolkit/source/awt/stylesettings.hxx -toolkit/source/awt/vclxaccessiblecomponent.cxx toolkit/source/awt/vclxbitmap.cxx toolkit/source/awt/vclxcontainer.cxx toolkit/source/awt/vclxdevice.cxx @@ -14516,6 +14515,7 @@ vcl/source/accessibility/characterattributeshelper.cxx vcl/source/accessibility/accessiblemenubasecomponent.cxx vcl/source/accessibility/accessiblemenucomponent.cxx vcl/source/accessibility/accessiblemenuitemcomponent.cxx +vcl/source/accessibility/vclxaccessiblecomponent.cxx vcl/source/accessibility/vclxaccessiblemenu.cxx vcl/source/accessibility/vclxaccessiblemenubar.cxx vcl/source/accessibility/vclxaccessiblemenuitem.cxx diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx b/sw/source/uibase/docvw/SidebarWinAcc.hxx index 8dc4463e5824..529d800f0722 100644 --- a/sw/source/uibase/docvw/SidebarWinAcc.hxx +++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx @@ -19,8 +19,8 @@ #pragma once -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <toolkit/awt/vclxwindow.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> class SwViewShell; class SwSidebarItem; diff --git a/test/source/a11y/AccessibilityTools.cxx b/test/source/a11y/AccessibilityTools.cxx index 3bf97052bf81..2003e6871d01 100644 --- a/test/source/a11y/AccessibilityTools.cxx +++ b/test/source/a11y/AccessibilityTools.cxx @@ -30,7 +30,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/scheduler.hxx> #include <vcl/timer.hxx> #include <vcl/window.hxx> diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index cfdd3ce9a371..19a94985f860 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/asynccallback \ toolkit/source/awt/stylesettings \ toolkit/source/awt/scrollabledialog \ - toolkit/source/awt/vclxaccessiblecomponent \ toolkit/source/awt/vclxbitmap \ toolkit/source/awt/vclxcontainer \ toolkit/source/awt/vclxdevice \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ff18cd99a19c..19f5b540d7aa 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -102,6 +102,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/accessibility/accessiblemenubasecomponent \ vcl/source/accessibility/accessiblemenucomponent \ vcl/source/accessibility/accessiblemenuitemcomponent \ + vcl/source/accessibility/vclxaccessiblecomponent \ vcl/source/accessibility/vclxaccessiblemenu \ vcl/source/accessibility/vclxaccessiblemenubar \ vcl/source/accessibility/vclxaccessiblemenuitem \ diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/vcl/source/accessibility/vclxaccessiblecomponent.cxx similarity index 99% rename from toolkit/source/awt/vclxaccessiblecomponent.cxx rename to vcl/source/accessibility/vclxaccessiblecomponent.cxx index 7a82caa78b6d..a7a598d67d44 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/vcl/source/accessibility/vclxaccessiblecomponent.cxx @@ -25,7 +25,7 @@ #include <comphelper/accessiblecontexthelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <i18nlangtag/languagetag.hxx> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/toolkit/dialog.hxx> #include <vcl/vclevent.hxx> #include <vcl/window.hxx> diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx index f19a16b26acc..3938ec61843d 100644 --- a/winaccessibility/source/service/AccTopWindowListener.cxx +++ b/winaccessibility/source/service/AccTopWindowListener.cxx @@ -20,9 +20,9 @@ #include <sal/log.hxx> #include <vcl/window.hxx> -#include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <toolkit/awt/vclxwindow.hxx> +#include <vcl/accessibility/vclxaccessiblecomponent.hxx> #include <vcl/sysdata.hxx> #include <vcl/svapp.hxx> commit 007d1815a2fca1ddc5eabc29d08642049ab8966d Author: Michael Weghorn <[email protected]> AuthorDate: Fri Dec 13 16:00:54 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Dec 13 20:51:44 2024 +0100 a11y: Drop unused toolkit includes Change-Id: Idc51576e05306cd45aec291e05b8b19a2cd2b2fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178433 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index b9ad1b5574df..7a82caa78b6d 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -26,8 +26,6 @@ #include <cppuhelper/supportsservice.hxx> #include <i18nlangtag/languagetag.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#include <toolkit/awt/vclxwindow.hxx> -#include <toolkit/awt/vclxfont.hxx> #include <vcl/toolkit/dialog.hxx> #include <vcl/vclevent.hxx> #include <vcl/window.hxx>
