include/comphelper/OAccessible.hxx | 6 +-----
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 12 ++++++------
sc/source/ui/inc/AccessibleEditObject.hxx | 4 ++--
3 files changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 6e56cacf27479b184abef3e1f36f7e333f7b8556
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Aug 14 19:05:15 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Aug 15 06:48:09 2025 +0200
sc a11y: Pass OAccessible for ScAccessibleEditObject parent
Use a more concrete type instead of the abstract XAccessible
UNO interface.
Change-Id: Ica4dcbf474ebb4918ed4ca77add3bfa7af28cf45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189631
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 8f241c3cfefb..75558b5820ea 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,
+ScAccessibleEditObject::ScAccessibleEditObject(const
rtl::Reference<comphelper::OAccessible>& rpParent,
EditView* pEditView,
vcl::Window* pWin,
const OUString& rName, const
OUString& rDescription,
EditObjectType eObjectType)
- : ImplInheritanceHelper(rxParent, AccessibleRole::TEXT_FRAME)
+ : ImplInheritanceHelper(rpParent, AccessibleRole::TEXT_FRAME)
, mpEditView(pEditView)
, mpWindow(pWin)
, mpTextWnd(nullptr)
@@ -66,7 +66,7 @@ ScAccessibleEditObject::ScAccessibleEditObject(const
uno::Reference<XAccessible>
, mbHasFocus(false)
, m_pScDoc(nullptr)
{
- InitAcc(rxParent, pEditView, rName, rDescription);
+ InitAcc(rpParent, pEditView, rName, rDescription);
}
ScAccessibleEditObject::ScAccessibleEditObject(EditObjectType eObjectType)
@@ -81,12 +81,12 @@
ScAccessibleEditObject::ScAccessibleEditObject(EditObjectType eObjectType)
}
void ScAccessibleEditObject::InitAcc(
- const uno::Reference<XAccessible>& rxParent,
+ const rtl::Reference<comphelper::OAccessible>& rpParent,
EditView* pEditView,
const OUString& rName,
const OUString& rDescription)
{
- SetParent(rxParent);
+ SetParent(rpParent);
mpEditView = pEditView;
CreateTextHelper();
@@ -94,7 +94,7 @@ void ScAccessibleEditObject::InitAcc(
SetDescription(rDescription);
if( meObjectType == CellInEditMode)
{
- const ScAccessibleDocument *pAccDoc =
static_cast<ScAccessibleDocument*>(rxParent.get());
+ const ScAccessibleDocument* pAccDoc =
static_cast<ScAccessibleDocument*>(rpParent.get());
if (pAccDoc)
{
m_pScDoc = pAccDoc->GetDocument();
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx
b/sc/source/ui/inc/AccessibleEditObject.hxx
index d672dd85ef07..740fce1b5c20 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -53,12 +53,12 @@ public:
};
ScAccessibleEditObject(
- const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
+ const rtl::Reference<comphelper::OAccessible>& rpParent,
EditView* pEditView, vcl::Window* pWin, const OUString& rName,
const OUString& rDescription, EditObjectType eObjectType);
void InitAcc(
- const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
+ const rtl::Reference<comphelper::OAccessible>& rpParent,
EditView* pEditView, const OUString& rName, const OUString&
rDescription);
protected:
commit 670c0e59875297a1d6e1db40d1d824868eba1d6b
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Aug 14 19:01:16 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Aug 15 06:48:01 2025 +0200
comphelper a11y: Use #pragma once
Change-Id: I4ada6a08d3b7b5a73266db462d40c3be332705a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189630
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/include/comphelper/OAccessible.hxx
b/include/comphelper/OAccessible.hxx
index 5eacad576656..8915f93f605c 100644
--- a/include/comphelper/OAccessible.hxx
+++ b/include/comphelper/OAccessible.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COMPHELPER_ACCESSIBLECOMPONENTHELPER_HXX
-#define INCLUDED_COMPHELPER_ACCESSIBLECOMPONENTHELPER_HXX
+#pragma once
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleContext2.hpp>
@@ -167,7 +166,4 @@ public:
} // namespace comphelper
-#endif // INCLUDED_COMPHELPER_ACCESSIBLECOMPONENTHELPER_HXX
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
