sc/source/ui/Accessibility/AccessibleContextBase.cxx | 10 +++----
sc/source/ui/inc/AccessibleContextBase.hxx | 6 ++--
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 19 --------------
sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 5 ---
4 files changed, 8 insertions(+), 32 deletions(-)
New commits:
commit 889796512ca6369375a90f335ee0d7305af9ca5b
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Apr 7 13:25:05 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Apr 8 17:13:24 2025 +0200
sc a11y: Use non-const methods instead of const_casting
Change-Id: I116f0601d916b7cecfab3b17f044a2576e33e584
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183832
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 7598ac4a9d0b..03b4b16a7fe3 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -428,27 +428,27 @@ OUString ScAccessibleContextBase::createAccessibleName()
return OUString();
}
-void ScAccessibleContextBase::CommitChange(const AccessibleEventObject&
rEvent) const
+void ScAccessibleContextBase::CommitChange(const AccessibleEventObject& rEvent)
{
if (mnClientId)
comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent );
}
-void ScAccessibleContextBase::CommitFocusGained() const
+void ScAccessibleContextBase::CommitFocusGained()
{
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::STATE_CHANGED;
- aEvent.Source = uno::Reference< XAccessibleContext
>(const_cast<ScAccessibleContextBase*>(this));
+ aEvent.Source = uno::Reference<XAccessibleContext>(this);
aEvent.NewValue <<= AccessibleStateType::FOCUSED;
CommitChange(aEvent);
}
-void ScAccessibleContextBase::CommitFocusLost() const
+void ScAccessibleContextBase::CommitFocusLost()
{
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::STATE_CHANGED;
- aEvent.Source = uno::Reference< XAccessibleContext
>(const_cast<ScAccessibleContextBase*>(this));
+ aEvent.Source = uno::Reference<XAccessibleContext>(this);
aEvent.OldValue <<= AccessibleStateType::FOCUSED;
CommitChange(aEvent);
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx
b/sc/source/ui/inc/AccessibleContextBase.hxx
index 50172f232626..24bbc903d835 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -195,7 +195,7 @@ protected:
public:
/// Calls all Listener to tell they the change.
void
- CommitChange(const css::accessibility::AccessibleEventObject& rEvent)
const;
+ CommitChange(const css::accessibility::AccessibleEventObject& rEvent);
/// Use this method to set initial Name without notification
void SetName(const OUString& rName) { msName = rName; }
@@ -207,10 +207,10 @@ public:
protected:
/// Calls all FocusListener to tell they that the focus is gained.
- void CommitFocusGained() const;
+ void CommitFocusGained();
/// Calls all FocusListener to tell they that the focus is lost.
- void CommitFocusLost() const;
+ void CommitFocusLost();
bool IsDefunc() const { return rBHelper.bDisposed; }
commit 5e702a6c8b0cfdd3da5a06cc61ab3242c4bebd08
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Apr 7 12:25:02 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Apr 8 17:13:16 2025 +0200
sd a11y: Drop custom XTypeProvider::getTypes impl
I see no reason to override the base class implementation
ImplInheritanceHelper::getTypes here.
Change-Id: I2bdd29d49df7b5ab0d95791784e1e4ebe9555c57
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183831
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 21a1e32dd361..c9e2fa848e6a 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -373,25 +373,6 @@ css::uno::Sequence< OUString> SAL_CALL
return AccessibleContextBase::getSupportedServiceNames ();
}
-//===== XTypeProvider =======================================================
-
-css::uno::Sequence< css::uno::Type> SAL_CALL
- AccessibleDocumentViewBase::getTypes()
-{
- ThrowIfDisposed ();
-
- return comphelper::concatSequences(
- // Get list of types from the context base implementation, ...
- AccessibleContextBase::getTypes(),
- // ...and add the additional type for the component, ...
- css::uno::Sequence {
- cppu::UnoType<lang::XEventListener>::get(),
- cppu::UnoType<beans::XPropertyChangeListener>::get(),
- cppu::UnoType<awt::XWindowListener>::get(),
- cppu::UnoType<awt::XFocusListener>::get(),
- cppu::UnoType<XAccessibleEventBroadcaster>::get() });
-}
-
void AccessibleDocumentViewBase::impl_dispose()
{
// Unregister from VCL Window.
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index 445fa9cf1d93..a3df91a41fc7 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -177,11 +177,6 @@ public:
virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames() override;
- //===== XTypeProvider ===================================================
-
- virtual css::uno::Sequence< css::uno::Type> SAL_CALL
- getTypes() override;
-
//===== lang::XEventListener ============================================
virtual void SAL_CALL
