include/vcl/accessiblefactory.hxx | 97 +++++++++++++++++++++++-
vcl/source/accessibility/acc_factory.cxx | 123 -------------------------------
2 files changed, 93 insertions(+), 127 deletions(-)
New commits:
commit 486728e582d1932cb0b97a51b8edfacf462ec7f9
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Dec 17 12:20:18 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Dec 17 22:57:06 2024 +0100
a11y: Use #pragma once
Change-Id: I99b22c542c673c5633ebd9fe270e32759eb54457
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178687
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/include/vcl/accessiblefactory.hxx
b/include/vcl/accessiblefactory.hxx
index ec14d2f2c12e..cc97ce380f66 100644
--- a/include/vcl/accessiblefactory.hxx
+++ b/include/vcl/accessiblefactory.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
-#define INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
+#pragma once
#include <vcl/AccessibleBrowseBoxObjType.hxx>
@@ -341,6 +340,4 @@ protected:
virtual ~AccessibleFactory() override;
};
-#endif // INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 78c27e32df7298c13c27bd66221d5f8aff4da824
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Dec 17 12:14:44 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Dec 17 22:56:58 2024 +0100
vcl a11y: Move AccessibleFactory declaration to header
... in preparation of using it directly elsewhere.
Change-Id: I50e773fb359418838d7fd42846772ff4f1546ada
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178686
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/include/vcl/accessiblefactory.hxx
b/include/vcl/accessiblefactory.hxx
index bed9773565e9..ec14d2f2c12e 100644
--- a/include/vcl/accessiblefactory.hxx
+++ b/include/vcl/accessiblefactory.hxx
@@ -248,6 +248,98 @@ namespace vcl
} // namespace vcl
+class AccessibleFactory : public vcl::IAccessibleFactory
+{
+public:
+ AccessibleFactory();
+
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(PushButton* pButton) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(CheckBox* pCheckBox) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(RadioButton* pRadioButton) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(ListBox* pListBox) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(FixedText* pFixedText) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(FixedHyperlink* pFixedHyperlink) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(ScrollBar* pScrollBar) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(Edit* pEdit) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(ComboBox* pComboBox) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(ToolBox* pToolBox) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(HeaderBar* pHeaderBar) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(FormattedField* pFormattedField) override;
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleContext(vcl::Window* pWindow) override;
+
+ virtual vcl::IAccessibleTabListBox*
+ createAccessibleTabListBox(const
css::uno::Reference<css::accessibility::XAccessible>& rxParent,
+ SvHeaderTabListBox& rBox) const override;
+
+ virtual rtl::Reference<vcl::IAccessibleBrowseBox>
+ createAccessibleBrowseBox(const
css::uno::Reference<css::accessibility::XAccessible>& _rxParent,
+ vcl::IAccessibleTableProvider& _rBrowseBox)
const override;
+
+ virtual rtl::Reference<vcl::table::IAccessibleTableControl>
createAccessibleTableControl(
+ const css::uno::Reference<css::accessibility::XAccessible>& _rxParent,
+ vcl::table::IAccessibleTable& _rTable) const override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessible>
createAccessibleIconChoiceCtrl(
+ SvtIconChoiceCtrl& _rIconCtrl,
+ const css::uno::Reference<css::accessibility::XAccessible>& _xParent)
const override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ createAccessibleTextWindowContext(vcl::Window* pWindow, TextEngine&
rEngine,
+ TextView& rView) const override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessible>
createAccessibleTreeListBox(
+ SvTreeListBox& _rListBox,
+ const css::uno::Reference<css::accessibility::XAccessible>& _xParent)
const override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessible>
createAccessibleIconView(
+ SvTreeListBox& _rListBox,
+ const css::uno::Reference<css::accessibility::XAccessible>& _xParent)
const override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessible>
createAccessibleBrowseBoxHeaderBar(
+ const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
+ vcl::IAccessibleTableProvider& _rOwningTable,
+ AccessibleBrowseBoxObjType _eObjType) const override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessible>
createAccessibleBrowseBoxTableCell(
+ const css::uno::Reference<css::accessibility::XAccessible>& _rxParent,
+ vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowId,
sal_uInt16 _nColId,
+ sal_Int32 _nOffset) const override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessible>
+ createAccessibleBrowseBoxHeaderCell(
+ sal_Int32 _nColumnRowId,
+ const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
+ vcl::IAccessibleTableProvider& _rBrowseBox,
+ AccessibleBrowseBoxObjType _eObjType) const override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessible>
createAccessibleCheckBoxCell(
+ const css::uno::Reference<css::accessibility::XAccessible>& _rxParent,
+ vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
+ const TriState& _eState, bool _bIsTriState) const override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessible>
createEditBrowseBoxTableCellAccess(
+ const css::uno::Reference<css::accessibility::XAccessible>& _rxParent,
+ const css::uno::Reference<css::accessibility::XAccessible>&
_rxControlAccessible,
+ const css::uno::Reference<css::awt::XWindow>& _rxFocusWindow,
+ vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos,
+ sal_uInt16 _nColPos) const override;
+
+protected:
+ virtual ~AccessibleFactory() override;
+};
#endif // INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
diff --git a/vcl/source/accessibility/acc_factory.cxx
b/vcl/source/accessibility/acc_factory.cxx
index e9389ac865b7..c2aaff9524cf 100644
--- a/vcl/source/accessibility/acc_factory.cxx
+++ b/vcl/source/accessibility/acc_factory.cxx
@@ -73,127 +73,6 @@ bool hasFloatingChild(vcl::Window *pWindow)
vcl::Window * pChild = pWindow->GetAccessibleChildWindow(0);
return pChild && pChild->GetType() == WindowType::FLOATINGWINDOW;
}
-
-// IAccessibleFactory
-class AccessibleFactory : public ::vcl::IAccessibleFactory
-{
-public:
- AccessibleFactory();
-
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(PushButton* pButton) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(CheckBox* pCheckBox) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(RadioButton* pRadioButton) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(ListBox* pListBox) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(FixedText* pFixedText) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(FixedHyperlink* pFixedHyperlink) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(ScrollBar* pScrollBar) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(Edit* pEdit) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(ComboBox* pComboBox) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(ToolBox* pToolBox) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(HeaderBar* pHeaderBar) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(FormattedField* pFormattedField) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleContext(vcl::Window* pWindow) override;
-
- virtual vcl::IAccessibleTabListBox*
- createAccessibleTabListBox(
- const css::uno::Reference< css::accessibility::XAccessible >&
rxParent,
- SvHeaderTabListBox& rBox
- ) const override;
-
- virtual rtl::Reference<vcl::IAccessibleBrowseBox>
- createAccessibleBrowseBox(
- const css::uno::Reference< css::accessibility::XAccessible >&
_rxParent,
- vcl::IAccessibleTableProvider& _rBrowseBox
- ) const override;
-
- virtual rtl::Reference<IAccessibleTableControl>
- createAccessibleTableControl(
- const css::uno::Reference< css::accessibility::XAccessible >&
_rxParent,
- IAccessibleTable& _rTable
- ) const override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible >
- createAccessibleIconChoiceCtrl(
- SvtIconChoiceCtrl& _rIconCtrl,
- const css::uno::Reference< css::accessibility::XAccessible >&
_xParent
- ) const override;
-
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- createAccessibleTextWindowContext(
- vcl::Window* pWindow, TextEngine& rEngine, TextView& rView
- ) const override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible >
- createAccessibleTreeListBox(
- SvTreeListBox& _rListBox,
- const css::uno::Reference< css::accessibility::XAccessible >&
_xParent
- ) const override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible >
- createAccessibleIconView(
- SvTreeListBox& _rListBox,
- const css::uno::Reference< css::accessibility::XAccessible >&
_xParent
- ) const override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible >
- createAccessibleBrowseBoxHeaderBar(
- const css::uno::Reference< css::accessibility::XAccessible >&
rxParent,
- vcl::IAccessibleTableProvider& _rOwningTable,
- AccessibleBrowseBoxObjType _eObjType
- ) const override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible >
- createAccessibleBrowseBoxTableCell(
- const css::uno::Reference< css::accessibility::XAccessible >&
_rxParent,
- vcl::IAccessibleTableProvider& _rBrowseBox,
- sal_Int32 _nRowId,
- sal_uInt16 _nColId,
- sal_Int32 _nOffset
- ) const override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible >
- createAccessibleBrowseBoxHeaderCell(
- sal_Int32 _nColumnRowId,
- const css::uno::Reference< css::accessibility::XAccessible >&
rxParent,
- vcl::IAccessibleTableProvider& _rBrowseBox,
- AccessibleBrowseBoxObjType _eObjType
- ) const override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible >
- createAccessibleCheckBoxCell(
- const css::uno::Reference< css::accessibility::XAccessible >&
_rxParent,
- vcl::IAccessibleTableProvider& _rBrowseBox,
- sal_Int32 _nRowPos,
- sal_uInt16 _nColPos,
- const TriState& _eState,
- bool _bIsTriState
- ) const override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible >
- createEditBrowseBoxTableCellAccess(
- const css::uno::Reference< css::accessibility::XAccessible >&
_rxParent,
- const css::uno::Reference< css::accessibility::XAccessible >&
_rxControlAccessible,
- const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow,
- vcl::IAccessibleTableProvider& _rBrowseBox,
- sal_Int32 _nRowPos,
- sal_uInt16 _nColPos
- ) const override;
-
-protected:
- virtual ~AccessibleFactory() override;
};
AccessibleFactory::AccessibleFactory()
@@ -402,8 +281,6 @@ Reference< XAccessible >
AccessibleFactory::createEditBrowseBoxTableCellAccess(
_rxFocusWindow, _rBrowseBox, _nRowPos, _nColPos );
}
-} // anonymous namespace
-
#if HAVE_FEATURE_DESKTOP
/// anonymous implementation namespace
