sc/source/ui/Accessibility/AccessibleDocument.cxx | 35 ------------
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 44 ++--------------
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 9 ---
sc/source/ui/inc/AccessibleDocument.hxx | 37 +------------
sc/source/ui/inc/AccessibleEditObject.hxx | 18 ------
sc/source/ui/inc/AccessiblePageHeaderArea.hxx | 7 --
6 files changed, 13 insertions(+), 137 deletions(-)
New commits:
commit aa25ea304965ccfcd13646a21ff908247018047c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jun 23 15:16:47 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jun 24 07:59:48 2025 +0200
sc a11y: Drop ScAccessiblePageHeaderArea::getImplementationId
It does the same as the ImplInheritanceHelper base class
implementation.
Change-Id: I5161fba7901b5b56a292dc27c6459efcdb9673cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186835
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index a795b670511d..6230966837fe 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -166,15 +166,6 @@ uno::Sequence< OUString> SAL_CALL
return
comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(),
vals);
}
-//===== XTypeProvider =======================================================
-
-uno::Sequence<sal_Int8> SAL_CALL
- ScAccessiblePageHeaderArea::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
-//===== internal ==============================================================
OUString ScAccessiblePageHeaderArea::createAccessibleDescription()
{
OUString sDesc;
diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
index 556b2343cd85..9aecfd5b6d02 100644
--- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
@@ -82,13 +82,6 @@ public:
virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames() override;
- ///===== XTypeProvider
===================================================
-
- /** Returns an implementation id.
- */
- virtual css::uno::Sequence<sal_Int8> SAL_CALL
- getImplementationId() override;
-
protected:
virtual OUString createAccessibleDescription() override;
virtual OUString createAccessibleName() override;
commit 48fb1d0813a0271e19395b4c026cb88c4ae5a91c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jun 23 15:14:35 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jun 24 07:59:41 2025 +0200
sc a11y: Use ImplInheritancehelper for ScAccessibleEditObject
Change-Id: I74fa453b81d1e2cb7a0df0f4babfe352618e1e37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186834
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 541505343dc7..c51cebe64516 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -54,11 +54,11 @@ using ::com::sun::star::lang::IndexOutOfBoundsException;
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-ScAccessibleEditObject::ScAccessibleEditObject(
- const uno::Reference<XAccessible>& rxParent,
- EditView* pEditView, vcl::Window* pWin, const OUString& rName,
- const OUString& rDescription, EditObjectType eObjectType)
- : ScAccessibleContextBase(rxParent, AccessibleRole::TEXT_FRAME)
+ScAccessibleEditObject::ScAccessibleEditObject(const
uno::Reference<XAccessible>& rxParent,
+ EditView* pEditView,
vcl::Window* pWin,
+ const OUString& rName, const
OUString& rDescription,
+ EditObjectType eObjectType)
+ : ImplInheritanceHelper(rxParent, AccessibleRole::TEXT_FRAME)
, mpEditView(pEditView)
, mpWindow(pWin)
, mpTextWnd(nullptr)
@@ -70,7 +70,7 @@ ScAccessibleEditObject::ScAccessibleEditObject(
}
ScAccessibleEditObject::ScAccessibleEditObject(EditObjectType eObjectType)
- : ScAccessibleContextBase(nullptr, AccessibleRole::TEXT_FRAME)
+ : ImplInheritanceHelper(nullptr, AccessibleRole::TEXT_FRAME)
, mpEditView(nullptr)
, mpWindow(nullptr)
, mpTextWnd(nullptr)
@@ -138,30 +138,6 @@ void ScAccessibleEditObject::GotFocus()
mpTextHelper->SetFocus();
}
-//===== XInterface ==========================================================
-
-css::uno::Any SAL_CALL
- ScAccessibleEditObject::queryInterface (const css::uno::Type & rType)
-{
- css::uno::Any aReturn = ScAccessibleContextBase::queryInterface (rType);
- if ( ! aReturn.hasValue())
- aReturn = ::cppu::queryInterface (rType,
- static_cast< css::accessibility::XAccessibleSelection* >(this)
- );
- return aReturn;
-}
-void SAL_CALL
- ScAccessibleEditObject::acquire()
- noexcept
-{
- ScAccessibleContextBase::acquire ();
-}
-void SAL_CALL
- ScAccessibleEditObject::release()
- noexcept
-{
- ScAccessibleContextBase::release ();
-}
//===== XAccessibleComponent ============================================
uno::Reference< XAccessible > SAL_CALL
ScAccessibleEditObject::getAccessibleAtPoint(
@@ -329,14 +305,6 @@ OUString SAL_CALL
ScAccessibleEditObject::getImplementationName()
return u"ScAccessibleEditObject"_ustr;
}
-//===== XTypeProvider =======================================================
-
-uno::Sequence<sal_Int8> SAL_CALL
- ScAccessibleEditObject::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
bool ScAccessibleEditObject::IsDefunc(sal_Int64 nParentStates)
{
return ScAccessibleContextBase::IsDefunc() || !getAccessibleParent().is()
||
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx
b/sc/source/ui/inc/AccessibleEditObject.hxx
index 451d28ee71ab..9dae9219ac2a 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -41,8 +41,8 @@ namespace vcl { class Window; }
<code>AccessibleCell</code> service.
*/
class ScAccessibleEditObject
- : public ScAccessibleContextBase,
- public css::accessibility::XAccessibleSelection
+ : public cppu::ImplInheritanceHelper<ScAccessibleContextBase,
+
css::accessibility::XAccessibleSelection>
{
public:
enum EditObjectType
@@ -76,14 +76,7 @@ public:
void LostFocus();
void GotFocus();
-///===== XInterface =====================================================
- virtual css::uno::Any SAL_CALL queryInterface(
- css::uno::Type const & rType ) override;
-
- virtual void SAL_CALL acquire() noexcept override;
-
- virtual void SAL_CALL release() noexcept override;
///===== XAccessibleComponent
============================================
virtual css::uno::Reference< css::accessibility::XAccessible >
@@ -160,13 +153,6 @@ public:
virtual OUString SAL_CALL
getImplementationName() override;
- ///===== XTypeProvider
===================================================
-
- /** Returns an implementation id.
- */
- virtual css::uno::Sequence<sal_Int8> SAL_CALL
- getImplementationId() override;
-
private:
std::unique_ptr<accessibility::AccessibleTextHelper> mpTextHelper;
EditView* mpEditView;
commit 05de048353f8d62762f2a4aabf227719b41a7218
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jun 23 15:09:53 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jun 24 07:59:34 2025 +0200
sc a11y: Use ImplInheritancehelper for ScAccessibleDocument
Change-Id: Id3caa3a0bc21b5cc2e7f3939a5f147d39b3794ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186833
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index e04b4a2527c4..d68448a597fa 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1286,7 +1286,7 @@ ScAccessibleDocument::ScAccessibleDocument(
const uno::Reference<XAccessible>& rxParent,
ScTabViewShell* pViewShell,
ScSplitPos eSplitPos)
- : ScAccessibleDocumentBase(rxParent),
+ : ImplInheritanceHelper(rxParent),
mpViewShell(pViewShell),
meSplitPos(eSplitPos),
mbCompleteSheetSelected(false)
@@ -1554,26 +1554,6 @@ void SAL_CALL ScAccessibleDocument::selectionChanged(
const lang::EventObject& /
CommitChange(AccessibleEventId::SELECTION_CHANGED, uno::Any(),
uno::Any());
}
- //===== XInterface =====================================================
-
-uno::Any SAL_CALL ScAccessibleDocument::queryInterface( uno::Type const &
rType )
-{
- uno::Any aAny (ScAccessibleDocumentImpl::queryInterface(rType));
- return aAny.hasValue() ? aAny :
ScAccessibleContextBase::queryInterface(rType);
-}
-
-void SAL_CALL ScAccessibleDocument::acquire()
- noexcept
-{
- ScAccessibleContextBase::acquire();
-}
-
-void SAL_CALL ScAccessibleDocument::release()
- noexcept
-{
- ScAccessibleContextBase::release();
-}
-
//===== XAccessibleComponent ============================================
uno::Reference< XAccessible > SAL_CALL
ScAccessibleDocument::getAccessibleAtPoint(
@@ -1913,19 +1893,6 @@ uno::Sequence< OUString> SAL_CALL
return
comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(),
vals);
}
-//===== XTypeProvider =======================================================
-
-uno::Sequence< uno::Type > SAL_CALL ScAccessibleDocument::getTypes()
-{
- return comphelper::concatSequences(ScAccessibleDocumentImpl::getTypes(),
ScAccessibleContextBase::getTypes());
-}
-
-uno::Sequence<sal_Int8> SAL_CALL
- ScAccessibleDocument::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
///===== IAccessibleViewForwarder ========================================
tools::Rectangle ScAccessibleDocument::GetVisibleArea_Impl()
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx
b/sc/source/ui/inc/AccessibleDocument.hxx
index fd18f3360541..1db26b561291 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -38,20 +38,11 @@ namespace utl
class AccessibleRelationSetHelper;
}
-/** @descr
- This base class provides an implementation of the
- <code>AccessibleContext</code> service.
-*/
-
-typedef cppu::ImplHelper3< css::accessibility::XAccessibleSelection,
- css::accessibility::XAccessibleExtendedAttributes,
- css::view::XSelectionChangeListener >
- ScAccessibleDocumentImpl;
-
class ScAccessibleDocument
- : public ScAccessibleDocumentBase,
- public ScAccessibleDocumentImpl,
- public accessibility::IAccessibleViewForwarder
+ : public cppu::ImplInheritanceHelper<
+ ScAccessibleDocumentBase, css::accessibility::XAccessibleSelection,
+ css::accessibility::XAccessibleExtendedAttributes,
css::view::XSelectionChangeListener>,
+ public accessibility::IAccessibleViewForwarder
{
public:
ScAccessibleDocument(
@@ -77,15 +68,6 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
- ///===== XInterface =====================================================
-
- virtual css::uno::Any SAL_CALL queryInterface(
- css::uno::Type const & rType ) override;
-
- virtual void SAL_CALL acquire() noexcept override;
-
- virtual void SAL_CALL release() noexcept override;
-
///===== XAccessibleComponent
============================================
virtual css::uno::Reference< css::accessibility::XAccessible >
@@ -154,17 +136,6 @@ public:
virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames() override;
- ///===== XTypeProvider
===================================================
-
- /// returns the possible types
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes() override;
-
- /** Returns an implementation id.
- */
- virtual css::uno::Sequence<sal_Int8> SAL_CALL
- getImplementationId() override;
-
///===== IAccessibleViewForwarder
========================================
/** Returns the area of the underlying document that is visible in the
