Repository.mk | 2
RepositoryModule_host.mk | 1
accessibility/AllLangMoTarget_acc.mk | 13
accessibility/IwyuFilter_accessibility.yaml | 12
accessibility/Library_acc.mk | 102 ---
accessibility/Makefile | 14
accessibility/Module_accessibility.mk | 20
accessibility/README.md | 3
accessibility/inc/helper/accresmgr.hxx | 27
accessibility/inc/pch/precompiled_acc.cxx | 12
accessibility/inc/pch/precompiled_acc.hxx | 345 -----------
accessibility/inc/strings.hrc | 36 -
accessibility/source/helper/accresmgr.cxx | 24
accessibility/util/acc.component | 26
include/toolkit/awt/vclxwindow.hxx | 4
include/toolkit/helper/accessiblefactory.hxx | 143 ----
include/vcl/accessiblefactory.hxx | 89 ++
solenv/clang-format/excludelist | 184 ++---
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1
solenv/qa/python/gbuildtojson.py | 2
sw/CppunitTest_sw_a11y.mk | 1
test/CppunitTest_test_a11y.mk | 1
toolkit/inc/helper/accessibilityclient.hxx | 4
toolkit/source/awt/vclxwindow.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 3
toolkit/source/helper/accessibilityclient.cxx | 7
vcl/Library_vcl.mk | 56 +
vcl/inc/accessibility/AccessibleBrowseBox.hxx | 2
vcl/inc/accessibility/AccessibleBrowseBoxCheckBoxCell.hxx | 2
vcl/inc/accessibility/AccessibleBrowseBoxHeaderBar.hxx | 2
vcl/inc/accessibility/AccessibleBrowseBoxHeaderCell.hxx | 2
vcl/inc/accessibility/AccessibleBrowseBoxTable.hxx | 2
vcl/inc/accessibility/AccessibleBrowseBoxTableBase.hxx | 2
vcl/inc/accessibility/AccessibleBrowseBoxTableCell.hxx | 2
vcl/inc/accessibility/AccessibleGridControl.hxx | 4
vcl/inc/accessibility/AccessibleGridControlHeader.hxx | 2
vcl/inc/accessibility/AccessibleGridControlHeaderCell.hxx | 2
vcl/inc/accessibility/AccessibleGridControlTable.hxx | 4
vcl/inc/accessibility/AccessibleGridControlTableBase.hxx | 2
vcl/inc/accessibility/AccessibleGridControlTableCell.hxx | 2
vcl/inc/accessibility/accessiblebrowseboxcell.hxx | 2
vcl/inc/accessibility/accessibleeditbrowseboxcell.hxx | 2
vcl/inc/accessibility/accessibletablistbox.hxx | 2
vcl/inc/accessibility/accessibletablistboxtable.hxx | 2
vcl/inc/accessibility/listboxhelper.hxx | 2
vcl/inc/accessibility/svtaccessiblenumericfield.hxx | 2
vcl/inc/accessibility/vclxaccessiblebutton.hxx | 2
vcl/inc/accessibility/vclxaccessiblecheckbox.hxx | 2
vcl/inc/accessibility/vclxaccessiblecombobox.hxx | 2
vcl/inc/accessibility/vclxaccessibledropdowncombobox.hxx | 2
vcl/inc/accessibility/vclxaccessibledropdownlistbox.hxx | 2
vcl/inc/accessibility/vclxaccessibleedit.hxx | 2
vcl/inc/accessibility/vclxaccessiblefixedhyperlink.hxx | 2
vcl/inc/accessibility/vclxaccessiblefixedtext.hxx | 2
vcl/inc/accessibility/vclxaccessiblelistbox.hxx | 2
vcl/inc/accessibility/vclxaccessiblelistitem.hxx | 2
vcl/inc/accessibility/vclxaccessibleradiobutton.hxx | 2
vcl/inc/accessibility/vclxaccessibletextfield.hxx | 2
vcl/inc/strings.hrc | 11
vcl/source/accessibility/AccessibleBrowseBox.cxx | 10
vcl/source/accessibility/AccessibleBrowseBoxBase.cxx | 2
vcl/source/accessibility/AccessibleBrowseBoxCheckBoxCell.cxx | 2
vcl/source/accessibility/AccessibleBrowseBoxHeaderBar.cxx | 4
vcl/source/accessibility/AccessibleBrowseBoxHeaderCell.cxx | 2
vcl/source/accessibility/AccessibleBrowseBoxTable.cxx | 2
vcl/source/accessibility/AccessibleBrowseBoxTableBase.cxx | 2
vcl/source/accessibility/AccessibleBrowseBoxTableCell.cxx | 2
vcl/source/accessibility/AccessibleGridControl.cxx | 8
vcl/source/accessibility/AccessibleGridControlBase.cxx | 2
vcl/source/accessibility/AccessibleGridControlHeader.cxx | 6
vcl/source/accessibility/AccessibleGridControlHeaderCell.cxx | 2
vcl/source/accessibility/AccessibleGridControlTable.cxx | 4
vcl/source/accessibility/AccessibleGridControlTableBase.cxx | 2
vcl/source/accessibility/AccessibleGridControlTableCell.cxx | 4
vcl/source/accessibility/AccessibleIconView.cxx | 2
vcl/source/accessibility/IComboListBoxHelper.cxx | 2
vcl/source/accessibility/acc_factory.cxx | 74 +-
vcl/source/accessibility/accessiblebrowseboxcell.cxx | 2
vcl/source/accessibility/accessibleeditbrowseboxcell.cxx | 8
vcl/source/accessibility/accessibleiconchoicectrl.cxx | 4
vcl/source/accessibility/accessibleiconchoicectrlentry.cxx | 2
vcl/source/accessibility/accessiblelistbox.cxx | 4
vcl/source/accessibility/accessiblelistboxentry.cxx | 10
vcl/source/accessibility/accessibletablistbox.cxx | 4
vcl/source/accessibility/accessibletablistboxtable.cxx | 6
vcl/source/accessibility/floatingwindowaccessible.cxx | 2
vcl/source/accessibility/svtaccessiblenumericfield.cxx | 2
vcl/source/accessibility/textwindowaccessibility.cxx | 4
vcl/source/accessibility/vclxaccessiblebox.cxx | 8
vcl/source/accessibility/vclxaccessiblebutton.cxx | 6
vcl/source/accessibility/vclxaccessiblecheckbox.cxx | 8
vcl/source/accessibility/vclxaccessiblecombobox.cxx | 2
vcl/source/accessibility/vclxaccessibledropdowncombobox.cxx | 2
vcl/source/accessibility/vclxaccessibledropdownlistbox.cxx | 2
vcl/source/accessibility/vclxaccessibleedit.cxx | 2
vcl/source/accessibility/vclxaccessiblefixedhyperlink.cxx | 2
vcl/source/accessibility/vclxaccessiblefixedtext.cxx | 2
vcl/source/accessibility/vclxaccessibleheaderbar.cxx | 4
vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx | 2
vcl/source/accessibility/vclxaccessiblelist.cxx | 6
vcl/source/accessibility/vclxaccessiblelistbox.cxx | 2
vcl/source/accessibility/vclxaccessiblelistitem.cxx | 4
vcl/source/accessibility/vclxaccessibleradiobutton.cxx | 2
vcl/source/accessibility/vclxaccessiblescrollbar.cxx | 8
vcl/source/accessibility/vclxaccessiblestatusbar.cxx | 4
vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx | 2
vcl/source/accessibility/vclxaccessibletabcontrol.cxx | 4
vcl/source/accessibility/vclxaccessibletabpage.cxx | 2
vcl/source/accessibility/vclxaccessibletabpagewindow.cxx | 2
vcl/source/accessibility/vclxaccessibletextcomponent.cxx | 2
vcl/source/accessibility/vclxaccessibletextfield.cxx | 2
vcl/source/accessibility/vclxaccessibletoolbox.cxx | 4
vcl/source/accessibility/vclxaccessibletoolboxitem.cxx | 6
vcl/source/helper/svtaccessiblefactory.cxx | 2
vcl/vcl.common.component | 4
115 files changed, 428 insertions(+), 1059 deletions(-)
New commits:
commit 9283da858506fe3b4383e4cfe0506e470a4356f6
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Dec 17 12:04:04 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Dec 17 22:56:51 2024 +0100
a11y: Merge accessibility module into vcl
Now that the accessibility module no longer
depends on toolkit and svtools and there's
therefore no more cyclic dependency, merge it
into the vcl library, where the vcl widgets are located,
for which the classes in the accessibility
module (primarily) provide the a11y classes.
Initially, take over the existing UNO service
"com.sun.star.accessibility.comp.GetStandardAccessibleFactoryService"
to vcl as is. It used to be necessary to break the cyclic
dependency between the vcl, svtools, toolkit and
accessibility module. (vcl is the lowest and
accessibility used to be furthest up in the dependency
chain; yet vcl needed it to create the objects
providing the XAccessible/XAccessibleContext
for its widgets.)
Further simplification can happen in upcoming commits.
Change-Id: Ib46c87446dc9121d3b8e735e0e5a40594da73cc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178647
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/Repository.mk b/Repository.mk
index 7a5f2eabe0fe..8278c86423cf 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -519,7 +519,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
))
$(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,ooo, \
- acc \
$(if $(ENABLE_CUSTOMTARGET_COMPONENTS),components) \
cui \
icg \
@@ -1208,7 +1207,6 @@ $(eval $(call gb_ExternalExecutable_register_executables,\
# Resources
$(eval $(call gb_Helper_register_mos,\
- acc \
$(call gb_Helper_optional,AVMEDIA,avmedia) \
$(call gb_Helper_optional,SCRIPTING,basctl) \
chart \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index b37ebd4fd02e..ca1fb8b2093a 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -43,7 +43,6 @@ endif
ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
- accessibility \
winaccessibility \
))
endif
diff --git a/accessibility/AllLangMoTarget_acc.mk
b/accessibility/AllLangMoTarget_acc.mk
deleted file mode 100644
index a45cee50ebcf..000000000000
--- a/accessibility/AllLangMoTarget_acc.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,acc))
-
-$(eval $(call gb_AllLangMoTarget_set_polocation,acc,accessibility))
-
-# vim: set noet sw=4 ts=4:
diff --git a/accessibility/IwyuFilter_accessibility.yaml
b/accessibility/IwyuFilter_accessibility.yaml
deleted file mode 100644
index 543ac74d9236..000000000000
--- a/accessibility/IwyuFilter_accessibility.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-assumeFilename: accessibility/source/standard/accessiblemenucomponent.cxx
-excludelist:
- accessibility/source/standard/vclxaccessiblecombobox.cxx:
- # Needed for implicit dtor
- - vcl/window.hxx
- accessibility/source/extended/accessibletabbar.cxx:
- # Needed for implicit dtor
- - com/sun/star/awt/XWindowPeer.hpp
- accessibility/source/standard/accessiblemenucomponent.cxx:
- # Needed for implicit dtor
- - com/sun/star/awt/XWindowPeer.hpp
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
deleted file mode 100644
index 61bf4d590bb1..000000000000
--- a/accessibility/Library_acc.mk
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,acc))
-
-$(eval $(call
gb_Library_set_componentfile,acc,accessibility/util/acc,services))
-
-$(eval $(call gb_Library_set_include,acc,\
- $$(INCLUDE) \
- -I$(SRCDIR)/accessibility/inc \
- -I$(SRCDIR)/accessibility/source/inc \
-))
-
-$(eval $(call
gb_Library_set_precompiled_header,acc,accessibility/inc/pch/precompiled_acc))
-
-$(eval $(call gb_Library_use_external,acc,boost_headers))
-
-$(eval $(call gb_Library_use_sdk_api,acc))
-
-$(eval $(call gb_Library_use_libraries,acc,\
- comphelper \
- cppu \
- cppuhelper \
- sal \
- salhelper \
- i18nlangtag \
- sot \
- svl \
- tl \
- utl \
- vcl \
-))
-
-$(eval $(call gb_Library_add_defs,acc,\
- -DVCL_INTERNALS \
-))
-
-$(eval $(call gb_Library_add_exception_objects,acc,\
- accessibility/source/extended/AccessibleBrowseBox \
- accessibility/source/extended/AccessibleBrowseBoxBase \
- accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell \
- accessibility/source/extended/AccessibleBrowseBoxHeaderBar \
- accessibility/source/extended/AccessibleBrowseBoxHeaderCell \
- accessibility/source/extended/AccessibleBrowseBoxTable \
- accessibility/source/extended/AccessibleBrowseBoxTableBase \
- accessibility/source/extended/AccessibleBrowseBoxTableCell \
- accessibility/source/extended/AccessibleGridControl \
- accessibility/source/extended/AccessibleGridControlBase \
- accessibility/source/extended/AccessibleGridControlHeader \
- accessibility/source/extended/AccessibleGridControlHeaderCell \
- accessibility/source/extended/AccessibleGridControlTable \
- accessibility/source/extended/AccessibleGridControlTableBase \
- accessibility/source/extended/AccessibleGridControlTableCell \
- accessibility/source/extended/accessiblebrowseboxcell \
- accessibility/source/extended/accessibleeditbrowseboxcell \
- accessibility/source/extended/accessibleiconchoicectrl \
- accessibility/source/extended/accessibleiconchoicectrlentry \
- accessibility/source/extended/AccessibleIconView \
- accessibility/source/extended/accessiblelistbox \
- accessibility/source/extended/accessiblelistboxentry \
- accessibility/source/extended/accessibletablistbox \
- accessibility/source/extended/accessibletablistboxtable \
- accessibility/source/extended/textwindowaccessibility \
- accessibility/source/helper/acc_factory \
- accessibility/source/helper/accresmgr \
- accessibility/source/helper/IComboListBoxHelper \
- accessibility/source/standard/floatingwindowaccessible \
- accessibility/source/standard/svtaccessiblenumericfield \
- accessibility/source/standard/vclxaccessiblebox \
- accessibility/source/standard/vclxaccessiblebutton \
- accessibility/source/standard/vclxaccessiblecheckbox \
- accessibility/source/standard/vclxaccessiblecombobox \
- accessibility/source/standard/vclxaccessibledropdowncombobox \
- accessibility/source/standard/vclxaccessibledropdownlistbox \
- accessibility/source/standard/vclxaccessibleedit \
- accessibility/source/standard/vclxaccessiblefixedhyperlink \
- accessibility/source/standard/vclxaccessiblefixedtext \
- accessibility/source/standard/vclxaccessibleheaderbar \
- accessibility/source/standard/vclxaccessibleheaderbaritem \
- accessibility/source/standard/vclxaccessiblelist \
- accessibility/source/standard/vclxaccessiblelistbox \
- accessibility/source/standard/vclxaccessiblelistitem \
- accessibility/source/standard/vclxaccessibleradiobutton \
- accessibility/source/standard/vclxaccessiblescrollbar \
- accessibility/source/standard/vclxaccessiblestatusbar \
- accessibility/source/standard/vclxaccessiblestatusbaritem \
- accessibility/source/standard/vclxaccessibletabcontrol \
- accessibility/source/standard/vclxaccessibletabpage \
- accessibility/source/standard/vclxaccessibletabpagewindow \
- accessibility/source/standard/vclxaccessibletextcomponent \
- accessibility/source/standard/vclxaccessibletextfield \
- accessibility/source/standard/vclxaccessibletoolbox \
- accessibility/source/standard/vclxaccessibletoolboxitem \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/accessibility/Makefile b/accessibility/Makefile
deleted file mode 100644
index 0997e628485b..000000000000
--- a/accessibility/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/accessibility/Module_accessibility.mk
b/accessibility/Module_accessibility.mk
deleted file mode 100644
index de252a36d5ea..000000000000
--- a/accessibility/Module_accessibility.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,accessibility))
-
-$(eval $(call gb_Module_add_targets,accessibility,\
- Library_acc \
-))
-
-$(eval $(call gb_Module_add_l10n_targets,accessibility,\
- AllLangMoTarget_acc \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/accessibility/README.md b/accessibility/README.md
deleted file mode 100644
index 6e11da1acee2..000000000000
--- a/accessibility/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Accessibility Support for LibreOffice
-
-Provides accessible components for LibreOffice
diff --git a/accessibility/inc/helper/accresmgr.hxx
b/accessibility/inc/helper/accresmgr.hxx
deleted file mode 100644
index 75ccc2df63fb..000000000000
--- a/accessibility/inc/helper/accresmgr.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <rtl/ustring.hxx>
-#include <unotools/resmgr.hxx>
-
-OUString AccResId(TranslateId aId);
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/pch/precompiled_acc.cxx
b/accessibility/inc/pch/precompiled_acc.cxx
deleted file mode 100644
index fc8ac4010642..000000000000
--- a/accessibility/inc/pch/precompiled_acc.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "precompiled_acc.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/pch/precompiled_acc.hxx
b/accessibility/inc/pch/precompiled_acc.hxx
deleted file mode 100644
index c132d5b6d2a7..000000000000
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ /dev/null
@@ -1,345 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/*
- This file has been autogenerated by update_pch.sh. It is possible to edit it
- manually (such as when an include file has been moved/renamed/removed). All
such
- manual changes will be rewritten by the next run of update_pch.sh (which
presumably
- also fixes all possible problems, so it's usually better to use it).
-
- Generated on 2023-07-19 09:19:19 using:
- ./bin/update_pch accessibility acc --cutoff=4 --exclude:system
--include:module --include:local
-
- If after updating build fails, use the following command to locate
conflicting headers:
- ./bin/update_pch_bisect ./accessibility/inc/pch/precompiled_acc.hxx "make
accessibility.build" --find-conflicts
-*/
-
-#include <sal/config.h>
-#if PCH_LEVEL >= 1
-#include <algorithm>
-#include <array>
-#include <cassert>
-#include <cmath>
-#include <cstddef>
-#include <cstdlib>
-#include <cstring>
-#include <deque>
-#include <float.h>
-#include <functional>
-#include <initializer_list>
-#include <iomanip>
-#include <limits.h>
-#include <limits>
-#include <map>
-#include <math.h>
-#include <memory>
-#include <mutex>
-#include <new>
-#include <numeric>
-#include <optional>
-#include <ostream>
-#include <span>
-#include <stddef.h>
-#include <string.h>
-#include <string>
-#include <string_view>
-#include <type_traits>
-#include <utility>
-#include <vector>
-#endif // PCH_LEVEL >= 1
-#if PCH_LEVEL >= 2
-#include <osl/diagnose.h>
-#include <osl/doublecheckedlocking.h>
-#include <osl/endian.h>
-#include <osl/getglobalmutex.hxx>
-#include <osl/interlck.h>
-#include <osl/mutex.h>
-#include <osl/mutex.hxx>
-#include <rtl/alloc.h>
-#include <rtl/instance.hxx>
-#include <rtl/math.h>
-#include <rtl/ref.hxx>
-#include <rtl/strbuf.h>
-#include <rtl/strbuf.hxx>
-#include <rtl/string.h>
-#include <rtl/string.hxx>
-#include <rtl/stringconcat.hxx>
-#include <rtl/stringutils.hxx>
-#include <rtl/textcvt.h>
-#include <rtl/textenc.h>
-#include <rtl/ustrbuf.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
-#include <rtl/ustring.hxx>
-#include <rtl/uuid.h>
-#include <sal/backtrace.hxx>
-#include <sal/detail/log.h>
-#include <sal/log.hxx>
-#include <sal/macros.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
-#include <sal/typesizes.h>
-#include <vcl/AccessibleBrowseBoxObjType.hxx>
-#include <vcl/EnumContext.hxx>
-#include <vcl/NotebookbarContextControl.hxx>
-#include <vcl/Scanline.hxx>
-#include <vcl/WindowPosSize.hxx>
-#include <vcl/accessibility/characterattributeshelper.hxx>
-#include <vcl/accessibletable.hxx>
-#include <vcl/accessibletableprovider.hxx>
-#include <vcl/alpha.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmap/BitmapTypes.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/cairo.hxx>
-#include <vcl/checksum.hxx>
-#include <vcl/ctrl.hxx>
-#include <vcl/dllapi.h>
-#include <vcl/dndhelp.hxx>
-#include <vcl/dockwin.hxx>
-#include <vcl/event.hxx>
-#include <vcl/fntstyle.hxx>
-#include <vcl/font.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/idle.hxx>
-#include <vcl/image.hxx>
-#include <vcl/kernarray.hxx>
-#include <vcl/keycod.hxx>
-#include <vcl/keycodes.hxx>
-#include <vcl/mapmod.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/metaactiontypes.hxx>
-#include <vcl/mnemonic.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/quickselectionengine.hxx>
-#include <vcl/region.hxx>
-#include <vcl/rendercontext/AddFontSubstituteFlags.hxx>
-#include <vcl/rendercontext/AntialiasingFlags.hxx>
-#include <vcl/rendercontext/DrawGridFlags.hxx>
-#include <vcl/rendercontext/DrawImageFlags.hxx>
-#include <vcl/rendercontext/DrawModeFlags.hxx>
-#include <vcl/rendercontext/DrawTextFlags.hxx>
-#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
-#include <vcl/rendercontext/ImplMapRes.hxx>
-#include <vcl/rendercontext/InvertFlags.hxx>
-#include <vcl/rendercontext/RasterOp.hxx>
-#include <vcl/rendercontext/SalLayoutFlags.hxx>
-#include <vcl/rendercontext/State.hxx>
-#include <vcl/rendercontext/SystemTextColorFlags.hxx>
-#include <vcl/salgtype.hxx>
-#include <vcl/salnativewidgets.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/syswin.hxx>
-#include <vcl/task.hxx>
-#include <vcl/textfilter.hxx>
-#include <vcl/timer.hxx>
-#include <vcl/toolboxid.hxx>
-#include <vcl/toolkit/lstbox.hxx>
-#include <vcl/toolkit/treelist.hxx>
-#include <vcl/toolkit/treelistbox.hxx>
-#include <vcl/toolkit/treelistentries.hxx>
-#include <vcl/transfer.hxx>
-#include <vcl/unohelp2.hxx>
-#include <vcl/vclenum.hxx>
-#include <vcl/vclevent.hxx>
-#include <vcl/vclptr.hxx>
-#include <vcl/vclreferencebase.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/wall.hxx>
-#include <vcl/window.hxx>
-#include <vcl/windowstate.hxx>
-#include <vcl/wintypes.hxx>
-#endif // PCH_LEVEL >= 2
-#if PCH_LEVEL >= 3
-#include <basegfx/basegfxdllapi.h>
-#include <basegfx/color/bcolor.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/matrix/hommatrixtemplate.hxx>
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/point/b2ipoint.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/range/Range2D.hxx>
-#include <basegfx/range/b2drange.hxx>
-#include <basegfx/range/basicrange.hxx>
-#include <basegfx/tuple/Size2D.hxx>
-#include <basegfx/tuple/Tuple2D.hxx>
-#include <basegfx/tuple/Tuple3D.hxx>
-#include <basegfx/tuple/b2dtuple.hxx>
-#include <basegfx/tuple/b2ituple.hxx>
-#include <basegfx/tuple/b3dtuple.hxx>
-#include <basegfx/utils/common.hxx>
-#include <basegfx/vector/b2dsize.hxx>
-#include <basegfx/vector/b2dvector.hxx>
-#include <basegfx/vector/b2enums.hxx>
-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/vector/b2ivector.hxx>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
-#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/accessibility/TextSegment.hpp>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext2.hpp>
-#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
-#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
-#include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
-#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <com/sun/star/accessibility/XAccessibleTable.hpp>
-#include <com/sun/star/accessibility/XAccessibleText.hpp>
-#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <com/sun/star/awt/DeviceInfo.hpp>
-#include <com/sun/star/awt/GradientStyle.hpp>
-#include <com/sun/star/awt/Key.hpp>
-#include <com/sun/star/awt/KeyGroup.hpp>
-#include <com/sun/star/awt/KeyModifier.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/XDevice.hpp>
-#include <com/sun/star/awt/XDockableWindow.hpp>
-#include <com/sun/star/awt/XFocusListener.hpp>
-#include <com/sun/star/awt/XLayoutConstrains.hpp>
-#include <com/sun/star/awt/XStyleSettingsSupplier.hpp>
-#include <com/sun/star/awt/XUnitConversion.hpp>
-#include <com/sun/star/awt/XVclWindowPeer.hpp>
-#include <com/sun/star/awt/XView.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/awt/XWindow2.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/datatransfer/DataFlavor.hpp>
-#include <com/sun/star/datatransfer/XTransferable2.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
-#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
-#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
-#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
-#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/embed/Aspects.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Type.h>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/TypeClass.hdl>
-#include <com/sun/star/uno/XAggregation.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/XWeak.hpp>
-#include <com/sun/star/uno/genfunc.h>
-#include <com/sun/star/uno/genfunc.hxx>
-#include <comphelper/accessiblecomponenthelper.hxx>
-#include <comphelper/accessiblecontexthelper.hxx>
-#include <comphelper/accessibleeventnotifier.hxx>
-#include <comphelper/accessiblekeybindinghelper.hxx>
-#include <comphelper/accessibletexthelper.hxx>
-#include <comphelper/comphelperdllapi.h>
-#include <comphelper/errcode.hxx>
-#include <comphelper/sequence.hxx>
-#include <comphelper/servicehelper.hxx>
-#include <comphelper/uno3.hxx>
-#include <cppu/cppudllapi.h>
-#include <cppu/unotype.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-#include <cppuhelper/cppuhelperdllapi.h>
-#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase_ex.hxx>
-#include <cppuhelper/implbase_ex_post.hxx>
-#include <cppuhelper/implbase_ex_pre.hxx>
-#include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <cppuhelper/weakref.hxx>
-#include <extended/AccessibleBrowseBoxBase.hxx>
-#include <extended/AccessibleBrowseBoxTableBase.hxx>
-#include <extended/AccessibleGridControlBase.hxx>
-#include <extended/AccessibleGridControlTableBase.hxx>
-#include <extended/AccessibleGridControlTableCell.hxx>
-#include <extended/accessiblebrowseboxcell.hxx>
-#include <helper/accresmgr.hxx>
-#include <i18nlangtag/lang.h>
-#include <i18nlangtag/languagetag.hxx>
-#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/deleter.hxx>
-#include <o3tl/safeint.hxx>
-#include <o3tl/strong_int.hxx>
-#include <o3tl/typed_flags_set.hxx>
-#include <o3tl/underlyingenumvalue.hxx>
-#include <o3tl/unit_conversion.hxx>
-#include <salhelper/salhelperdllapi.h>
-#include <salhelper/simplereferenceobject.hxx>
-#include <sot/exchange.hxx>
-#include <sot/formats.hxx>
-#include <sot/sotdllapi.h>
-#include <standard/vclxaccessiblebox.hxx>
-#include <standard/vclxaccessibletextcomponent.hxx>
-#include <svl/SfxBroadcaster.hxx>
-#include <svl/hint.hxx>
-#include <svl/svldllapi.h>
-#include <toolkit/awt/vclxdevice.hxx>
-#include <toolkit/awt/vclxwindows.hxx>
-#include <toolkit/dllapi.h>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/color.hxx>
-#include <tools/contnr.hxx>
-#include <tools/degree.hxx>
-#include <tools/fontenum.hxx>
-#include <tools/gen.hxx>
-#include <tools/globname.hxx>
-#include <tools/lineend.hxx>
-#include <tools/link.hxx>
-#include <tools/long.hxx>
-#include <tools/mapunit.hxx>
-#include <tools/poly.hxx>
-#include <tools/ref.hxx>
-#include <tools/solar.h>
-#include <tools/toolsdllapi.h>
-#include <typelib/typeclass.h>
-#include <typelib/typedescription.h>
-#include <typelib/uik.h>
-#include <uno/any2.h>
-#include <uno/data.h>
-#include <uno/sequence2.h>
-#include <unotools/accessiblerelationsethelper.hxx>
-#include <unotools/fontdefs.hxx>
-#include <unotools/unotoolsdllapi.h>
-#endif // PCH_LEVEL >= 3
-#if PCH_LEVEL >= 4
-#include <vcl/accessibility/strings.hxx>
-#endif // PCH_LEVEL >= 4
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/strings.hrc b/accessibility/inc/strings.hrc
deleted file mode 100644
index 7e51ade2d46d..000000000000
--- a/accessibility/inc/strings.hrc
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#define NC_(Context, String) TranslateId(Context, u8##String)
-
-#define RID_STR_ACC_NAME_BROWSEBUTTON
NC_("RID_STR_ACC_NAME_BROWSEBUTTON", "Browse")
-#define STR_SVT_ACC_ACTION_EXPAND
NC_("STR_SVT_ACC_ACTION_EXPAND", "Expand" )
-#define STR_SVT_ACC_ACTION_COLLAPSE
NC_("STR_SVT_ACC_ACTION_COLLAPSE", "Collapse")
-#define RID_STR_ACC_ACTION_CHECK
NC_("RID_STR_ACC_ACTION_CHECK", "Check")
-#define RID_STR_ACC_ACTION_UNCHECK
NC_("RID_STR_ACC_ACTION_UNCHECK", "Uncheck")
-#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL
NC_("RID_STR_ACC_SCROLLBAR_NAME_VERTICAL", "Vertical scroll bar")
-#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL
NC_("RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL", "Horizontal scroll bar")
-#define RID_STR_ACC_PANEL_DESCRIPTION
NC_("RID_STR_ACC_PANEL_DESCRIPTION", "Please press enter to go into child
control for more operations")
-#define RID_STR_ACC_COLUMN_NUM NC_("RID_STR_ACC_COLUMN_NUM",
"Column %COLUMNNUMBER")
-#define RID_STR_ACC_ROW_NUM NC_("RID_STR_ACC_ROW_NUM",
"Row %ROWNUMBER")
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/helper/accresmgr.cxx
b/accessibility/source/helper/accresmgr.cxx
deleted file mode 100644
index f120dcb2600d..000000000000
--- a/accessibility/source/helper/accresmgr.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <helper/accresmgr.hxx>
-
-OUString AccResId(TranslateId aId) { return Translate::get(aId,
Translate::Create("acc")); }
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/util/acc.component b/accessibility/util/acc.component
deleted file mode 100644
index 713a1bb118c1..000000000000
--- a/accessibility/util/acc.component
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
- xmlns="http://openoffice.org/2010/uno-components";>
- <implementation
name="com.sun.star.accessibility.comp.GetStandardAccessibleFactoryService"
-
constructor="com_sun_star_accessibility_GetStandardAccessibleFactoryService_get_implementation">
- <service
name="com.sun.star.accessibility.GetStandardAccessibleFactoryService"/>
- </implementation>
-</component>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 233ee1be5db5..de8d26edf1fa 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -16,98 +16,6 @@ UnoControls/source/inc/framecontrol.hxx
UnoControls/source/inc/progressbar.hxx
UnoControls/source/inc/progressmonitor.hxx
UnoControls/source/inc/statusindicator.hxx
-accessibility/inc/extended/AccessibleBrowseBox.hxx
-accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
-accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
-accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
-accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
-accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
-accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
-accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
-accessibility/inc/extended/AccessibleGridControl.hxx
-accessibility/inc/extended/AccessibleGridControlBase.hxx
-accessibility/inc/extended/AccessibleGridControlHeader.hxx
-accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
-accessibility/inc/extended/AccessibleGridControlTable.hxx
-accessibility/inc/extended/AccessibleGridControlTableBase.hxx
-accessibility/inc/extended/AccessibleGridControlTableCell.hxx
-accessibility/inc/extended/accessiblebrowseboxcell.hxx
-accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
-accessibility/inc/extended/accessibleiconchoicectrl.hxx
-accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
-accessibility/inc/extended/accessiblelistbox.hxx
-accessibility/inc/extended/accessiblelistboxentry.hxx
-accessibility/inc/extended/accessibletablistbox.hxx
-accessibility/inc/extended/accessibletablistboxtable.hxx
-accessibility/inc/extended/textwindowaccessibility.hxx
-accessibility/inc/helper/IComboListBoxHelper.hxx
-accessibility/inc/helper/listboxhelper.hxx
-accessibility/inc/standard/vclxaccessiblebox.hxx
-accessibility/inc/standard/vclxaccessiblebutton.hxx
-accessibility/inc/standard/vclxaccessiblecheckbox.hxx
-accessibility/inc/standard/vclxaccessibleedit.hxx
-accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
-accessibility/inc/standard/vclxaccessiblelist.hxx
-accessibility/inc/standard/vclxaccessiblelistitem.hxx
-accessibility/inc/standard/vclxaccessibleradiobutton.hxx
-accessibility/inc/standard/vclxaccessiblescrollbar.hxx
-accessibility/inc/standard/vclxaccessiblestatusbar.hxx
-accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
-accessibility/inc/standard/vclxaccessibletabcontrol.hxx
-accessibility/inc/standard/vclxaccessibletabpage.hxx
-accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
-accessibility/inc/standard/vclxaccessibletextcomponent.hxx
-accessibility/inc/standard/vclxaccessibletextfield.hxx
-accessibility/inc/standard/vclxaccessibletoolbox.hxx
-accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
-accessibility/source/extended/AccessibleBrowseBox.cxx
-accessibility/source/extended/AccessibleBrowseBoxBase.cxx
-accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
-accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
-accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
-accessibility/source/extended/AccessibleBrowseBoxTable.cxx
-accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
-accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
-accessibility/source/extended/AccessibleGridControl.cxx
-accessibility/source/extended/AccessibleGridControlBase.cxx
-accessibility/source/extended/AccessibleGridControlHeader.cxx
-accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
-accessibility/source/extended/AccessibleGridControlTable.cxx
-accessibility/source/extended/AccessibleGridControlTableBase.cxx
-accessibility/source/extended/AccessibleGridControlTableCell.cxx
-accessibility/source/extended/accessiblebrowseboxcell.cxx
-accessibility/source/extended/accessibleeditbrowseboxcell.cxx
-accessibility/source/extended/accessibleiconchoicectrl.cxx
-accessibility/source/extended/accessibleiconchoicectrlentry.cxx
-accessibility/source/extended/accessiblelistbox.cxx
-accessibility/source/extended/accessiblelistboxentry.cxx
-accessibility/source/extended/accessibletablistbox.cxx
-accessibility/source/extended/accessibletablistboxtable.cxx
-accessibility/source/extended/textwindowaccessibility.cxx
-accessibility/source/helper/acc_factory.cxx
-accessibility/source/standard/floatingwindowaccessible.cxx
-accessibility/source/standard/vclxaccessiblebox.cxx
-accessibility/source/standard/vclxaccessiblebutton.cxx
-accessibility/source/standard/vclxaccessiblecheckbox.cxx
-accessibility/source/standard/vclxaccessiblecombobox.cxx
-accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
-accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
-accessibility/source/standard/vclxaccessibleedit.cxx
-accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
-accessibility/source/standard/vclxaccessiblelist.cxx
-accessibility/source/standard/vclxaccessiblelistbox.cxx
-accessibility/source/standard/vclxaccessiblelistitem.cxx
-accessibility/source/standard/vclxaccessibleradiobutton.cxx
-accessibility/source/standard/vclxaccessiblescrollbar.cxx
-accessibility/source/standard/vclxaccessiblestatusbar.cxx
-accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
-accessibility/source/standard/vclxaccessibletabcontrol.cxx
-accessibility/source/standard/vclxaccessibletabpage.cxx
-accessibility/source/standard/vclxaccessibletabpagewindow.cxx
-accessibility/source/standard/vclxaccessibletextcomponent.cxx
-accessibility/source/standard/vclxaccessibletextfield.cxx
-accessibility/source/standard/vclxaccessibletoolbox.cxx
-accessibility/source/standard/vclxaccessibletoolboxitem.cxx
animations/source/animcore/animcore.cxx
avmedia/inc/helpids.h
avmedia/inc/mediacontrol.hxx
@@ -14157,12 +14065,104 @@ vcl/inc/IPrioritable.hxx
vcl/inc/ResampleKernel.hxx
vcl/inc/bitmap/bmpfast.hxx
vcl/inc/accel.hxx
+vcl/inc/accessibility/AccessibleBrowseBox.hxx
+vcl/inc/accessibility/AccessibleBrowseBoxBase.hxx
+vcl/inc/accessibility/AccessibleBrowseBoxCheckBoxCell.hxx
+vcl/inc/accessibility/AccessibleBrowseBoxHeaderBar.hxx
+vcl/inc/accessibility/AccessibleBrowseBoxHeaderCell.hxx
+vcl/inc/accessibility/AccessibleBrowseBoxTable.hxx
+vcl/inc/accessibility/AccessibleBrowseBoxTableBase.hxx
+vcl/inc/accessibility/AccessibleBrowseBoxTableCell.hxx
+vcl/inc/accessibility/AccessibleGridControl.hxx
+vcl/inc/accessibility/AccessibleGridControlBase.hxx
+vcl/inc/accessibility/AccessibleGridControlHeader.hxx
+vcl/inc/accessibility/AccessibleGridControlHeaderCell.hxx
+vcl/inc/accessibility/AccessibleGridControlTable.hxx
+vcl/inc/accessibility/AccessibleGridControlTableBase.hxx
+vcl/inc/accessibility/AccessibleGridControlTableCell.hxx
+vcl/inc/accessibility/IComboListBoxHelper.hxx
+vcl/inc/accessibility/accessiblebrowseboxcell.hxx
+vcl/inc/accessibility/accessibleeditbrowseboxcell.hxx
+vcl/inc/accessibility/accessibleiconchoicectrl.hxx
+vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
+vcl/inc/accessibility/accessiblelistbox.hxx
+vcl/inc/accessibility/accessiblelistboxentry.hxx
vcl/inc/accessibility/accessiblemenubasecomponent.hxx
vcl/inc/accessibility/accessiblemenucomponent.hxx
vcl/inc/accessibility/accessiblemenuitemcomponent.hxx
+vcl/inc/accessibility/accessibletablistbox.hxx
+vcl/inc/accessibility/accessibletablistboxtable.hxx
+vcl/inc/accessibility/listboxhelper.hxx
+vcl/inc/accessibility/textwindowaccessibility.hxx
+vcl/inc/accessibility/vclxaccessiblebox.hxx
+vcl/inc/accessibility/vclxaccessiblebutton.hxx
+vcl/inc/accessibility/vclxaccessiblecheckbox.hxx
+vcl/inc/accessibility/vclxaccessibleedit.hxx
+vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx
+vcl/inc/accessibility/vclxaccessiblelist.hxx
+vcl/inc/accessibility/vclxaccessiblelistitem.hxx
vcl/inc/accessibility/vclxaccessiblemenu.hxx
vcl/inc/accessibility/vclxaccessiblemenubar.hxx
vcl/inc/accessibility/vclxaccessiblemenuitem.hxx
+vcl/inc/accessibility/vclxaccessibleradiobutton.hxx
+vcl/inc/accessibility/vclxaccessiblescrollbar.hxx
+vcl/inc/accessibility/vclxaccessiblestatusbar.hxx
+vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx
+vcl/inc/accessibility/vclxaccessibletabcontrol.hxx
+vcl/inc/accessibility/vclxaccessibletabpage.hxx
+vcl/inc/accessibility/vclxaccessibletabpagewindow.hxx
+vcl/inc/accessibility/vclxaccessibletextcomponent.hxx
+vcl/inc/accessibility/vclxaccessibletextfield.hxx
+vcl/inc/accessibility/vclxaccessibletoolbox.hxx
+vcl/inc/accessibility/vclxaccessibletoolboxitem.hxx
+vcl/source/accessibility/AccessibleBrowseBox.cxx
+vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
+vcl/source/accessibility/AccessibleBrowseBoxCheckBoxCell.cxx
+vcl/source/accessibility/AccessibleBrowseBoxHeaderBar.cxx
+vcl/source/accessibility/AccessibleBrowseBoxHeaderCell.cxx
+vcl/source/accessibility/AccessibleBrowseBoxTable.cxx
+vcl/source/accessibility/AccessibleBrowseBoxTableBase.cxx
+vcl/source/accessibility/AccessibleBrowseBoxTableCell.cxx
+vcl/source/accessibility/AccessibleGridControl.cxx
+vcl/source/accessibility/AccessibleGridControlBase.cxx
+vcl/source/accessibility/AccessibleGridControlHeader.cxx
+vcl/source/accessibility/AccessibleGridControlHeaderCell.cxx
+vcl/source/accessibility/AccessibleGridControlTable.cxx
+vcl/source/accessibility/AccessibleGridControlTableBase.cxx
+vcl/source/accessibility/AccessibleGridControlTableCell.cxx
+vcl/source/accessibility/acc_factory.cxx
+vcl/source/accessibility/accessiblebrowseboxcell.cxx
+vcl/source/accessibility/accessibleeditbrowseboxcell.cxx
+vcl/source/accessibility/accessibleiconchoicectrl.cxx
+vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
+vcl/source/accessibility/accessiblelistbox.cxx
+vcl/source/accessibility/accessiblelistboxentry.cxx
+vcl/source/accessibility/accessibletablistbox.cxx
+vcl/source/accessibility/accessibletablistboxtable.cxx
+vcl/source/accessibility/floatingwindowaccessible.cxx
+vcl/source/accessibility/textwindowaccessibility.cxx
+vcl/source/accessibility/vclxaccessiblebox.cxx
+vcl/source/accessibility/vclxaccessiblebutton.cxx
+vcl/source/accessibility/vclxaccessiblecheckbox.cxx
+vcl/source/accessibility/vclxaccessiblecombobox.cxx
+vcl/source/accessibility/vclxaccessibledropdowncombobox.cxx
+vcl/source/accessibility/vclxaccessibledropdownlistbox.cxx
+vcl/source/accessibility/vclxaccessibleedit.cxx
+vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx
+vcl/source/accessibility/vclxaccessiblelist.cxx
+vcl/source/accessibility/vclxaccessiblelistbox.cxx
+vcl/source/accessibility/vclxaccessiblelistitem.cxx
+vcl/source/accessibility/vclxaccessibleradiobutton.cxx
+vcl/source/accessibility/vclxaccessiblescrollbar.cxx
+vcl/source/accessibility/vclxaccessiblestatusbar.cxx
+vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx
+vcl/source/accessibility/vclxaccessibletabcontrol.cxx
+vcl/source/accessibility/vclxaccessibletabpage.cxx
+vcl/source/accessibility/vclxaccessibletabpagewindow.cxx
+vcl/source/accessibility/vclxaccessibletextcomponent.cxx
+vcl/source/accessibility/vclxaccessibletextfield.cxx
+vcl/source/accessibility/vclxaccessibletoolbox.cxx
+vcl/source/accessibility/vclxaccessibletoolboxitem.cxx
vcl/inc/accmgr.hxx
vcl/inc/animate/AnimationRenderer.hxx
vcl/inc/brdwin.hxx
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 3c780ec65199..abee422656d5 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -118,7 +118,6 @@ gb_MERGE_LIBRARY_LIST := \
ifneq ($(MERGELIBS_MORE),)
gb_MERGE_LIBRARY_LIST += \
- acc \
$(if $(filter $(OS),WNT), \
ado \
) \
diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py
index 92029bb4e728..8e6653b3d241 100644
--- a/solenv/qa/python/gbuildtojson.py
+++ b/solenv/qa/python/gbuildtojson.py
@@ -124,7 +124,7 @@ class CheckGbuildToJsonModules(unittest.TestCase):
shutil.rmtree(self.tempwork)
def test_gbuildtojson(self):
- modules = ['accessibility', 'android', 'animations', 'apple_remote',
'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2',
'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop',
'docmodel', 'drawinglayer', 'editeng', 'embeddedobj', 'embedserv',
'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker',
'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'instsetoo_native',
'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 'librelogo', 'libreofficekit',
'linguistic', 'lotuswordpro', 'nlpsolver', 'o3tl', 'offapi', 'officecfg',
'oovbaapi', 'oox', 'opencl', 'package', 'postprocess', 'pyuno', 'registry',
'remotebridges', 'reportbuilder', 'reportdesign', 'ridljar', 'salhelper',
'sax', 'sc', 'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native',
'sfx2', 'slideshow', 'smoketest', 'soltools', 'sot', 'starmath', 'store',
'svgio', 'emfio', 'svl', 'svtools', 'svx', 'sw', 'swext', 'sysui', 'test',
'testtools', 'toolkit', 'ucb', 'ucbhel
per', 'udkapi', 'uitest', 'UnoControls', 'unodevtools', 'unoidl', 'unoil',
'unotest', 'unotools', 'unoxml', 'ure', 'uui', 'vbahelper', 'vcl',
'winaccessibility', 'wizards', 'writerperfect', 'xmlhelp', 'xmloff',
'xmlreader', 'xmlscript', 'xmlsecurity']
+ modules = ['android', 'animations', 'apple_remote', 'avmedia',
'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2', 'codemaker',
'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop', 'docmodel',
'drawinglayer', 'editeng', 'embeddedobj', 'embedserv', 'eventattacher',
'extras', 'filter', 'forms', 'formula', 'fpicker', 'framework', 'hwpfilter',
'i18nlangtag', 'i18nutil', 'idl', 'instsetoo_native', 'io', 'ios', 'jvmaccess',
'jvmfwk', 'l10ntools', 'librelogo', 'libreofficekit', 'linguistic',
'lotuswordpro', 'nlpsolver', 'o3tl', 'offapi', 'officecfg', 'oovbaapi', 'oox',
'opencl', 'package', 'postprocess', 'pyuno', 'registry', 'remotebridges',
'reportbuilder', 'reportdesign', 'ridljar', 'salhelper', 'sax', 'sc', 'sccomp',
'scp2', 'scripting', 'sd', 'sdext', 'setup_native', 'sfx2', 'slideshow',
'smoketest', 'soltools', 'sot', 'starmath', 'store', 'svgio', 'emfio', 'svl',
'svtools', 'svx', 'sw', 'swext', 'sysui', 'test', 'testtools', 'toolkit',
'ucb', 'ucbhelper', 'udkapi', '
uitest', 'UnoControls', 'unodevtools', 'unoidl', 'unoil', 'unotest',
'unotools', 'unoxml', 'ure', 'uui', 'vbahelper', 'vcl', 'winaccessibility',
'wizards', 'writerperfect', 'xmlhelp', 'xmloff', 'xmlreader', 'xmlscript',
'xmlsecurity']
if os.environ['OS'] == 'WNT':
# for now, use a limited subset for testing on windows as it is so
annoyingly slow on this
modules = ['chart2', 'cui', 'dbaccess', 'framework', 'oox',
'sfx2', 'svl', 'svtools', 'svx', 'toolkit', 'vcl', 'xmloff']
diff --git a/sw/CppunitTest_sw_a11y.mk b/sw/CppunitTest_sw_a11y.mk
index a5f611b86208..9ad6e4bcb6ac 100644
--- a/sw/CppunitTest_sw_a11y.mk
+++ b/sw/CppunitTest_sw_a11y.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_a11y, \
))
$(eval $(call gb_CppunitTest_use_libraries,sw_a11y, \
- acc \
sal \
cppu \
cui \
diff --git a/test/CppunitTest_test_a11y.mk b/test/CppunitTest_test_a11y.mk
index 3adcc2995718..8c12e4c00959 100644
--- a/test/CppunitTest_test_a11y.mk
+++ b/test/CppunitTest_test_a11y.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,test_a11y,
\
))
$(eval $(call gb_CppunitTest_use_libraries,test_a11y, \
- acc \
sal \
cppu \
subsequenttest \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 19f5b540d7aa..d6c527ab8222 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -97,17 +97,71 @@ $(eval $(call gb_Library_use_externals,vcl,\
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/rendercontext/drawmode \
vcl/skia/SkiaHelper \
+ vcl/source/accessibility/AccessibleBrowseBox \
+ vcl/source/accessibility/AccessibleBrowseBoxBase \
+ vcl/source/accessibility/AccessibleBrowseBoxCheckBoxCell \
+ vcl/source/accessibility/AccessibleBrowseBoxHeaderBar \
+ vcl/source/accessibility/AccessibleBrowseBoxHeaderCell \
+ vcl/source/accessibility/AccessibleBrowseBoxTable \
+ vcl/source/accessibility/AccessibleBrowseBoxTableBase \
+ vcl/source/accessibility/AccessibleBrowseBoxTableCell \
+ vcl/source/accessibility/AccessibleGridControl \
+ vcl/source/accessibility/AccessibleGridControlBase \
+ vcl/source/accessibility/AccessibleGridControlHeader \
+ vcl/source/accessibility/AccessibleGridControlHeaderCell \
+ vcl/source/accessibility/AccessibleGridControlTable \
+ vcl/source/accessibility/AccessibleGridControlTableBase \
+ vcl/source/accessibility/AccessibleGridControlTableCell \
vcl/source/accessibility/AccessibleTextAttributeHelper \
- vcl/source/accessibility/characterattributeshelper \
+ vcl/source/accessibility/acc_factory \
+ vcl/source/accessibility/accessiblebrowseboxcell \
+ vcl/source/accessibility/accessibleeditbrowseboxcell \
+ vcl/source/accessibility/accessibleiconchoicectrl \
+ vcl/source/accessibility/accessibleiconchoicectrlentry \
+ vcl/source/accessibility/AccessibleIconView \
+ vcl/source/accessibility/accessiblelistbox \
+ vcl/source/accessibility/accessiblelistboxentry \
vcl/source/accessibility/accessiblemenubasecomponent \
vcl/source/accessibility/accessiblemenucomponent \
vcl/source/accessibility/accessiblemenuitemcomponent \
+ vcl/source/accessibility/accessibletablistbox \
+ vcl/source/accessibility/accessibletablistboxtable \
+ vcl/source/accessibility/characterattributeshelper \
+ vcl/source/accessibility/textwindowaccessibility \
+ vcl/source/accessibility/floatingwindowaccessible \
+ vcl/source/accessibility/IComboListBoxHelper \
+ vcl/source/accessibility/svtaccessiblenumericfield \
+ vcl/source/accessibility/vclxaccessiblebox \
+ vcl/source/accessibility/vclxaccessiblebutton \
+ vcl/source/accessibility/vclxaccessiblecheckbox \
+ vcl/source/accessibility/vclxaccessiblecombobox \
vcl/source/accessibility/vclxaccessiblecomponent \
+ vcl/source/accessibility/vclxaccessibledropdowncombobox \
+ vcl/source/accessibility/vclxaccessibledropdownlistbox \
+ vcl/source/accessibility/vclxaccessibleedit \
+ vcl/source/accessibility/vclxaccessiblefixedhyperlink \
+ vcl/source/accessibility/vclxaccessiblefixedtext \
+ vcl/source/accessibility/vclxaccessibleheaderbar \
+ vcl/source/accessibility/vclxaccessibleheaderbaritem \
+ vcl/source/accessibility/vclxaccessiblelist \
+ vcl/source/accessibility/vclxaccessiblelistbox \
+ vcl/source/accessibility/vclxaccessiblelistitem \
vcl/source/accessibility/vclxaccessiblemenu \
vcl/source/accessibility/vclxaccessiblemenubar \
vcl/source/accessibility/vclxaccessiblemenuitem \
vcl/source/accessibility/vclxaccessiblemenuseparator \
vcl/source/accessibility/vclxaccessiblepopupmenu \
+ vcl/source/accessibility/vclxaccessibleradiobutton \
+ vcl/source/accessibility/vclxaccessiblescrollbar \
+ vcl/source/accessibility/vclxaccessiblestatusbar \
+ vcl/source/accessibility/vclxaccessiblestatusbaritem \
+ vcl/source/accessibility/vclxaccessibletabcontrol \
+ vcl/source/accessibility/vclxaccessibletabpage \
+ vcl/source/accessibility/vclxaccessibletabpagewindow \
+ vcl/source/accessibility/vclxaccessibletextcomponent \
+ vcl/source/accessibility/vclxaccessibletextfield \
+ vcl/source/accessibility/vclxaccessibletoolbox \
+ vcl/source/accessibility/vclxaccessibletoolboxitem \
vcl/source/animate/Animation \
vcl/source/animate/AnimationFrame \
vcl/source/animate/AnimationRenderer \
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx
b/vcl/inc/accessibility/AccessibleBrowseBox.hxx
similarity index 99%
rename from accessibility/inc/extended/AccessibleBrowseBox.hxx
rename to vcl/inc/accessibility/AccessibleBrowseBox.hxx
index 50486973d4cd..ed78bb407044 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/vcl/inc/accessibility/AccessibleBrowseBox.hxx
@@ -20,7 +20,7 @@
#pragma once
-#include <extended/AccessibleBrowseBoxBase.hxx>
+#include <accessibility/AccessibleBrowseBoxBase.hxx>
#include <cppuhelper/weakref.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <mutex>
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
b/vcl/inc/accessibility/AccessibleBrowseBoxBase.hxx
similarity index 100%
rename from accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
rename to vcl/inc/accessibility/AccessibleBrowseBoxBase.hxx
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
b/vcl/inc/accessibility/AccessibleBrowseBoxCheckBoxCell.hxx
similarity index 98%
rename from accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
rename to vcl/inc/accessibility/AccessibleBrowseBoxCheckBoxCell.hxx
index 25a9ea2b737e..b1b44cc25e26 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/vcl/inc/accessibility/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -20,7 +20,7 @@
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <extended/accessiblebrowseboxcell.hxx>
+#include <accessibility/accessiblebrowseboxcell.hxx>
#include <cppuhelper/implbase2.hxx>
namespace accessibility
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
b/vcl/inc/accessibility/AccessibleBrowseBoxHeaderBar.hxx
similarity index 99%
rename from accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
rename to vcl/inc/accessibility/AccessibleBrowseBoxHeaderBar.hxx
index d353b8c6018b..fdd37cbe3173 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/vcl/inc/accessibility/AccessibleBrowseBoxHeaderBar.hxx
@@ -20,7 +20,7 @@
#pragma once
-#include <extended/AccessibleBrowseBoxTableBase.hxx>
+#include <accessibility/AccessibleBrowseBoxTableBase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
b/vcl/inc/accessibility/AccessibleBrowseBoxHeaderCell.hxx
similarity index 98%
rename from accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
rename to vcl/inc/accessibility/AccessibleBrowseBoxHeaderCell.hxx
index fd4638486eb6..be60bee26c5a 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/vcl/inc/accessibility/AccessibleBrowseBoxHeaderCell.hxx
@@ -18,7 +18,7 @@
*/
#pragma once
-#include <extended/AccessibleBrowseBoxBase.hxx>
+#include <accessibility/AccessibleBrowseBoxBase.hxx>
namespace accessibility
{
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
b/vcl/inc/accessibility/AccessibleBrowseBoxTable.hxx
similarity index 98%
rename from accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
rename to vcl/inc/accessibility/AccessibleBrowseBoxTable.hxx
index 8892ff384e9e..abff6092fcff 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
+++ b/vcl/inc/accessibility/AccessibleBrowseBoxTable.hxx
@@ -20,7 +20,7 @@
#pragma once
-#include <extended/AccessibleBrowseBoxTableBase.hxx>
+#include <accessibility/AccessibleBrowseBoxTableBase.hxx>
namespace accessibility {
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
b/vcl/inc/accessibility/AccessibleBrowseBoxTableBase.hxx
similarity index 99%
rename from accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
rename to vcl/inc/accessibility/AccessibleBrowseBoxTableBase.hxx
index da7643dd6d7c..ac7f1dd00362 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/vcl/inc/accessibility/AccessibleBrowseBoxTableBase.hxx
@@ -20,7 +20,7 @@
#pragma once
-#include <extended/AccessibleBrowseBoxBase.hxx>
+#include <accessibility/AccessibleBrowseBoxBase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
b/vcl/inc/accessibility/AccessibleBrowseBoxTableCell.hxx
similarity index 99%
rename from accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
rename to vcl/inc/accessibility/AccessibleBrowseBoxTableCell.hxx
index 11d61d3f04fb..3a49ad9eeb59 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+++ b/vcl/inc/accessibility/AccessibleBrowseBoxTableCell.hxx
@@ -18,7 +18,7 @@
*/
#pragma once
-#include <extended/accessiblebrowseboxcell.hxx>
+#include <accessibility/accessiblebrowseboxcell.hxx>
#include <comphelper/accessibletexthelper.hxx>
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx
b/vcl/inc/accessibility/AccessibleGridControl.hxx
similarity index 98%
rename from accessibility/inc/extended/AccessibleGridControl.hxx
rename to vcl/inc/accessibility/AccessibleGridControl.hxx
index a1f7815ce167..399a6b453bb5 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/vcl/inc/accessibility/AccessibleGridControl.hxx
@@ -19,8 +19,8 @@
#pragma once
-#include <extended/AccessibleGridControlBase.hxx>
-#include <extended/AccessibleGridControlTable.hxx>
+#include <accessibility/AccessibleGridControlBase.hxx>
+#include <accessibility/AccessibleGridControlTable.hxx>
#include <cppuhelper/weakref.hxx>
#include <rtl/ref.hxx>
#include <vcl/accessibletable.hxx>
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx
b/vcl/inc/accessibility/AccessibleGridControlBase.hxx
similarity index 100%
rename from accessibility/inc/extended/AccessibleGridControlBase.hxx
rename to vcl/inc/accessibility/AccessibleGridControlBase.hxx
diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx
b/vcl/inc/accessibility/AccessibleGridControlHeader.hxx
similarity index 99%
rename from accessibility/inc/extended/AccessibleGridControlHeader.hxx
rename to vcl/inc/accessibility/AccessibleGridControlHeader.hxx
index 7e1c3e7ab26b..d1cabbeb4aeb 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx
+++ b/vcl/inc/accessibility/AccessibleGridControlHeader.hxx
@@ -20,7 +20,7 @@
#pragma once
-#include <extended/AccessibleGridControlTableBase.hxx>
+#include <accessibility/AccessibleGridControlTableBase.hxx>
namespace accessibility {
diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
b/vcl/inc/accessibility/AccessibleGridControlHeaderCell.hxx
similarity index 98%
rename from accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
rename to vcl/inc/accessibility/AccessibleGridControlHeaderCell.hxx
index 6e78029a84fd..cd59894b92bb 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+++ b/vcl/inc/accessibility/AccessibleGridControlHeaderCell.hxx
@@ -18,7 +18,7 @@
*/
#pragma once
-#include <extended/AccessibleGridControlTableCell.hxx>
+#include <accessibility/AccessibleGridControlTableCell.hxx>
namespace accessibility
{
diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx
b/vcl/inc/accessibility/AccessibleGridControlTable.hxx
similarity index 98%
rename from accessibility/inc/extended/AccessibleGridControlTable.hxx
rename to vcl/inc/accessibility/AccessibleGridControlTable.hxx
index ef029ec4a71e..5c043f8860a9 100644
--- a/accessibility/inc/extended/AccessibleGridControlTable.hxx
+++ b/vcl/inc/accessibility/AccessibleGridControlTable.hxx
@@ -20,10 +20,10 @@
#pragma once
-#include <extended/AccessibleGridControlTableBase.hxx>
+#include <accessibility/AccessibleGridControlTableBase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <extended/AccessibleGridControlTableCell.hxx>
+#include <accessibility/AccessibleGridControlTableCell.hxx>
namespace accessibility {
diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
b/vcl/inc/accessibility/AccessibleGridControlTableBase.hxx
similarity index 99%
rename from accessibility/inc/extended/AccessibleGridControlTableBase.hxx
rename to vcl/inc/accessibility/AccessibleGridControlTableBase.hxx
index a7032553c82d..53ca49307e6b 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
+++ b/vcl/inc/accessibility/AccessibleGridControlTableBase.hxx
@@ -20,7 +20,7 @@
#pragma once
-#include <extended/AccessibleGridControlBase.hxx>
+#include <accessibility/AccessibleGridControlBase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
b/vcl/inc/accessibility/AccessibleGridControlTableCell.hxx
similarity index 99%
rename from accessibility/inc/extended/AccessibleGridControlTableCell.hxx
rename to vcl/inc/accessibility/AccessibleGridControlTableCell.hxx
index f9f8c4f7f16e..7d9053932a36 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/vcl/inc/accessibility/AccessibleGridControlTableCell.hxx
@@ -20,7 +20,7 @@
#include <comphelper/accessibletexthelper.hxx>
#include <cppuhelper/implbase2.hxx>
-#include <extended/AccessibleGridControlBase.hxx>
+#include <accessibility/AccessibleGridControlBase.hxx>
#include <vcl/accessibletable.hxx>
#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
diff --git a/accessibility/inc/extended/AccessibleIconView.hxx
b/vcl/inc/accessibility/AccessibleIconView.hxx
similarity index 100%
rename from accessibility/inc/extended/AccessibleIconView.hxx
rename to vcl/inc/accessibility/AccessibleIconView.hxx
diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx
b/vcl/inc/accessibility/IComboListBoxHelper.hxx
similarity index 100%
rename from accessibility/inc/helper/IComboListBoxHelper.hxx
rename to vcl/inc/accessibility/IComboListBoxHelper.hxx
diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx
b/vcl/inc/accessibility/accessiblebrowseboxcell.hxx
similarity index 97%
rename from accessibility/inc/extended/accessiblebrowseboxcell.hxx
rename to vcl/inc/accessibility/accessiblebrowseboxcell.hxx
index 4db205c1d77c..c209619dce6c 100644
--- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx
+++ b/vcl/inc/accessibility/accessiblebrowseboxcell.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <extended/AccessibleBrowseBoxBase.hxx>
+#include <accessibility/AccessibleBrowseBoxBase.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
namespace accessibility
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
b/vcl/inc/accessibility/accessibleeditbrowseboxcell.hxx
similarity index 99%
rename from accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
rename to vcl/inc/accessibility/accessibleeditbrowseboxcell.hxx
index 615266637b32..b137eace05cc 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/vcl/inc/accessibility/accessibleeditbrowseboxcell.hxx
@@ -18,7 +18,7 @@
*/
#pragma once
-#include <extended/accessiblebrowseboxcell.hxx>
+#include <accessibility/accessiblebrowseboxcell.hxx>
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
#include <comphelper/compbase.hxx>
#include <comphelper/accessiblewrapper.hxx>
diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
b/vcl/inc/accessibility/accessibleiconchoicectrl.hxx
similarity index 100%
rename from accessibility/inc/extended/accessibleiconchoicectrl.hxx
rename to vcl/inc/accessibility/accessibleiconchoicectrl.hxx
diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
b/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
similarity index 100%
rename from accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
rename to vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
diff --git a/accessibility/inc/extended/accessiblelistbox.hxx
b/vcl/inc/accessibility/accessiblelistbox.hxx
similarity index 100%
rename from accessibility/inc/extended/accessiblelistbox.hxx
rename to vcl/inc/accessibility/accessiblelistbox.hxx
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx
b/vcl/inc/accessibility/accessiblelistboxentry.hxx
similarity index 100%
rename from accessibility/inc/extended/accessiblelistboxentry.hxx
rename to vcl/inc/accessibility/accessiblelistboxentry.hxx
diff --git a/accessibility/inc/extended/accessibletablistbox.hxx
b/vcl/inc/accessibility/accessibletablistbox.hxx
similarity index 98%
rename from accessibility/inc/extended/accessibletablistbox.hxx
rename to vcl/inc/accessibility/accessibletablistbox.hxx
index b38c1c5ef59d..ebd532a55bca 100644
--- a/accessibility/inc/extended/accessibletablistbox.hxx
+++ b/vcl/inc/accessibility/accessibletablistbox.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <extended/AccessibleBrowseBox.hxx>
+#include <accessibility/AccessibleBrowseBox.hxx>
#include <cppuhelper/implbase1.hxx>
#include <vcl/accessibletableprovider.hxx>
diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx
b/vcl/inc/accessibility/accessibletablistboxtable.hxx
similarity index 98%
rename from accessibility/inc/extended/accessibletablistboxtable.hxx
rename to vcl/inc/accessibility/accessibletablistboxtable.hxx
index b2f2b4277aae..ec36d413acbe 100644
--- a/accessibility/inc/extended/accessibletablistboxtable.hxx
+++ b/vcl/inc/accessibility/accessibletablistboxtable.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <extended/AccessibleBrowseBoxTable.hxx>
+#include <accessibility/AccessibleBrowseBoxTable.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx
b/vcl/inc/accessibility/floatingwindowaccessible.hxx
similarity index 100%
rename from accessibility/source/inc/floatingwindowaccessible.hxx
rename to vcl/inc/accessibility/floatingwindowaccessible.hxx
diff --git a/accessibility/inc/helper/listboxhelper.hxx
b/vcl/inc/accessibility/listboxhelper.hxx
similarity index 99%
rename from accessibility/inc/helper/listboxhelper.hxx
rename to vcl/inc/accessibility/listboxhelper.hxx
index 4f1c5dde1e49..af9c301fcaf8 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/vcl/inc/accessibility/listboxhelper.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <helper/IComboListBoxHelper.hxx>
+#include <accessibility/IComboListBoxHelper.hxx>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <tools/gen.hxx>
diff --git a/accessibility/inc/standard/svtaccessiblenumericfield.hxx
b/vcl/inc/accessibility/svtaccessiblenumericfield.hxx
similarity index 97%
rename from accessibility/inc/standard/svtaccessiblenumericfield.hxx
rename to vcl/inc/accessibility/svtaccessiblenumericfield.hxx
index 0bdf122c1fab..6b2f1390e8d0 100644
--- a/accessibility/inc/standard/svtaccessiblenumericfield.hxx
+++ b/vcl/inc/accessibility/svtaccessiblenumericfield.hxx
@@ -23,7 +23,7 @@
#include <vcl/toolkit/fmtfield.hxx>
#include <vcl/vclevent.hxx>
-#include <standard/vclxaccessibleedit.hxx>
+#include <accessibility/vclxaccessibleedit.hxx>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx
b/vcl/inc/accessibility/textwindowaccessibility.hxx
similarity index 100%
rename from accessibility/inc/extended/textwindowaccessibility.hxx
rename to vcl/inc/accessibility/textwindowaccessibility.hxx
diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx
b/vcl/inc/accessibility/vclxaccessiblebox.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessiblebox.hxx
rename to vcl/inc/accessibility/vclxaccessiblebox.hxx
diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx
b/vcl/inc/accessibility/vclxaccessiblebutton.hxx
similarity index 98%
rename from accessibility/inc/standard/vclxaccessiblebutton.hxx
rename to vcl/inc/accessibility/vclxaccessiblebutton.hxx
index fb9db98818a3..124d3ef6073d 100644
--- a/accessibility/inc/standard/vclxaccessiblebutton.hxx
+++ b/vcl/inc/accessibility/vclxaccessiblebutton.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessibletextcomponent.hxx>
+#include <accessibility/vclxaccessibletextcomponent.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
b/vcl/inc/accessibility/vclxaccessiblecheckbox.hxx
similarity index 98%
rename from accessibility/inc/standard/vclxaccessiblecheckbox.hxx
rename to vcl/inc/accessibility/vclxaccessiblecheckbox.hxx
index 4a0b2de88c99..fa72c12f8f33 100644
--- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
+++ b/vcl/inc/accessibility/vclxaccessiblecheckbox.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessibletextcomponent.hxx>
+#include <accessibility/vclxaccessibletextcomponent.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
diff --git a/accessibility/inc/standard/vclxaccessiblecombobox.hxx
b/vcl/inc/accessibility/vclxaccessiblecombobox.hxx
similarity index 97%
rename from accessibility/inc/standard/vclxaccessiblecombobox.hxx
rename to vcl/inc/accessibility/vclxaccessiblecombobox.hxx
index 9475d5baddd7..240874baeab3 100644
--- a/accessibility/inc/standard/vclxaccessiblecombobox.hxx
+++ b/vcl/inc/accessibility/vclxaccessiblecombobox.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessiblebox.hxx>
+#include <accessibility/vclxaccessiblebox.hxx>
#include <vcl/toolkit/combobox.hxx>
diff --git a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
b/vcl/inc/accessibility/vclxaccessibledropdowncombobox.hxx
similarity index 97%
rename from accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
rename to vcl/inc/accessibility/vclxaccessibledropdowncombobox.hxx
index 3ad1e0e9f92a..b2b0a9f5f7db 100644
--- a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
+++ b/vcl/inc/accessibility/vclxaccessibledropdowncombobox.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessiblebox.hxx>
+#include <accessibility/vclxaccessiblebox.hxx>
#include <vcl/toolkit/combobox.hxx>
diff --git a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
b/vcl/inc/accessibility/vclxaccessibledropdownlistbox.hxx
similarity index 97%
rename from accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
rename to vcl/inc/accessibility/vclxaccessibledropdownlistbox.hxx
index b29b8206cde0..ba046c3366a4 100644
--- a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
+++ b/vcl/inc/accessibility/vclxaccessibledropdownlistbox.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessiblebox.hxx>
+#include <accessibility/vclxaccessiblebox.hxx>
/** The accessible drop down combobox has two children. The first is the
text field represented by an object of the
diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx
b/vcl/inc/accessibility/vclxaccessibleedit.hxx
similarity index 99%
rename from accessibility/inc/standard/vclxaccessibleedit.hxx
rename to vcl/inc/accessibility/vclxaccessibleedit.hxx
index 6469101be775..5ced34ebbd9c 100644
--- a/accessibility/inc/standard/vclxaccessibleedit.hxx
+++ b/vcl/inc/accessibility/vclxaccessibleedit.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessibletextcomponent.hxx>
+#include <accessibility/vclxaccessibletextcomponent.hxx>
#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
diff --git a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
b/vcl/inc/accessibility/vclxaccessiblefixedhyperlink.hxx
similarity index 95%
rename from accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
rename to vcl/inc/accessibility/vclxaccessiblefixedhyperlink.hxx
index 15f6ee17e4bb..be3779248547 100644
--- a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
+++ b/vcl/inc/accessibility/vclxaccessiblefixedhyperlink.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessibletextcomponent.hxx>
+#include <accessibility/vclxaccessibletextcomponent.hxx>
class VCLXAccessibleFixedHyperlink final : public VCLXAccessibleTextComponent
{
diff --git a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
b/vcl/inc/accessibility/vclxaccessiblefixedtext.hxx
similarity index 96%
rename from accessibility/inc/standard/vclxaccessiblefixedtext.hxx
rename to vcl/inc/accessibility/vclxaccessiblefixedtext.hxx
index bce6ef6ec163..24b4add3f79c 100644
--- a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
+++ b/vcl/inc/accessibility/vclxaccessiblefixedtext.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessibletextcomponent.hxx>
+#include <accessibility/vclxaccessibletextcomponent.hxx>
class VCLXAccessibleFixedText final : public VCLXAccessibleTextComponent
{
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
b/vcl/inc/accessibility/vclxaccessibleheaderbar.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessibleheaderbar.hxx
rename to vcl/inc/accessibility/vclxaccessibleheaderbar.hxx
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
rename to vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx
diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx
b/vcl/inc/accessibility/vclxaccessiblelist.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessiblelist.hxx
rename to vcl/inc/accessibility/vclxaccessiblelist.hxx
diff --git a/accessibility/inc/standard/vclxaccessiblelistbox.hxx
b/vcl/inc/accessibility/vclxaccessiblelistbox.hxx
similarity index 97%
rename from accessibility/inc/standard/vclxaccessiblelistbox.hxx
rename to vcl/inc/accessibility/vclxaccessiblelistbox.hxx
index 2e73cc9499d2..e29554288f9c 100644
--- a/accessibility/inc/standard/vclxaccessiblelistbox.hxx
+++ b/vcl/inc/accessibility/vclxaccessiblelistbox.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessiblebox.hxx>
+#include <accessibility/vclxaccessiblebox.hxx>
/** The accessible drop down combobox has one children. It is the list
containing all items and is represented by an object of the
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
b/vcl/inc/accessibility/vclxaccessiblelistitem.hxx
similarity index 99%
rename from accessibility/inc/standard/vclxaccessiblelistitem.hxx
rename to vcl/inc/accessibility/vclxaccessiblelistitem.hxx
index 64fd27d4d97c..b6b1e7e9cc47 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/vcl/inc/accessibility/vclxaccessiblelistitem.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/compbase.hxx>
#include <comphelper/accessibletexthelper.hxx>
-#include <standard/vclxaccessiblelist.hxx>
+#include <accessibility/vclxaccessiblelist.hxx>
// forward ---------------------------------------------------------------
diff --git a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
b/vcl/inc/accessibility/vclxaccessibleradiobutton.hxx
similarity index 98%
rename from accessibility/inc/standard/vclxaccessibleradiobutton.hxx
rename to vcl/inc/accessibility/vclxaccessibleradiobutton.hxx
index bec1aea7f1d2..34158f283a82 100644
--- a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
+++ b/vcl/inc/accessibility/vclxaccessibleradiobutton.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessibletextcomponent.hxx>
+#include <accessibility/vclxaccessibletextcomponent.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
b/vcl/inc/accessibility/vclxaccessiblescrollbar.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessiblescrollbar.hxx
rename to vcl/inc/accessibility/vclxaccessiblescrollbar.hxx
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
b/vcl/inc/accessibility/vclxaccessiblestatusbar.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessiblestatusbar.hxx
rename to vcl/inc/accessibility/vclxaccessiblestatusbar.hxx
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
b/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
rename to vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx
diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
b/vcl/inc/accessibility/vclxaccessibletabcontrol.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessibletabcontrol.hxx
rename to vcl/inc/accessibility/vclxaccessibletabcontrol.hxx
diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx
b/vcl/inc/accessibility/vclxaccessibletabpage.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessibletabpage.hxx
rename to vcl/inc/accessibility/vclxaccessibletabpage.hxx
diff --git a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
b/vcl/inc/accessibility/vclxaccessibletabpagewindow.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
rename to vcl/inc/accessibility/vclxaccessibletabpagewindow.hxx
diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
b/vcl/inc/accessibility/vclxaccessibletextcomponent.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessibletextcomponent.hxx
rename to vcl/inc/accessibility/vclxaccessibletextcomponent.hxx
diff --git a/accessibility/inc/standard/vclxaccessibletextfield.hxx
b/vcl/inc/accessibility/vclxaccessibletextfield.hxx
similarity index 98%
rename from accessibility/inc/standard/vclxaccessibletextfield.hxx
rename to vcl/inc/accessibility/vclxaccessibletextfield.hxx
index 997041db1f9f..d441037b73ed 100644
--- a/accessibility/inc/standard/vclxaccessibletextfield.hxx
+++ b/vcl/inc/accessibility/vclxaccessibletextfield.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <standard/vclxaccessibletextcomponent.hxx>
+#include <accessibility/vclxaccessibletextcomponent.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx
b/vcl/inc/accessibility/vclxaccessibletoolbox.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessibletoolbox.hxx
rename to vcl/inc/accessibility/vclxaccessibletoolbox.hxx
diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
b/vcl/inc/accessibility/vclxaccessibletoolboxitem.hxx
similarity index 100%
rename from accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
rename to vcl/inc/accessibility/vclxaccessibletoolboxitem.hxx
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index 6ce4854deb45..cdd231e842a4 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -127,6 +127,17 @@
#define STR_SPECIAL_CHARACTER_MENU_ENTRY
NC_("editmenu|specialchar", "_Special Character...")
+#define RID_STR_ACC_NAME_BROWSEBUTTON
NC_("RID_STR_ACC_NAME_BROWSEBUTTON", "Browse")
+#define STR_SVT_ACC_ACTION_EXPAND
NC_("STR_SVT_ACC_ACTION_EXPAND", "Expand" )
+#define STR_SVT_ACC_ACTION_COLLAPSE
NC_("STR_SVT_ACC_ACTION_COLLAPSE", "Collapse")
+#define RID_STR_ACC_ACTION_CHECK
NC_("RID_STR_ACC_ACTION_CHECK", "Check")
+#define RID_STR_ACC_ACTION_UNCHECK
NC_("RID_STR_ACC_ACTION_UNCHECK", "Uncheck")
+#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL
NC_("RID_STR_ACC_SCROLLBAR_NAME_VERTICAL", "Vertical scroll bar")
+#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL
NC_("RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL", "Horizontal scroll bar")
+#define RID_STR_ACC_PANEL_DESCRIPTION
NC_("RID_STR_ACC_PANEL_DESCRIPTION", "Please press enter to go into child
control for more operations")
+#define RID_STR_ACC_COLUMN_NUM
NC_("RID_STR_ACC_COLUMN_NUM", "Column %COLUMNNUMBER")
+#define RID_STR_ACC_ROW_NUM NC_("RID_STR_ACC_ROW_NUM",
"Row %ROWNUMBER")
+
#endif // INCLUDED_VCL_INC_STRINGS_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx
b/vcl/source/accessibility/AccessibleBrowseBox.cxx
similarity index 95%
rename from accessibility/source/extended/AccessibleBrowseBox.cxx
rename to vcl/source/accessibility/AccessibleBrowseBox.cxx
index c46a42ddbcd1..86a955889f54 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBox.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <extended/AccessibleBrowseBox.hxx>
-#include <extended/AccessibleBrowseBoxTable.hxx>
-#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
+#include <accessibility/AccessibleBrowseBox.hxx>
+#include <accessibility/AccessibleBrowseBoxTable.hxx>
+#include <accessibility/AccessibleBrowseBoxHeaderBar.hxx>
#include <com/sun/star/awt/XVclWindowPeer.hdl>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <utility>
@@ -51,7 +51,7 @@ void AccessibleBrowseBox::setCreator( const
css::uno::Reference< css::accessibil
{
#if OSL_DEBUG_LEVEL > 0
css::uno::Reference< css::accessibility::XAccessible >
xCreator(m_aCreator);
- OSL_ENSURE( !xCreator.is(), "extended/AccessibleBrowseBox::setCreator:
creator already set!" );
+ OSL_ENSURE( !xCreator.is(),
"accessibility/AccessibleBrowseBox::setCreator: creator already set!" );
#endif
m_aCreator = _rxCreator;
}
@@ -235,7 +235,7 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int64
nChildIndex )
rtl::Reference<AccessibleBrowseBoxTable>
AccessibleBrowseBox::createAccessibleTable()
{
css::uno::Reference< css::accessibility::XAccessible >
xCreator(m_aCreator);
- OSL_ENSURE( xCreator.is(),
"extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how
this?" );
+ OSL_ENSURE( xCreator.is(),
"accessibility/AccessibleBrowseBox::createAccessibleTable: my creator died -
how this?" );
return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox );
}
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
similarity index 99%
rename from accessibility/source/extended/AccessibleBrowseBoxBase.cxx
rename to vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
index 5557ba691564..396e95a10161 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <extended/AccessibleBrowseBoxBase.hxx>
+#include <accessibility/AccessibleBrowseBoxBase.hxx>
#include <utility>
#include <vcl/accessibletableprovider.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
b/vcl/source/accessibility/AccessibleBrowseBoxCheckBoxCell.cxx
similarity index 98%
rename from accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
rename to vcl/source/accessibility/AccessibleBrowseBoxCheckBoxCell.cxx
index e0a36478b0a2..ede8dfd8df4e 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <extended/AccessibleBrowseBoxCheckBoxCell.hxx>
+#include <accessibility/AccessibleBrowseBoxCheckBoxCell.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <vcl/accessibletableprovider.hxx>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
b/vcl/source/accessibility/AccessibleBrowseBoxHeaderBar.cxx
similarity index 98%
rename from accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
rename to vcl/source/accessibility/AccessibleBrowseBoxHeaderBar.cxx
index 3918c4551308..14e4f20ceda4 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBoxHeaderBar.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
+#include <accessibility/AccessibleBrowseBoxHeaderBar.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/unohelp.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@@ -42,7 +42,7 @@ AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar(
AccessibleBrowseBoxTableBase( rxParent, rBrowseBox,eObjType )
{
OSL_ENSURE( isRowBar() || isColumnBar(),
- "extended/AccessibleBrowseBoxHeaderBar - invalid object type" );
+ "accessibility/AccessibleBrowseBoxHeaderBar - invalid object type" );
}
AccessibleBrowseBoxHeaderBar::~AccessibleBrowseBoxHeaderBar()
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
b/vcl/source/accessibility/AccessibleBrowseBoxHeaderCell.cxx
similarity index 98%
rename from accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
rename to vcl/source/accessibility/AccessibleBrowseBoxHeaderCell.cxx
index c7e8ce1605cf..816ace862b61 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBoxHeaderCell.cxx
@@ -18,7 +18,7 @@
*/
-#include <extended/AccessibleBrowseBoxHeaderCell.hxx>
+#include <accessibility/AccessibleBrowseBoxHeaderCell.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
b/vcl/source/accessibility/AccessibleBrowseBoxTable.cxx
similarity index 99%
rename from accessibility/source/extended/AccessibleBrowseBoxTable.cxx
rename to vcl/source/accessibility/AccessibleBrowseBoxTable.cxx
index 99764f4c1f8a..b368ce2af0fe 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBoxTable.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <extended/AccessibleBrowseBoxTable.hxx>
+#include <accessibility/AccessibleBrowseBoxTable.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/unohelp.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
b/vcl/source/accessibility/AccessibleBrowseBoxTableBase.cxx
similarity index 99%
rename from accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
rename to vcl/source/accessibility/AccessibleBrowseBoxTableBase.cxx
index c1363eaf0249..e245e3351abf 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBoxTableBase.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <extended/AccessibleBrowseBoxTableBase.hxx>
+#include <accessibility/AccessibleBrowseBoxTableBase.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <comphelper/sequence.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
b/vcl/source/accessibility/AccessibleBrowseBoxTableCell.cxx
similarity index 99%
rename from accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
rename to vcl/source/accessibility/AccessibleBrowseBoxTableCell.cxx
index f45f6099d6c5..1175ed72a779 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBoxTableCell.cxx
@@ -18,7 +18,7 @@
*/
-#include <extended/AccessibleBrowseBoxTableCell.hxx>
+#include <accessibility/AccessibleBrowseBoxTableCell.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/unohelp.hxx>
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/vcl/source/accessibility/AccessibleGridControl.cxx
similarity index 97%
rename from accessibility/source/extended/AccessibleGridControl.cxx
rename to vcl/source/accessibility/AccessibleGridControl.cxx
index 0f9e352e7c46..1a5c6b1e74ff 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/vcl/source/accessibility/AccessibleGridControl.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <extended/AccessibleGridControl.hxx>
-#include <extended/AccessibleGridControlTable.hxx>
-#include <extended/AccessibleGridControlHeader.hxx>
+#include <accessibility/AccessibleGridControl.hxx>
+#include <accessibility/AccessibleGridControlTable.hxx>
+#include <accessibility/AccessibleGridControlHeader.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@@ -255,7 +255,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int64
nChildIndex )
rtl::Reference<AccessibleGridControlTable>
AccessibleGridControl::createAccessibleTable()
{
css::uno::Reference< css::accessibility::XAccessible >
xCreator(m_aCreator);
- OSL_ENSURE( xCreator.is(),
"extended/AccessibleGridControl::createAccessibleTable: my creator died - how
this?" );
+ OSL_ENSURE( xCreator.is(),
"accessibility/AccessibleGridControl::createAccessibleTable: my creator died -
how this?" );
return new AccessibleGridControlTable( xCreator, m_aTable );
}
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx
b/vcl/source/accessibility/AccessibleGridControlBase.cxx
similarity index 99%
rename from accessibility/source/extended/AccessibleGridControlBase.cxx
rename to vcl/source/accessibility/AccessibleGridControlBase.cxx
index 3f8609d020f1..52d9763ad50f 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/vcl/source/accessibility/AccessibleGridControlBase.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <extended/AccessibleGridControlBase.hxx>
+#include <accessibility/AccessibleGridControlBase.hxx>
#include <utility>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx
b/vcl/source/accessibility/AccessibleGridControlHeader.cxx
similarity index 97%
rename from accessibility/source/extended/AccessibleGridControlHeader.cxx
rename to vcl/source/accessibility/AccessibleGridControlHeader.cxx
index b414573910c6..9a0c81539049 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/vcl/source/accessibility/AccessibleGridControlHeader.cxx
@@ -18,8 +18,8 @@
*/
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <extended/AccessibleGridControlHeader.hxx>
-#include <extended/AccessibleGridControlHeaderCell.hxx>
+#include <accessibility/AccessibleGridControlHeader.hxx>
+#include <accessibility/AccessibleGridControlHeaderCell.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
@@ -45,7 +45,7 @@ AccessibleGridControlHeader::AccessibleGridControlHeader(
AccessibleGridControlTableBase( rxParent, rTable, eObjType )
{
OSL_ENSURE( isRowBar() || isColumnBar(),
- "extended/AccessibleGridControlHeaderBar - invalid object type" );
+ "accessibility/AccessibleGridControlHeaderBar - invalid object type" );
}
// XAccessibleContext ---------------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
b/vcl/source/accessibility/AccessibleGridControlHeaderCell.cxx
similarity index 98%
rename from accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
rename to vcl/source/accessibility/AccessibleGridControlHeaderCell.cxx
index 57baebd2df28..a85897b83873 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/vcl/source/accessibility/AccessibleGridControlHeaderCell.cxx
@@ -19,7 +19,7 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <extended/AccessibleGridControlHeaderCell.hxx>
+#include <accessibility/AccessibleGridControlHeaderCell.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/vcl/source/accessibility/AccessibleGridControlTable.cxx
similarity index 99%
rename from accessibility/source/extended/AccessibleGridControlTable.cxx
rename to vcl/source/accessibility/AccessibleGridControlTable.cxx
index 930d5c9395ce..ba3fb0d2b728 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/vcl/source/accessibility/AccessibleGridControlTable.cxx
@@ -21,8 +21,8 @@
#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <extended/AccessibleGridControlTable.hxx>
-#include <extended/AccessibleGridControlTableCell.hxx>
+#include <accessibility/AccessibleGridControlTable.hxx>
+#include <accessibility/AccessibleGridControlTableCell.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
b/vcl/source/accessibility/AccessibleGridControlTableBase.cxx
similarity index 99%
rename from accessibility/source/extended/AccessibleGridControlTableBase.cxx
rename to vcl/source/accessibility/AccessibleGridControlTableBase.cxx
index cec5382fcf28..5cfb904bad5c 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/vcl/source/accessibility/AccessibleGridControlTableBase.cxx
@@ -19,7 +19,7 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <extended/AccessibleGridControlTableBase.hxx>
+#include <accessibility/AccessibleGridControlTableBase.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/sequence.hxx>
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
b/vcl/source/accessibility/AccessibleGridControlTableCell.cxx
similarity index 98%
rename from accessibility/source/extended/AccessibleGridControlTableCell.cxx
rename to vcl/source/accessibility/AccessibleGridControlTableCell.cxx
index a1a1af5fe641..aa76ffe0c533 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/vcl/source/accessibility/AccessibleGridControlTableCell.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <extended/AccessibleGridControlTableCell.hxx>
+#include <accessibility/AccessibleGridControlTableCell.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
@@ -31,7 +31,7 @@ namespace accessibility
namespace
{
// FIXME this is a copy'n'paste from
- // source/extended/AccessibleBrowseBoxTableCell.cxx, get rid of that...
+ // source/accessibility/AccessibleBrowseBoxTableCell.cxx, get rid of
that...
/// @throws css::lang::IndexOutOfBoundsException
void checkIndex_Impl( sal_Int32 _nIndex, std::u16string_view _sText )
{
diff --git a/accessibility/source/extended/AccessibleIconView.cxx
b/vcl/source/accessibility/AccessibleIconView.cxx
similarity index 97%
rename from accessibility/source/extended/AccessibleIconView.cxx
rename to vcl/source/accessibility/AccessibleIconView.cxx
index 82235c29b526..eeb4b3ee3e6f 100644
--- a/accessibility/source/extended/AccessibleIconView.cxx
+++ b/vcl/source/accessibility/AccessibleIconView.cxx
@@ -14,7 +14,7 @@
#include <vcl/event.hxx>
#include <vcl/unohelp.hxx>
-#include <extended/AccessibleIconView.hxx>
+#include <accessibility/AccessibleIconView.hxx>
namespace accessibility
{
diff --git a/accessibility/source/helper/IComboListBoxHelper.cxx
b/vcl/source/accessibility/IComboListBoxHelper.cxx
similarity index 90%
rename from accessibility/source/helper/IComboListBoxHelper.cxx
rename to vcl/source/accessibility/IComboListBoxHelper.cxx
index f4830815fd8c..5b8ac834ba1b 100644
--- a/accessibility/source/helper/IComboListBoxHelper.cxx
+++ b/vcl/source/accessibility/IComboListBoxHelper.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <helper/IComboListBoxHelper.hxx>
+#include <accessibility/IComboListBoxHelper.hxx>
namespace accessibility
{
diff --git a/accessibility/source/helper/acc_factory.cxx
b/vcl/source/accessibility/acc_factory.cxx
similarity index 91%
rename from accessibility/source/helper/acc_factory.cxx
rename to vcl/source/accessibility/acc_factory.cxx
index f22af6e2945d..e9389ac865b7 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/vcl/source/accessibility/acc_factory.cxx
@@ -21,45 +21,44 @@
#include <cppuhelper/supportsservice.hxx>
#include <vcl/accessiblefactory.hxx>
-#include <standard/svtaccessiblenumericfield.hxx>
-#include <standard/vclxaccessiblebutton.hxx>
-#include <standard/vclxaccessiblecheckbox.hxx>
-#include <standard/vclxaccessibledropdowncombobox.hxx>
-#include <standard/vclxaccessiblecombobox.hxx>
-#include <standard/vclxaccessibledropdownlistbox.hxx>
-#include <standard/vclxaccessibleedit.hxx>
-#include <standard/vclxaccessiblefixedhyperlink.hxx>
-#include <standard/vclxaccessiblefixedtext.hxx>
-#include <standard/vclxaccessibleheaderbar.hxx>
-#include <standard/vclxaccessiblelistbox.hxx>
-#include <standard/vclxaccessibleradiobutton.hxx>
-#include <standard/vclxaccessiblescrollbar.hxx>
-#include <standard/vclxaccessibletoolbox.hxx>
-#include <standard/vclxaccessiblestatusbar.hxx>
-#include <standard/vclxaccessibletabcontrol.hxx>
-#include <standard/vclxaccessibletabpagewindow.hxx>
-#include <extended/accessibletablistbox.hxx>
-#include <extended/AccessibleBrowseBox.hxx>
-#include <extended/accessibleiconchoicectrl.hxx>
-#include <extended/AccessibleIconView.hxx>
-#include <extended/accessiblelistbox.hxx>
-#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
-#include <extended/textwindowaccessibility.hxx>
-#include <extended/AccessibleBrowseBoxTableCell.hxx>
-#include <extended/AccessibleBrowseBoxHeaderCell.hxx>
-#include <extended/AccessibleBrowseBoxCheckBoxCell.hxx>
-#include <extended/accessibleeditbrowseboxcell.hxx>
+#include <accessibility/floatingwindowaccessible.hxx>
+#include <accessibility/svtaccessiblenumericfield.hxx>
+#include <accessibility/vclxaccessiblebutton.hxx>
+#include <accessibility/vclxaccessiblecheckbox.hxx>
+#include <accessibility/vclxaccessibledropdowncombobox.hxx>
+#include <accessibility/vclxaccessiblecombobox.hxx>
+#include <accessibility/vclxaccessibledropdownlistbox.hxx>
+#include <accessibility/vclxaccessibleedit.hxx>
+#include <accessibility/vclxaccessiblefixedhyperlink.hxx>
+#include <accessibility/vclxaccessiblefixedtext.hxx>
+#include <accessibility/vclxaccessibleheaderbar.hxx>
+#include <accessibility/vclxaccessiblelistbox.hxx>
+#include <accessibility/vclxaccessibleradiobutton.hxx>
+#include <accessibility/vclxaccessiblescrollbar.hxx>
+#include <accessibility/vclxaccessibletoolbox.hxx>
+#include <accessibility/vclxaccessiblestatusbar.hxx>
+#include <accessibility/vclxaccessibletabcontrol.hxx>
+#include <accessibility/vclxaccessibletabpagewindow.hxx>
+#include <accessibility/accessibletablistbox.hxx>
+#include <accessibility/AccessibleBrowseBox.hxx>
+#include <accessibility/accessibleiconchoicectrl.hxx>
+#include <accessibility/AccessibleIconView.hxx>
+#include <accessibility/accessiblelistbox.hxx>
+#include <accessibility/AccessibleBrowseBoxHeaderBar.hxx>
+#include <accessibility/textwindowaccessibility.hxx>
+#include <accessibility/AccessibleBrowseBoxTableCell.hxx>
+#include <accessibility/AccessibleBrowseBoxHeaderCell.hxx>
+#include <accessibility/AccessibleBrowseBoxCheckBoxCell.hxx>
+#include <accessibility/AccessibleGridControl.hxx>
+#include <accessibility/accessibleeditbrowseboxcell.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <vcl/toolkit/lstbox.hxx>
#include <vcl/toolkit/combobox.hxx>
#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>
-
using namespace ::accessibility;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
-e
... etc. - the rest is truncated
