sd/Library_sdui.mk | 3
sd/source/console/AccessibleFocusManager.cxx | 84 +
sd/source/console/AccessibleFocusManager.hxx | 52
sd/source/console/AccessibleObject.cxx | 528 ++++++++++
sd/source/console/AccessibleObject.hxx | 174 +++
sd/source/console/AccessibleParagraph.cxx | 429 ++++++++
sd/source/console/AccessibleParagraph.hxx | 119 ++
sd/source/console/PresenterAccessibility.cxx | 1417 +--------------------------
sd/source/console/PresenterAccessibility.hxx | 5
solenv/clang-format/excludelist | 6
10 files changed, 1488 insertions(+), 1329 deletions(-)
New commits:
commit 27bff3be074e9a31b199cfbac52c3a992ea736a3
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 14:59:01 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 23:01:10 2025 +0100
sd presenter a11y: Move AccessibleParagraph to own header/source
Move the AccessibleParagraph class outside of the
PresenterAccessible class and to its own header and
source file.
Move the AccessibleRelationSet helper class only used
by AccessibleParagraph to its source file, too.
Change-Id: Ie412d29cd17d192d3ca71a8a178c9b7607a8bec3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182323
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 7dc9d56d92ef..8c4b97954a10 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
sd/source/ui/dlg/BulletAndPositionDlg \
sd/source/console/AccessibleFocusManager \
sd/source/console/AccessibleObject \
+ sd/source/console/AccessibleParagraph \
sd/source/console/PresenterAccessibility \
sd/source/console/PresenterBitmapContainer \
sd/source/console/PresenterButton \
diff --git a/sd/source/console/AccessibleParagraph.cxx
b/sd/source/console/AccessibleParagraph.cxx
new file mode 100644
index 000000000000..a4530e6abfd2
--- /dev/null
+++ b/sd/source/console/AccessibleParagraph.cxx
@@ -0,0 +1,429 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * 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 "AccessibleParagraph.hxx"
+
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+
+
+namespace {
+
+//===== AccessibleRelationSet =================================================
+
+typedef ::cppu::WeakComponentImplHelper <
+ css::accessibility::XAccessibleRelationSet
+ > AccessibleRelationSetInterfaceBase;
+
+class AccessibleRelationSet
+ : public ::cppu::BaseMutex,
+ public AccessibleRelationSetInterfaceBase
+{
+public:
+ AccessibleRelationSet();
+
+ void AddRelation (
+ const AccessibleRelationType eRelationType,
+ const Reference<XAccessible>& rxObject);
+
+ //----- XAccessibleRelationSet --------------------------------------------
+
+ virtual sal_Int32 SAL_CALL getRelationCount() override;
+
+ virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex)
override;
+
+ virtual sal_Bool SAL_CALL
containsRelation(css::accessibility::AccessibleRelationType eRelationType)
override;
+
+ virtual AccessibleRelation SAL_CALL
getRelationByType(AccessibleRelationType eRelationType) override;
+
+private:
+ ::std::vector<AccessibleRelation> maRelations;
+};
+
+
+//===== AccessibleRelationSet =================================================
+
+AccessibleRelationSet::AccessibleRelationSet()
+ : AccessibleRelationSetInterfaceBase(m_aMutex)
+{
+}
+
+void AccessibleRelationSet::AddRelation (
+ const AccessibleRelationType eRelationType,
+ const Reference<XAccessible>& rxObject)
+{
+ maRelations.emplace_back();
+ maRelations.back().RelationType = eRelationType;
+ maRelations.back().TargetSet = { rxObject };
+}
+
+//----- XAccessibleRelationSet ------------------------------------------------
+
+sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount()
+{
+ return maRelations.size();
+}
+
+AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32
nIndex)
+{
+ if (nIndex<0 && o3tl::make_unsigned(nIndex)>=maRelations.size())
+ return AccessibleRelation();
+ else
+ return maRelations[nIndex];
+}
+
+sal_Bool SAL_CALL
AccessibleRelationSet::containsRelation(AccessibleRelationType eRelationType)
+{
+ return std::any_of(maRelations.begin(), maRelations.end(),
+ [eRelationType](const AccessibleRelation& rRelation) {
return rRelation.RelationType == eRelationType; });
+}
+
+AccessibleRelation SAL_CALL
AccessibleRelationSet::getRelationByType(AccessibleRelationType eRelationType)
+{
+ auto iRelation = std::find_if(maRelations.begin(), maRelations.end(),
+ [eRelationType](const AccessibleRelation&
rRelation) { return rRelation.RelationType == eRelationType; });
+ if (iRelation != maRelations.end())
+ return *iRelation;
+ return AccessibleRelation();
+}
+
+}
+
+
+AccessibleParagraph::AccessibleParagraph(
+ const OUString& rsName,
+ SharedPresenterTextParagraph xParagraph,
+ const sal_Int32 nParagraphIndex)
+ : PresenterAccessibleParagraphInterfaceBase(AccessibleRole::PARAGRAPH,
rsName),
+ mpParagraph(std::move(xParagraph)),
+ mnParagraphIndex(nParagraphIndex)
+{
+}
+
+//----- XAccessibleContext ----------------------------------------------------
+
+Reference<XAccessibleRelationSet> SAL_CALL
+ AccessibleParagraph::getAccessibleRelationSet()
+{
+ ThrowIfDisposed();
+
+ rtl::Reference<AccessibleRelationSet> pSet (new AccessibleRelationSet);
+
+ if (mxParentAccessible.is())
+ {
+ Reference<XAccessibleContext> xParentContext
(mxParentAccessible->getAccessibleContext());
+ if (xParentContext.is())
+ {
+ if (mnParagraphIndex>0)
+ pSet->AddRelation(
+ AccessibleRelationType_CONTENT_FLOWS_FROM,
+ xParentContext->getAccessibleChild(mnParagraphIndex-1));
+
+ if (mnParagraphIndex<xParentContext->getAccessibleChildCount()-1)
+ pSet->AddRelation(
+ AccessibleRelationType_CONTENT_FLOWS_TO,
+ xParentContext->getAccessibleChild(mnParagraphIndex+1));
+ }
+ }
+
+ return pSet;
+}
+
+//----- XAccessibleText -------------------------------------------------------
+
+sal_Int32 SAL_CALL AccessibleParagraph::getCaretPosition()
+{
+ ThrowIfDisposed();
+
+ sal_Int32 nPosition (-1);
+ if (mpParagraph)
+ nPosition = mpParagraph->GetCaretPosition();
+
+ return nPosition;
+}
+
+sal_Bool SAL_CALL AccessibleParagraph::setCaretPosition (sal_Int32 nIndex)
+{
+ ThrowIfDisposed();
+
+ if (mpParagraph)
+ {
+ mpParagraph->SetCaretPosition(nIndex);
+ return true;
+ }
+ else
+ return false;
+}
+
+sal_Unicode SAL_CALL AccessibleParagraph::getCharacter (sal_Int32 nIndex)
+{
+ ThrowIfDisposed();
+
+ if (!mpParagraph)
+ throw lang::IndexOutOfBoundsException(u"no text support in current
mode"_ustr, static_cast<uno::XWeak*>(this));
+ return mpParagraph->GetCharacter(nIndex);
+}
+
+Sequence<css::beans::PropertyValue> SAL_CALL
+ AccessibleParagraph::getCharacterAttributes (
+ ::sal_Int32 nIndex,
+ const css::uno::Sequence<OUString>& rRequestedAttributes)
+{
+ ThrowIfDisposed();
+
+#if OSL_DEBUG_LEVEL > 0
+ SAL_INFO( "sdext.presenter", __func__ << " at " << this << ", " << nIndex
<< " returns empty set" );
+ for (sal_Int32 nAttributeIndex(0),
nAttributeCount(rRequestedAttributes.getLength());
+ nAttributeIndex < nAttributeCount;
+ ++nAttributeIndex)
+ {
+ SAL_INFO( "sdext.presenter",
+ " requested attribute " << nAttributeIndex << " is " <<
rRequestedAttributes[nAttributeIndex] );
+ }
+#else
+ (void)nIndex;
+ (void)rRequestedAttributes;
+#endif
+
+ // Character properties are not supported.
+ return Sequence<css::beans::PropertyValue>();
+}
+
+awt::Rectangle SAL_CALL AccessibleParagraph::getCharacterBounds (
+ sal_Int32 nIndex)
+{
+ ThrowIfDisposed();
+
+ awt::Rectangle aCharacterBox;
+ if (nIndex < 0)
+ {
+ throw lang::IndexOutOfBoundsException(u"invalid text index"_ustr,
static_cast<uno::XWeak*>(this));
+ }
+ else if (mpParagraph)
+ {
+ aCharacterBox = mpParagraph->GetCharacterBounds(nIndex, false);
+ // Convert coordinates relative to the window origin into absolute
+ // screen coordinates.
+ const awt::Point aWindowLocationOnScreen (getLocationOnScreen());
+ aCharacterBox.X += aWindowLocationOnScreen.X;
+ aCharacterBox.Y += aWindowLocationOnScreen.Y;
+ }
+ else
+ {
+ throw lang::IndexOutOfBoundsException(u"no text support in current
mode"_ustr, static_cast<uno::XWeak*>(this));
+ }
+
+ return aCharacterBox;
+}
+
+sal_Int32 SAL_CALL AccessibleParagraph::getCharacterCount()
+{
+ ThrowIfDisposed();
+
+ sal_Int32 nCount (0);
+ if (mpParagraph)
+ nCount = mpParagraph->GetCharacterCount();
+
+ return nCount;
+}
+
+sal_Int32 SAL_CALL AccessibleParagraph::getIndexAtPoint (
+ const css::awt::Point& )
+{
+ ThrowIfDisposed();
+ return -1;
+}
+
+OUString SAL_CALL AccessibleParagraph::getSelectedText()
+{
+ ThrowIfDisposed();
+
+ return getTextRange(getSelectionStart(), getSelectionEnd());
+}
+
+sal_Int32 SAL_CALL AccessibleParagraph::getSelectionStart()
+{
+ ThrowIfDisposed();
+
+ return getCaretPosition();
+}
+
+sal_Int32 SAL_CALL AccessibleParagraph::getSelectionEnd()
+{
+ ThrowIfDisposed();
+
+ return getCaretPosition();
+}
+
+sal_Bool SAL_CALL AccessibleParagraph::setSelection (
+ sal_Int32 nStartIndex,
+ sal_Int32)
+{
+ ThrowIfDisposed();
+
+ return setCaretPosition(nStartIndex);
+}
+
+OUString SAL_CALL AccessibleParagraph::getText()
+{
+ ThrowIfDisposed();
+
+ OUString sText;
+ if (mpParagraph)
+ sText = mpParagraph->GetText();
+
+ return sText;
+}
+
+OUString SAL_CALL AccessibleParagraph::getTextRange (
+ sal_Int32 nLocalStartIndex,
+ sal_Int32 nLocalEndIndex)
+{
+ ThrowIfDisposed();
+
+ OUString sText;
+ if (mpParagraph)
+ {
+ const TextSegment aSegment (
+ mpParagraph->CreateTextSegment(nLocalStartIndex, nLocalEndIndex));
+ sText = aSegment.SegmentText;
+ }
+
+ return sText;
+}
+
+TextSegment SAL_CALL AccessibleParagraph::getTextAtIndex (
+ sal_Int32 nLocalCharacterIndex,
+ sal_Int16 nTextType)
+{
+ ThrowIfDisposed();
+
+ TextSegment aSegment;
+ if (mpParagraph)
+ aSegment = mpParagraph->GetTextSegment(0, nLocalCharacterIndex,
nTextType);
+
+ return aSegment;
+}
+
+TextSegment SAL_CALL AccessibleParagraph::getTextBeforeIndex (
+ sal_Int32 nLocalCharacterIndex,
+ sal_Int16 nTextType)
+{
+ ThrowIfDisposed();
+
+ TextSegment aSegment;
+ if (mpParagraph)
+ aSegment = mpParagraph->GetTextSegment(-1, nLocalCharacterIndex,
nTextType);
+
+ return aSegment;
+}
+
+TextSegment SAL_CALL AccessibleParagraph::getTextBehindIndex (
+ sal_Int32 nLocalCharacterIndex,
+ sal_Int16 nTextType)
+{
+ ThrowIfDisposed();
+
+ TextSegment aSegment;
+ if (mpParagraph)
+ aSegment = mpParagraph->GetTextSegment(+1, nLocalCharacterIndex,
nTextType);
+
+ return aSegment;
+}
+
+sal_Bool SAL_CALL AccessibleParagraph::copyText (
+ sal_Int32,
+ sal_Int32)
+{
+ ThrowIfDisposed();
+
+ // Return false because copying to clipboard is not supported.
+ // It IS supported in the notes view. There is no need to duplicate
+ // this here.
+ return false;
+}
+
+sal_Bool SAL_CALL AccessibleParagraph::scrollSubstringTo(
+ sal_Int32,
+ sal_Int32,
+ AccessibleScrollType)
+{
+ return false;
+}
+
+//----- protected -------------------------------------------------------------
+
+awt::Point AccessibleParagraph::GetRelativeLocation()
+{
+ awt::Point aLocation (AccessibleObject::GetRelativeLocation());
+ if (mpParagraph)
+ {
+ const awt::Point aParagraphLocation
(mpParagraph->GetRelativeLocation());
+ aLocation.X += aParagraphLocation.X;
+ aLocation.Y += aParagraphLocation.Y;
+ }
+
+ return aLocation;
+}
+
+awt::Size AccessibleParagraph::GetSize()
+{
+ if (mpParagraph)
+ return mpParagraph->GetSize();
+ else
+ return AccessibleObject::GetSize();
+}
+
+awt::Point AccessibleParagraph::GetAbsoluteParentLocation()
+{
+ if (mxParentAccessible.is())
+ {
+ Reference<XAccessibleContext> xParentContext =
+ mxParentAccessible->getAccessibleContext();
+ if (xParentContext.is())
+ {
+ Reference<XAccessibleComponent> xGrandParentComponent(
+ xParentContext->getAccessibleParent(), UNO_QUERY);
+ if (xGrandParentComponent.is())
+ return xGrandParentComponent->getLocationOnScreen();
+ }
+ }
+
+ return awt::Point();
+}
+
+bool AccessibleParagraph::GetWindowState (const sal_Int64 nType) const
+{
+ switch (nType)
+ {
+ case AccessibleStateType::EDITABLE:
+ return bool(mpParagraph);
+
+ case AccessibleStateType::ACTIVE:
+ return true;
+
+ default:
+ return AccessibleObject::GetWindowState(nType);
+ }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sd/source/console/AccessibleParagraph.hxx
b/sd/source/console/AccessibleParagraph.hxx
new file mode 100644
index 000000000000..68f15ced325f
--- /dev/null
+++ b/sd/source/console/AccessibleParagraph.hxx
@@ -0,0 +1,119 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * 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 "AccessibleObject.hxx"
+#include "PresenterTextView.hxx"
+
+#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleText.hpp>
+#include <cppuhelper/compbase.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace sdext::presenter;
+
+typedef ::cppu::ImplInheritanceHelper <
+ AccessibleObject,
+ css::accessibility::XAccessibleText
+ > PresenterAccessibleParagraphInterfaceBase;
+
+class AccessibleParagraph
+ : public PresenterAccessibleParagraphInterfaceBase
+{
+public:
+ AccessibleParagraph(
+ const OUString& rsName,
+ SharedPresenterTextParagraph pParagraph,
+ const sal_Int32 nParagraphIndex);
+
+ //----- XAccessibleContext ------------------------------------------------
+
+ virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet>
SAL_CALL
+ getAccessibleRelationSet() override;
+
+ //----- XAccessibleText ---------------------------------------------------
+
+ virtual sal_Int32 SAL_CALL getCaretPosition() override;
+
+ virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) override;
+
+ virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex) override;
+
+ virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL
+ getCharacterAttributes (
+ ::sal_Int32 nIndex,
+ const css::uno::Sequence<OUString>& rRequestedAttributes) override;
+
+ virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex)
override;
+
+ virtual sal_Int32 SAL_CALL getCharacterCount() override;
+
+ virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint)
override;
+
+ virtual OUString SAL_CALL getSelectedText() override;
+
+ virtual sal_Int32 SAL_CALL getSelectionStart() override;
+
+ virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+
+ virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32
nEndIndex) override;
+
+ virtual OUString SAL_CALL getText() override;
+
+ virtual OUString SAL_CALL getTextRange (
+ sal_Int32 nStartIndex,
+ sal_Int32 nEndIndex) override;
+
+ virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex (
+ sal_Int32 nIndex,
+ sal_Int16 nTextType) override;
+
+ virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex (
+ sal_Int32 nIndex,
+ sal_Int16 nTextType) override;
+
+ virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex (
+ sal_Int32 nIndex,
+ sal_Int16 nTextType) override;
+
+ virtual sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32
nEndIndex) override;
+
+ virtual sal_Bool SAL_CALL scrollSubstringTo(
+ sal_Int32 nStartIndex,
+ sal_Int32 nEndIndex,
+ css::accessibility::AccessibleScrollType aScrollType) override;
+
+protected:
+ virtual awt::Point GetRelativeLocation() override;
+ virtual awt::Size GetSize() override;
+ virtual awt::Point GetAbsoluteParentLocation() override;
+ virtual bool GetWindowState (const sal_Int64 nType) const override;
+
+private:
+ SharedPresenterTextParagraph mpParagraph;
+ const sal_Int32 mnParagraphIndex;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sd/source/console/PresenterAccessibility.cxx
b/sd/source/console/PresenterAccessibility.cxx
index a4e831d90b12..abc593f5b268 100644
--- a/sd/source/console/PresenterAccessibility.cxx
+++ b/sd/source/console/PresenterAccessibility.cxx
@@ -56,126 +56,6 @@ namespace sdext::presenter {
namespace {
-//===== AccessibleRelationSet =================================================
-
-typedef ::cppu::WeakComponentImplHelper <
- css::accessibility::XAccessibleRelationSet
- > AccessibleRelationSetInterfaceBase;
-
-class AccessibleRelationSet
- : public ::cppu::BaseMutex,
- public AccessibleRelationSetInterfaceBase
-{
-public:
- AccessibleRelationSet();
-
- void AddRelation (
- const AccessibleRelationType eRelationType,
- const Reference<XAccessible>& rxObject);
-
- //----- XAccessibleRelationSet --------------------------------------------
-
- virtual sal_Int32 SAL_CALL getRelationCount() override;
-
- virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex)
override;
-
- virtual sal_Bool SAL_CALL
containsRelation(css::accessibility::AccessibleRelationType eRelationType)
override;
-
- virtual AccessibleRelation SAL_CALL
getRelationByType(AccessibleRelationType eRelationType) override;
-
-private:
- ::std::vector<AccessibleRelation> maRelations;
-};
-
-//===== PresenterAccessibleParagraph ==========================================
-
-typedef ::cppu::ImplInheritanceHelper <
- AccessibleObject,
- css::accessibility::XAccessibleText
- > PresenterAccessibleParagraphInterfaceBase;
-}
-
-class PresenterAccessible::AccessibleParagraph
- : public PresenterAccessibleParagraphInterfaceBase
-{
-public:
- AccessibleParagraph(
- const OUString& rsName,
- SharedPresenterTextParagraph pParagraph,
- const sal_Int32 nParagraphIndex);
-
- //----- XAccessibleContext ------------------------------------------------
-
- virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet>
SAL_CALL
- getAccessibleRelationSet() override;
-
- //----- XAccessibleText ---------------------------------------------------
-
- virtual sal_Int32 SAL_CALL getCaretPosition() override;
-
- virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) override;
-
- virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex) override;
-
- virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL
- getCharacterAttributes (
- ::sal_Int32 nIndex,
- const css::uno::Sequence<OUString>& rRequestedAttributes) override;
-
- virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex)
override;
-
- virtual sal_Int32 SAL_CALL getCharacterCount() override;
-
- virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint)
override;
-
- virtual OUString SAL_CALL getSelectedText() override;
-
- virtual sal_Int32 SAL_CALL getSelectionStart() override;
-
- virtual sal_Int32 SAL_CALL getSelectionEnd() override;
-
- virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32
nEndIndex) override;
-
- virtual OUString SAL_CALL getText() override;
-
- virtual OUString SAL_CALL getTextRange (
- sal_Int32 nStartIndex,
- sal_Int32 nEndIndex) override;
-
- virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex (
- sal_Int32 nIndex,
- sal_Int16 nTextType) override;
-
- virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex (
- sal_Int32 nIndex,
- sal_Int16 nTextType) override;
-
- virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex (
- sal_Int32 nIndex,
- sal_Int16 nTextType) override;
-
- virtual sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32
nEndIndex) override;
-
- virtual sal_Bool SAL_CALL scrollSubstringTo(
- sal_Int32 nStartIndex,
- sal_Int32 nEndIndex,
- css::accessibility::AccessibleScrollType aScrollType) override;
-
-protected:
- virtual awt::Point GetRelativeLocation() override;
- virtual awt::Size GetSize() override;
- virtual awt::Point GetAbsoluteParentLocation() override;
- virtual bool GetWindowState (const sal_Int64 nType) const override;
-
-private:
- SharedPresenterTextParagraph mpParagraph;
- const sal_Int32 mnParagraphIndex;
-};
-
-//===== AccessibleConsole =====================================================
-
-namespace {
-
class AccessibleConsole
{
public:
@@ -506,372 +386,6 @@ void SAL_CALL PresenterAccessible::initialize (const
css::uno::Sequence<css::uno
}
}
-
-//===== AccessibleRelationSet =================================================
-
-AccessibleRelationSet::AccessibleRelationSet()
- : AccessibleRelationSetInterfaceBase(m_aMutex)
-{
-}
-
-void AccessibleRelationSet::AddRelation (
- const AccessibleRelationType eRelationType,
- const Reference<XAccessible>& rxObject)
-{
- maRelations.emplace_back();
- maRelations.back().RelationType = eRelationType;
- maRelations.back().TargetSet = { rxObject };
-}
-
-//----- XAccessibleRelationSet ------------------------------------------------
-
-sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount()
-{
- return maRelations.size();
-}
-
-AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32
nIndex)
-{
- if (nIndex<0 && o3tl::make_unsigned(nIndex)>=maRelations.size())
- return AccessibleRelation();
- else
- return maRelations[nIndex];
-}
-
-sal_Bool SAL_CALL
AccessibleRelationSet::containsRelation(AccessibleRelationType eRelationType)
-{
- return std::any_of(maRelations.begin(), maRelations.end(),
- [eRelationType](const AccessibleRelation& rRelation) { return
rRelation.RelationType == eRelationType; });
-}
-
-AccessibleRelation SAL_CALL
AccessibleRelationSet::getRelationByType(AccessibleRelationType eRelationType)
-{
- auto iRelation = std::find_if(maRelations.begin(), maRelations.end(),
- [eRelationType](const AccessibleRelation& rRelation) { return
rRelation.RelationType == eRelationType; });
- if (iRelation != maRelations.end())
- return *iRelation;
- return AccessibleRelation();
-}
-
-//===== PresenterAccessible::AccessibleParagraph ==============================
-
-PresenterAccessible::AccessibleParagraph::AccessibleParagraph(
- const OUString& rsName,
- SharedPresenterTextParagraph xParagraph,
- const sal_Int32 nParagraphIndex)
- : PresenterAccessibleParagraphInterfaceBase(AccessibleRole::PARAGRAPH,
rsName),
- mpParagraph(std::move(xParagraph)),
- mnParagraphIndex(nParagraphIndex)
-{
-}
-
-//----- XAccessibleContext ----------------------------------------------------
-
-Reference<XAccessibleRelationSet> SAL_CALL
- PresenterAccessible::AccessibleParagraph::getAccessibleRelationSet()
-{
- ThrowIfDisposed();
-
- rtl::Reference<AccessibleRelationSet> pSet (new AccessibleRelationSet);
-
- if (mxParentAccessible.is())
- {
- Reference<XAccessibleContext> xParentContext
(mxParentAccessible->getAccessibleContext());
- if (xParentContext.is())
- {
- if (mnParagraphIndex>0)
- pSet->AddRelation(
- AccessibleRelationType_CONTENT_FLOWS_FROM,
- xParentContext->getAccessibleChild(mnParagraphIndex-1));
-
- if (mnParagraphIndex<xParentContext->getAccessibleChildCount()-1)
- pSet->AddRelation(
- AccessibleRelationType_CONTENT_FLOWS_TO,
- xParentContext->getAccessibleChild(mnParagraphIndex+1));
- }
- }
-
- return pSet;
-}
-
-//----- XAccessibleText -------------------------------------------------------
-
-sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition()
-{
- ThrowIfDisposed();
-
- sal_Int32 nPosition (-1);
- if (mpParagraph)
- nPosition = mpParagraph->GetCaretPosition();
-
- return nPosition;
-}
-
-sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition
(sal_Int32 nIndex)
-{
- ThrowIfDisposed();
-
- if (mpParagraph)
- {
- mpParagraph->SetCaretPosition(nIndex);
- return true;
- }
- else
- return false;
-}
-
-sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter
(sal_Int32 nIndex)
-{
- ThrowIfDisposed();
-
- if (!mpParagraph)
- throw lang::IndexOutOfBoundsException(u"no text support in current
mode"_ustr, static_cast<uno::XWeak*>(this));
- return mpParagraph->GetCharacter(nIndex);
-}
-
-Sequence<css::beans::PropertyValue> SAL_CALL
- PresenterAccessible::AccessibleParagraph::getCharacterAttributes (
- ::sal_Int32 nIndex,
- const css::uno::Sequence<OUString>& rRequestedAttributes)
-{
- ThrowIfDisposed();
-
-#if OSL_DEBUG_LEVEL > 0
- SAL_INFO( "sdext.presenter", __func__ << " at " << this << ", " << nIndex
<< " returns empty set" );
- for (sal_Int32 nAttributeIndex(0),
nAttributeCount(rRequestedAttributes.getLength());
- nAttributeIndex < nAttributeCount;
- ++nAttributeIndex)
- {
- SAL_INFO( "sdext.presenter",
- " requested attribute " << nAttributeIndex << " is " <<
rRequestedAttributes[nAttributeIndex] );
- }
-#else
- (void)nIndex;
- (void)rRequestedAttributes;
-#endif
-
- // Character properties are not supported.
- return Sequence<css::beans::PropertyValue>();
-}
-
-awt::Rectangle SAL_CALL
PresenterAccessible::AccessibleParagraph::getCharacterBounds (
- sal_Int32 nIndex)
-{
- ThrowIfDisposed();
-
- awt::Rectangle aCharacterBox;
- if (nIndex < 0)
- {
- throw lang::IndexOutOfBoundsException(u"invalid text index"_ustr,
static_cast<uno::XWeak*>(this));
- }
- else if (mpParagraph)
- {
- aCharacterBox = mpParagraph->GetCharacterBounds(nIndex, false);
- // Convert coordinates relative to the window origin into absolute
- // screen coordinates.
- const awt::Point aWindowLocationOnScreen (getLocationOnScreen());
- aCharacterBox.X += aWindowLocationOnScreen.X;
- aCharacterBox.Y += aWindowLocationOnScreen.Y;
- }
- else
- {
- throw lang::IndexOutOfBoundsException(u"no text support in current
mode"_ustr, static_cast<uno::XWeak*>(this));
- }
-
- return aCharacterBox;
-}
-
-sal_Int32 SAL_CALL
PresenterAccessible::AccessibleParagraph::getCharacterCount()
-{
- ThrowIfDisposed();
-
- sal_Int32 nCount (0);
- if (mpParagraph)
- nCount = mpParagraph->GetCharacterCount();
-
- return nCount;
-}
-
-sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
- const css::awt::Point& )
-{
- ThrowIfDisposed();
- return -1;
-}
-
-OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText()
-{
- ThrowIfDisposed();
-
- return getTextRange(getSelectionStart(), getSelectionEnd());
-}
-
-sal_Int32 SAL_CALL
PresenterAccessible::AccessibleParagraph::getSelectionStart()
-{
- ThrowIfDisposed();
-
- return getCaretPosition();
-}
-
-sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd()
-{
- ThrowIfDisposed();
-
- return getCaretPosition();
-}
-
-sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
- sal_Int32 nStartIndex,
- sal_Int32)
-{
- ThrowIfDisposed();
-
- return setCaretPosition(nStartIndex);
-}
-
-OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText()
-{
- ThrowIfDisposed();
-
- OUString sText;
- if (mpParagraph)
- sText = mpParagraph->GetText();
-
- return sText;
-}
-
-OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange (
- sal_Int32 nLocalStartIndex,
- sal_Int32 nLocalEndIndex)
-{
- ThrowIfDisposed();
-
- OUString sText;
- if (mpParagraph)
- {
- const TextSegment aSegment (
- mpParagraph->CreateTextSegment(nLocalStartIndex, nLocalEndIndex));
- sText = aSegment.SegmentText;
- }
-
- return sText;
-}
-
-TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex (
- sal_Int32 nLocalCharacterIndex,
- sal_Int16 nTextType)
-{
- ThrowIfDisposed();
-
- TextSegment aSegment;
- if (mpParagraph)
- aSegment = mpParagraph->GetTextSegment(0, nLocalCharacterIndex,
nTextType);
-
- return aSegment;
-}
-
-TextSegment SAL_CALL
PresenterAccessible::AccessibleParagraph::getTextBeforeIndex (
- sal_Int32 nLocalCharacterIndex,
- sal_Int16 nTextType)
-{
- ThrowIfDisposed();
-
- TextSegment aSegment;
- if (mpParagraph)
- aSegment = mpParagraph->GetTextSegment(-1, nLocalCharacterIndex,
nTextType);
-
- return aSegment;
-}
-
-TextSegment SAL_CALL
PresenterAccessible::AccessibleParagraph::getTextBehindIndex (
- sal_Int32 nLocalCharacterIndex,
- sal_Int16 nTextType)
-{
- ThrowIfDisposed();
-
- TextSegment aSegment;
- if (mpParagraph)
- aSegment = mpParagraph->GetTextSegment(+1, nLocalCharacterIndex,
nTextType);
-
- return aSegment;
-}
-
-sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText (
- sal_Int32,
- sal_Int32)
-{
- ThrowIfDisposed();
-
- // Return false because copying to clipboard is not supported.
- // It IS supported in the notes view. There is no need to duplicate
- // this here.
- return false;
-}
-
-sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::scrollSubstringTo(
- sal_Int32,
- sal_Int32,
- AccessibleScrollType)
-{
- return false;
-}
-
-//----- protected -------------------------------------------------------------
-
-awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation()
-{
- awt::Point aLocation (AccessibleObject::GetRelativeLocation());
- if (mpParagraph)
- {
- const awt::Point aParagraphLocation
(mpParagraph->GetRelativeLocation());
- aLocation.X += aParagraphLocation.X;
- aLocation.Y += aParagraphLocation.Y;
- }
-
- return aLocation;
-}
-
-awt::Size PresenterAccessible::AccessibleParagraph::GetSize()
-{
- if (mpParagraph)
- return mpParagraph->GetSize();
- else
- return AccessibleObject::GetSize();
-}
-
-awt::Point
PresenterAccessible::AccessibleParagraph::GetAbsoluteParentLocation()
-{
- if (mxParentAccessible.is())
- {
- Reference<XAccessibleContext> xParentContext =
- mxParentAccessible->getAccessibleContext();
- if (xParentContext.is())
- {
- Reference<XAccessibleComponent> xGrandParentComponent(
- xParentContext->getAccessibleParent(), UNO_QUERY);
- if (xGrandParentComponent.is())
- return xGrandParentComponent->getLocationOnScreen();
- }
- }
-
- return awt::Point();
-}
-
-bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int64
nType) const
-{
- switch (nType)
- {
- case AccessibleStateType::EDITABLE:
- return bool(mpParagraph);
-
- case AccessibleStateType::ACTIVE:
- return true;
-
- default:
- return AccessibleObject::GetWindowState(nType);
- }
-}
-
//===== AccessibleNotes =======================================================
AccessibleNotes::AccessibleNotes(const OUString& rsName)
@@ -928,8 +442,8 @@ void AccessibleNotes::SetTextView (
const sal_Int32 nParagraphCount (mpTextView->GetParagraphCount());
for (sal_Int32 nIndex=0; nIndex<nParagraphCount; ++nIndex)
{
- rtl::Reference<PresenterAccessible::AccessibleParagraph> pParagraph (
- new PresenterAccessible::AccessibleParagraph(
+ rtl::Reference<AccessibleParagraph> pParagraph (
+ new AccessibleParagraph(
"Paragraph"+OUString::number(nIndex),
rpTextView->GetParagraph(nIndex),
nIndex));
diff --git a/sd/source/console/PresenterAccessibility.hxx
b/sd/source/console/PresenterAccessibility.hxx
index ef33567dcc5e..6cadfaeba96f 100644
--- a/sd/source/console/PresenterAccessibility.hxx
+++ b/sd/source/console/PresenterAccessibility.hxx
@@ -20,6 +20,7 @@
#pragma once
#include "AccessibleObject.hxx"
+#include "AccessibleParagraph.hxx"
#include "PresenterPaneContainer.hxx"
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -80,7 +81,6 @@ public:
//----- XInitialization ---------------------------------------------------
virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>&
rArguments) override;
- class AccessibleParagraph;
private:
const css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 7e5ea4a4d633..fe2cf0f085d7 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -9257,6 +9257,8 @@ sd/source/console/AccessibleFocusManager.cxx
sd/source/console/AccessibleFocusManager.hxx
sd/source/console/AccessibleObject.cxx
sd/source/console/AccessibleObject.hxx
+sd/source/console/AccessibleParagraph.cxx
+sd/source/console/AccessibleParagraph.hxx
sd/source/console/PresenterAccessibility.cxx
sd/source/console/PresenterAccessibility.hxx
sd/source/console/PresenterBitmapContainer.cxx
commit bc35ec327f1ade9075232ebc77a466130aa3aa95
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 13:54:53 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 23:01:02 2025 +0100
sd presenter a11y: Move 2 classes to own .hxx/.cxx
Move the AccessibleFocusManager and
AccessibleObject classes to their own
header and source files, which makes it a little
easier to keep the overview.
AccessibleObject is now also no longer an inner
class of the PresenterAccessible class.
Change-Id: Ifdd2101fff7bee32567d737227dff514678d8f1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182322
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index d4cce6c2b54d..7dc9d56d92ef 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -91,6 +91,8 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
sd/source/ui/dlg/vectdlg \
sd/source/ui/dlg/PhotoAlbumDialog \
sd/source/ui/dlg/BulletAndPositionDlg \
+ sd/source/console/AccessibleFocusManager \
+ sd/source/console/AccessibleObject \
sd/source/console/PresenterAccessibility \
sd/source/console/PresenterBitmapContainer \
sd/source/console/PresenterButton \
diff --git a/sd/source/console/AccessibleFocusManager.cxx
b/sd/source/console/AccessibleFocusManager.cxx
new file mode 100644
index 000000000000..347e184b4c79
--- /dev/null
+++ b/sd/source/console/AccessibleFocusManager.cxx
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * 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 "AccessibleFocusManager.hxx"
+#include "AccessibleObject.hxx"
+
+std::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance;
+
+std::shared_ptr<AccessibleFocusManager> const &
AccessibleFocusManager::Instance()
+{
+ if ( ! mpInstance)
+ {
+ mpInstance.reset(new AccessibleFocusManager());
+ }
+ return mpInstance;
+}
+
+AccessibleFocusManager::AccessibleFocusManager()
+{
+}
+
+AccessibleFocusManager::~AccessibleFocusManager()
+{
+ // copy member to stack, then drop it - otherwise will get use-after-free
+ // from AccessibleObject::disposing(), it will call ~Reference *twice*
+ auto const temp(std::move(maFocusableObjects));
+ (void) temp;
+ m_isInDtor = true;
+}
+
+void AccessibleFocusManager::AddFocusableObject (
+ const ::rtl::Reference<AccessibleObject>& rpObject)
+{
+ OSL_ASSERT(rpObject.is());
+
OSL_ASSERT(::std::find(maFocusableObjects.begin(),maFocusableObjects.end(),
rpObject)==maFocusableObjects.end());
+
+ maFocusableObjects.push_back(rpObject);
+}
+
+void AccessibleFocusManager::RemoveFocusableObject (
+ const ::rtl::Reference<AccessibleObject>& rpObject)
+{
+ ::std::vector<rtl::Reference<AccessibleObject> >::iterator iObject (
+ ::std::find(maFocusableObjects.begin(),maFocusableObjects.end(),
rpObject));
+
+ if (iObject != maFocusableObjects.end())
+ maFocusableObjects.erase(iObject);
+ else
+ {
+ OSL_ASSERT(m_isInDtor); // in dtor, was removed already
+ }
+}
+
+void AccessibleFocusManager::FocusObject (
+ const ::rtl::Reference<AccessibleObject>& rpObject)
+{
+ // Remove the focus of any of the other focusable objects.
+ for (auto& rxObject : maFocusableObjects)
+ {
+ if (rxObject!=rpObject)
+ rxObject->SetIsFocused(false);
+ }
+
+ if (rpObject.is())
+ rpObject->SetIsFocused(true);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sd/source/console/AccessibleFocusManager.hxx
b/sd/source/console/AccessibleFocusManager.hxx
new file mode 100644
index 000000000000..cdfd24ba342b
--- /dev/null
+++ b/sd/source/console/AccessibleFocusManager.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * 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/ref.hxx>
+#include <memory>
+
+class AccessibleObject;
+
+//===== AccessibleFocusManager ================================================
+
+/** A singleton class that makes sure that only one accessibility object in
+ the PresenterConsole hierarchy has the focus.
+*/
+class AccessibleFocusManager
+{
+public:
+ static std::shared_ptr<AccessibleFocusManager> const & Instance();
+
+ void AddFocusableObject (const ::rtl::Reference<AccessibleObject>&
rpObject);
+ void RemoveFocusableObject (const ::rtl::Reference<AccessibleObject>&
rpObject);
+
+ void FocusObject (const ::rtl::Reference<AccessibleObject>& rpObject);
+
+ ~AccessibleFocusManager();
+
+private:
+ static std::shared_ptr<AccessibleFocusManager> mpInstance;
+ ::std::vector<rtl::Reference<AccessibleObject> > maFocusableObjects;
+ bool m_isInDtor = false;
+
+ AccessibleFocusManager();
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sd/source/console/AccessibleObject.cxx
b/sd/source/console/AccessibleObject.cxx
new file mode 100644
index 000000000000..a77712f63596
--- /dev/null
+++ b/sd/source/console/AccessibleObject.cxx
@@ -0,0 +1,528 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * 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 "AccessibleObject.hxx"
+#include "AccessibleFocusManager.hxx"
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+
+
+AccessibleObject::AccessibleObject(
+ const sal_Int16 nRole,
+ OUString sName)
+ : AccessibleObjectInterfaceBase(m_aMutex),
+ msName(std::move(sName)),
+ mnRole(nRole),
+ mnStateSet(0),
+ mbIsFocused(false)
+{
+}
+
+void AccessibleObject::LateInitialization()
+{
+ AccessibleFocusManager::Instance()->AddFocusableObject(this);
+}
+
+void AccessibleObject::SetWindow (
+ const Reference<awt::XWindow>& rxContentWindow,
+ const Reference<awt::XWindow>& rxBorderWindow)
+{
+ Reference<awt::XWindow2> xContentWindow (rxContentWindow, UNO_QUERY);
+
+ if (mxContentWindow.get() == xContentWindow.get())
+ return;
+
+ if (mxContentWindow.is())
+ {
+ mxContentWindow->removeWindowListener(this);
+ }
+
+ mxContentWindow = std::move(xContentWindow);
+ mxBorderWindow.set(rxBorderWindow, UNO_QUERY);
+
+ if (mxContentWindow.is())
+ {
+ mxContentWindow->addWindowListener(this);
+ }
+
+ UpdateStateSet();
+}
+
+void AccessibleObject::SetAccessibleParent (
+ const Reference<XAccessible>& rxAccessibleParent)
+{
+ mxParentAccessible = rxAccessibleParent;
+}
+
+void SAL_CALL AccessibleObject::disposing()
+{
+ AccessibleFocusManager::Instance()->RemoveFocusableObject(this);
+ SetWindow(nullptr, nullptr);
+}
+
+//----- XAccessible -------------------------------------------------------
+
+Reference<XAccessibleContext> SAL_CALL
+ AccessibleObject::getAccessibleContext()
+{
+ ThrowIfDisposed();
+
+ return this;
+}
+
+//----- XAccessibleContext ----------------------------------------------
+
+sal_Int64 SAL_CALL AccessibleObject::getAccessibleChildCount()
+{
+ ThrowIfDisposed();
+
+ return maChildren.size();
+}
+
+Reference<XAccessible> SAL_CALL
+ AccessibleObject::getAccessibleChild (sal_Int64 nIndex)
+{
+ ThrowIfDisposed();
+
+ if (nIndex<0 || o3tl::make_unsigned(nIndex)>=maChildren.size())
+ throw lang::IndexOutOfBoundsException(u"invalid child index"_ustr,
static_cast<uno::XWeak*>(this));
+
+ return maChildren[nIndex];
+}
+
+Reference<XAccessible> SAL_CALL
+ AccessibleObject::getAccessibleParent()
+{
+ ThrowIfDisposed();
+
+ return mxParentAccessible;
+}
+
+sal_Int64 SAL_CALL
+ AccessibleObject::getAccessibleIndexInParent()
+{
+ ThrowIfDisposed();
+
+ const Reference<XAccessible> xThis (this);
+ if (mxParentAccessible.is())
+ {
+ const Reference<XAccessibleContext> xContext
(mxParentAccessible->getAccessibleContext());
+ for (sal_Int64 nIndex = 0, nCount=xContext->getAccessibleChildCount();
+ nIndex<nCount;
+ ++nIndex)
+ {
+ if (xContext->getAccessibleChild(nIndex) == xThis)
+ return nIndex;
+ }
+ }
+
+ return 0;
+}
+
+sal_Int16 SAL_CALL
+ AccessibleObject::getAccessibleRole()
+{
+ ThrowIfDisposed();
+
+ return mnRole;
+}
+
+OUString SAL_CALL
+ AccessibleObject::getAccessibleDescription()
+{
+ ThrowIfDisposed();
+
+ return msName;
+}
+
+OUString SAL_CALL
+ AccessibleObject::getAccessibleName()
+{
+ ThrowIfDisposed();
+
+ return msName;
+}
+
+Reference<XAccessibleRelationSet> SAL_CALL
+ AccessibleObject::getAccessibleRelationSet()
+{
+ ThrowIfDisposed();
+
+ return nullptr;
+}
+
+sal_Int64 SAL_CALL
+ AccessibleObject::getAccessibleStateSet()
+{
+ ThrowIfDisposed();
+
+ return mnStateSet;
+}
+
+lang::Locale SAL_CALL
+ AccessibleObject::getLocale()
+{
+ ThrowIfDisposed();
+
+ if (mxParentAccessible.is())
+ {
+ Reference<XAccessibleContext> xParentContext
(mxParentAccessible->getAccessibleContext());
+ if (xParentContext.is())
+ return xParentContext->getLocale();
+ }
+ return css::lang::Locale();
+}
+
+//----- XAccessibleComponent ------------------------------------------------
+
+sal_Bool SAL_CALL AccessibleObject::containsPoint (
+ const awt::Point& rPoint)
+{
+ ThrowIfDisposed();
+
+ if (mxContentWindow.is())
+ {
+ const awt::Rectangle aBox (getBounds());
+ return rPoint.X>=aBox.X
+ && rPoint.Y>=aBox.Y
+ && rPoint.X<aBox.X+aBox.Width
+ && rPoint.Y<aBox.Y+aBox.Height;
+ }
+ else
+ return false;
+}
+
+Reference<XAccessible> SAL_CALL
+ AccessibleObject::getAccessibleAtPoint (const awt::Point&)
+{
+ ThrowIfDisposed();
+
+ return Reference<XAccessible>();
+}
+
+awt::Rectangle SAL_CALL AccessibleObject::getBounds()
+{
+ ThrowIfDisposed();
+
+ const awt::Point aLocation (GetRelativeLocation());
+ const awt::Size aSize (GetSize());
+
+ return awt::Rectangle (aLocation.X, aLocation.Y, aSize.Width,
aSize.Height);
+}
+
+awt::Point SAL_CALL AccessibleObject::getLocation()
+{
+ ThrowIfDisposed();
+
+ const awt::Point aLocation (GetRelativeLocation());
+
+ return aLocation;
+}
+
+awt::Point SAL_CALL AccessibleObject::getLocationOnScreen()
+{
+ ThrowIfDisposed();
+
+ awt::Point aRelativeLocation (GetRelativeLocation());
+ awt::Point aParentLocationOnScreen (GetAbsoluteParentLocation());
+
+ return awt::Point(
+ aRelativeLocation.X + aParentLocationOnScreen.X,
+ aRelativeLocation.Y + aParentLocationOnScreen.Y);
+}
+
+awt::Size SAL_CALL AccessibleObject::getSize()
+{
+ ThrowIfDisposed();
+
+ const awt::Size aSize (GetSize());
+
+ return aSize;
+}
+
+void SAL_CALL AccessibleObject::grabFocus()
+{
+ ThrowIfDisposed();
+ if (mxBorderWindow.is())
+ mxBorderWindow->setFocus();
+ else if (mxContentWindow.is())
+ mxContentWindow->setFocus();
+}
+
+sal_Int32 SAL_CALL AccessibleObject::getForeground()
+{
+ ThrowIfDisposed();
+
+ return 0x00ffffff;
+}
+
+sal_Int32 SAL_CALL AccessibleObject::getBackground()
+{
+ ThrowIfDisposed();
+
+ return 0x00000000;
+}
+
+//----- XAccessibleEventBroadcaster -------------------------------------------
+
+void SAL_CALL AccessibleObject::addAccessibleEventListener (
+ const Reference<XAccessibleEventListener>& rxListener)
+{
+ if (!rxListener.is())
+ return;
+
+ const osl::MutexGuard aGuard(m_aMutex);
+
+ if (rBHelper.bDisposed || rBHelper.bInDispose)
+ {
+ uno::Reference<uno::XInterface> xThis (static_cast<XWeak*>(this),
UNO_QUERY);
+ rxListener->disposing (lang::EventObject(xThis));
+ }
+ else
+ {
+ maListeners.push_back(rxListener);
+ }
+}
+
+void SAL_CALL AccessibleObject::removeAccessibleEventListener (
+ const Reference<XAccessibleEventListener>& rxListener)
+{
+ ThrowIfDisposed();
+ if (rxListener.is())
+ {
+ const osl::MutexGuard aGuard(m_aMutex);
+
+ std::erase(maListeners, rxListener);
+ }
+}
+
+//----- XWindowListener ---------------------------------------------------
+
+void SAL_CALL AccessibleObject::windowResized (
+ const css::awt::WindowEvent&)
+{
+ FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any());
+}
+
+void SAL_CALL AccessibleObject::windowMoved (
+ const css::awt::WindowEvent&)
+{
+ FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any());
+}
+
+void SAL_CALL AccessibleObject::windowShown (
+ const css::lang::EventObject&)
+{
+ UpdateStateSet();
+}
+
+void SAL_CALL AccessibleObject::windowHidden (
+ const css::lang::EventObject&)
+{
+ UpdateStateSet();
+}
+
+//----- XEventListener --------------------------------------------------------
+
+void SAL_CALL AccessibleObject::disposing (const css::lang::EventObject&
rEvent)
+{
+ if (rEvent.Source == mxContentWindow)
+ {
+ mxContentWindow = nullptr;
+ mxBorderWindow = nullptr;
+ }
+ else
+ {
+ SetWindow(nullptr, nullptr);
+ }
+}
+
+//----- private ---------------------------------------------------------------
+
+bool AccessibleObject::GetWindowState (const sal_Int64 nType) const
+{
+ switch (nType)
+ {
+ case AccessibleStateType::ENABLED:
+ return mxContentWindow.is() && mxContentWindow->isEnabled();
+
+ case AccessibleStateType::FOCUSABLE:
+ return true;
+
+ case AccessibleStateType::FOCUSED:
+ return mbIsFocused;
+
+ case AccessibleStateType::SHOWING:
+ return mxContentWindow.is() && mxContentWindow->isVisible();
+
+ default:
+ return false;
+ }
+}
+
+void AccessibleObject::UpdateStateSet()
+{
+ UpdateState(AccessibleStateType::FOCUSABLE, true);
+ UpdateState(AccessibleStateType::VISIBLE, true);
+ UpdateState(AccessibleStateType::ENABLED, true);
+ UpdateState(AccessibleStateType::MULTI_LINE, true);
+ UpdateState(AccessibleStateType::SENSITIVE, true);
+
+ UpdateState(AccessibleStateType::ENABLED,
GetWindowState(AccessibleStateType::ENABLED));
+ UpdateState(AccessibleStateType::FOCUSED,
GetWindowState(AccessibleStateType::FOCUSED));
+ UpdateState(AccessibleStateType::SHOWING,
GetWindowState(AccessibleStateType::SHOWING));
+ // UpdateState(AccessibleStateType::ACTIVE,
GetWindowState(AccessibleStateType::ACTIVE));
+}
+
+void AccessibleObject::UpdateState(
+ const sal_Int64 nState,
+ const bool bValue)
+{
+ if (((mnStateSet & nState) != 0) == bValue)
+ return;
+ if (bValue)
+ {
+ mnStateSet |= nState;
+ FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, Any(),
Any(nState));
+ }
+ else
+ {
+ mnStateSet &= ~nState;
+ FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, Any(nState),
Any());
+ }
+}
+
+void AccessibleObject::AddChild (
+ const ::rtl::Reference<AccessibleObject>& rpChild)
+{
+ maChildren.push_back(rpChild);
+ rpChild->SetAccessibleParent(this);
+ FireAccessibleEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(),
Any());
+}
+
+void AccessibleObject::RemoveChild (
+ const ::rtl::Reference<AccessibleObject>& rpChild)
+{
+ rpChild->SetAccessibleParent(Reference<XAccessible>());
+ maChildren.erase(::std::find(maChildren.begin(), maChildren.end(),
rpChild));
+ FireAccessibleEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(),
Any());
+}
+
+void AccessibleObject::SetIsFocused (const bool bIsFocused)
+{
+ if (mbIsFocused != bIsFocused)
+ {
+ mbIsFocused = bIsFocused;
+ UpdateStateSet();
+ }
+}
+
+void AccessibleObject::SetAccessibleName (const OUString& rsName)
+{
+ if (msName != rsName)
+ {
+ const OUString sOldName(msName);
+ msName = rsName;
+ FireAccessibleEvent(AccessibleEventId::NAME_CHANGED, Any(sOldName),
Any(msName));
+ }
+}
+
+void AccessibleObject::FireAccessibleEvent (
+ const sal_Int16 nEventId,
+ const uno::Any& rOldValue,
+ const uno::Any& rNewValue )
+{
+ AccessibleEventObject aEventObject;
+
+ aEventObject.Source = Reference<XWeak>(this);
+ aEventObject.EventId = nEventId;
+ aEventObject.NewValue = rNewValue;
+ aEventObject.OldValue = rOldValue;
+
+ ::std::vector<Reference<XAccessibleEventListener> >
aListenerCopy(maListeners);
+ for (const auto& rxListener : aListenerCopy)
+ {
+ try
+ {
+ rxListener->notifyEvent(aEventObject);
+ }
+ catch (const lang::DisposedException&)
+ {
+ // Listener has been disposed and should have been removed
+ // already.
+ removeAccessibleEventListener(rxListener);
+ }
+ catch (const Exception&)
+ {
+ // Ignore all other exceptions and assume that they are
+ // caused by a temporary problem.
+ }
+ }
+}
+
+awt::Point AccessibleObject::GetRelativeLocation()
+{
+ awt::Point aLocation;
+ if (mxContentWindow.is())
+ {
+ const awt::Rectangle aContentBox (mxContentWindow->getPosSize());
+ aLocation.X = aContentBox.X;
+ aLocation.Y = aContentBox.Y;
+ if (mxBorderWindow.is())
+ {
+ const awt::Rectangle aBorderBox (mxBorderWindow->getPosSize());
+ aLocation.X += aBorderBox.X;
+ aLocation.Y += aBorderBox.Y;
+ }
+ }
+ return aLocation;
+}
+
+awt::Size AccessibleObject::GetSize()
+{
+ if (mxContentWindow.is())
+ {
+ const awt::Rectangle aBox (mxContentWindow->getPosSize());
+ return awt::Size(aBox.Width, aBox.Height);
+ }
+ else
+ return awt::Size();
+}
+
+awt::Point AccessibleObject::GetAbsoluteParentLocation()
+{
+ Reference<XAccessibleComponent> xParentComponent;
+ if (mxParentAccessible.is())
+ xParentComponent.set( mxParentAccessible->getAccessibleContext(),
UNO_QUERY);
+ if (xParentComponent.is())
+ return xParentComponent->getLocationOnScreen();
+ else
+ return awt::Point();
+}
+
+void AccessibleObject::ThrowIfDisposed() const
+{
+ if (rBHelper.bDisposed || rBHelper.bInDispose)
+ throw lang::DisposedException(u"object has already been
disposed"_ustr,
uno::Reference<uno::XInterface>(const_cast<uno::XWeak*>(static_cast<uno::XWeak
const *>(this))));
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sd/source/console/AccessibleObject.hxx
b/sd/source/console/AccessibleObject.hxx
new file mode 100644
index 000000000000..0962f9c178e0
--- /dev/null
+++ b/sd/source/console/AccessibleObject.hxx
@@ -0,0 +1,174 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * 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 <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/awt/XWindow2.hpp>
+#include <com/sun/star/awt/XWindowListener.hpp>
+#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <rtl/ref.hxx>
+#include <sal/log.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+
+namespace {
+ typedef ::cppu::WeakComponentImplHelper <
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleContext,
+ css::accessibility::XAccessibleComponent,
+ css::accessibility::XAccessibleEventBroadcaster,
+ css::awt::XWindowListener
+ > AccessibleObjectInterfaceBase;
+}
+
+class AccessibleObject
+ : public ::cppu::BaseMutex,
+ public AccessibleObjectInterfaceBase
+{
+public:
+ AccessibleObject(const sal_Int16 nRole, OUString sName);
+ void LateInitialization();
+
+ virtual void SetWindow (
+ const css::uno::Reference<css::awt::XWindow>& rxContentWindow,
+ const css::uno::Reference<css::awt::XWindow>& rxBorderWindow);
+ void SetAccessibleParent (const
css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleParent);
+
+ virtual void SAL_CALL disposing() override;
+
+ void AddChild (const ::rtl::Reference<AccessibleObject>& rpChild);
+ void RemoveChild (const ::rtl::Reference<AccessibleObject>& rpChild);
+
+ void SetIsFocused (const bool bIsFocused);
+ void SetAccessibleName (const OUString& rsName);
+
+ void FireAccessibleEvent (
+ const sal_Int16 nEventId,
+ const css::uno::Any& rOldValue,
+ const css::uno::Any& rNewValue);
+
+ void UpdateStateSet();
+
+ //----- XAccessible -------------------------------------------------------
+
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
SAL_CALL
+ getAccessibleContext() override;
+
+ //----- XAccessibleContext ----------------------------------------------
+
+ virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
+
+ virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
+ getAccessibleChild (sal_Int64 nIndex) override;
+
+ virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
getAccessibleParent() override;
+
+ virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
+
+ virtual sal_Int16 SAL_CALL getAccessibleRole() override;
+
+ virtual OUString SAL_CALL getAccessibleDescription() override;
+
+ virtual OUString SAL_CALL getAccessibleName() override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet>
SAL_CALL
+ getAccessibleRelationSet() override;
+
+ virtual sal_Int64 SAL_CALL getAccessibleStateSet() override;
+
+ virtual css::lang::Locale SAL_CALL getLocale() override;
+
+ //----- XAccessibleComponent --------------------------------------------
+
+ virtual sal_Bool SAL_CALL containsPoint (
+ const css::awt::Point& aPoint) override;
+
+ virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL
+ getAccessibleAtPoint (
+ const css::awt::Point& aPoint) override;
+
+ virtual css::awt::Rectangle SAL_CALL getBounds() override;
+
+ virtual css::awt::Point SAL_CALL getLocation() override;
+
+ virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+
+ virtual css::awt::Size SAL_CALL getSize() override;
+
+ virtual void SAL_CALL grabFocus() override;
+
+ virtual sal_Int32 SAL_CALL getForeground() override;
+
+ virtual sal_Int32 SAL_CALL getBackground() override;
+
+ //----- XAccessibleEventBroadcaster --------------------------------------
+
+ virtual void SAL_CALL addAccessibleEventListener (
+ const
css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener)
override;
+
+ virtual void SAL_CALL removeAccessibleEventListener (
+ const
css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener)
override;
+
+ //----- XWindowListener ---------------------------------------------------
+
+ virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
override;
+
+ virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
override;
+
+ virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
override;
+
+ virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
override;
+
+ //----- XEventListener ----------------------------------------------------
+
+ virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
override;
+
+protected:
+ OUString msName;
+ css::uno::Reference<css::awt::XWindow2> mxContentWindow;
+ css::uno::Reference<css::awt::XWindow2> mxBorderWindow;
+ const sal_Int16 mnRole;
+ sal_Int64 mnStateSet;
+ bool mbIsFocused;
+ css::uno::Reference<css::accessibility::XAccessible> mxParentAccessible;
+ ::std::vector<rtl::Reference<AccessibleObject> > maChildren;
+ ::std::vector<Reference<XAccessibleEventListener> > maListeners;
+
+ virtual awt::Point GetRelativeLocation();
+ virtual awt::Size GetSize();
+ virtual awt::Point GetAbsoluteParentLocation();
+
+ virtual bool GetWindowState (const sal_Int64 nType) const;
+
+ void UpdateState (const sal_Int64 aState, const bool bValue);
+
+ /// @throws css::lang::DisposedException
+ void ThrowIfDisposed() const;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sd/source/console/PresenterAccessibility.cxx
b/sd/source/console/PresenterAccessibility.cxx
index da98db49dda4..a4e831d90b12 100644
--- a/sd/source/console/PresenterAccessibility.cxx
+++ b/sd/source/console/PresenterAccessibility.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "AccessibleFocusManager.hxx"
#include "PresenterAccessibility.hxx"
#include "PresenterTextView.hxx"
#include "PresenterConfigurationAccess.hxx"
@@ -51,145 +52,8 @@ using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-//===== PresenterAccessibleObject =============================================
-
namespace sdext::presenter {
-namespace {
- typedef ::cppu::WeakComponentImplHelper <
- css::accessibility::XAccessible,
- css::accessibility::XAccessibleContext,
- css::accessibility::XAccessibleComponent,
- css::accessibility::XAccessibleEventBroadcaster,
- css::awt::XWindowListener
- > PresenterAccessibleObjectInterfaceBase;
-}
-
-class PresenterAccessible::AccessibleObject
- : public ::cppu::BaseMutex,
- public PresenterAccessibleObjectInterfaceBase
-{
-public:
- AccessibleObject(const sal_Int16 nRole, OUString sName);
- void LateInitialization();
-
- virtual void SetWindow (
- const css::uno::Reference<css::awt::XWindow>& rxContentWindow,
- const css::uno::Reference<css::awt::XWindow>& rxBorderWindow);
- void SetAccessibleParent (const
css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleParent);
-
- virtual void SAL_CALL disposing() override;
-
- void AddChild (const ::rtl::Reference<AccessibleObject>& rpChild);
- void RemoveChild (const ::rtl::Reference<AccessibleObject>& rpChild);
-
- void SetIsFocused (const bool bIsFocused);
- void SetAccessibleName (const OUString& rsName);
-
- void FireAccessibleEvent (
- const sal_Int16 nEventId,
- const css::uno::Any& rOldValue,
- const css::uno::Any& rNewValue);
-
- void UpdateStateSet();
-
- //----- XAccessible -------------------------------------------------------
-
- virtual css::uno::Reference<css::accessibility::XAccessibleContext>
SAL_CALL
- getAccessibleContext() override;
-
- //----- XAccessibleContext ----------------------------------------------
-
- virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
- getAccessibleChild (sal_Int64 nIndex) override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
getAccessibleParent() override;
-
- virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
-
- virtual sal_Int16 SAL_CALL getAccessibleRole() override;
-
- virtual OUString SAL_CALL getAccessibleDescription() override;
-
- virtual OUString SAL_CALL getAccessibleName() override;
-
- virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet>
SAL_CALL
- getAccessibleRelationSet() override;
-
- virtual sal_Int64 SAL_CALL getAccessibleStateSet() override;
-
- virtual css::lang::Locale SAL_CALL getLocale() override;
-
- //----- XAccessibleComponent --------------------------------------------
-
- virtual sal_Bool SAL_CALL containsPoint (
- const css::awt::Point& aPoint) override;
-
- virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL
- getAccessibleAtPoint (
- const css::awt::Point& aPoint) override;
-
- virtual css::awt::Rectangle SAL_CALL getBounds() override;
-
- virtual css::awt::Point SAL_CALL getLocation() override;
-
- virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
-
- virtual css::awt::Size SAL_CALL getSize() override;
-
- virtual void SAL_CALL grabFocus() override;
-
- virtual sal_Int32 SAL_CALL getForeground() override;
-
- virtual sal_Int32 SAL_CALL getBackground() override;
-
- //----- XAccessibleEventBroadcaster --------------------------------------
-
- virtual void SAL_CALL addAccessibleEventListener (
- const
css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener)
override;
-
- virtual void SAL_CALL removeAccessibleEventListener (
- const
css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener)
override;
-
- //----- XWindowListener ---------------------------------------------------
-
- virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
override;
-
- virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
override;
-
- virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
override;
-
- virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
override;
-
- //----- XEventListener ----------------------------------------------------
-
- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
override;
-
-protected:
- OUString msName;
- css::uno::Reference<css::awt::XWindow2> mxContentWindow;
- css::uno::Reference<css::awt::XWindow2> mxBorderWindow;
- const sal_Int16 mnRole;
- sal_Int64 mnStateSet;
- bool mbIsFocused;
- css::uno::Reference<css::accessibility::XAccessible> mxParentAccessible;
- ::std::vector<rtl::Reference<AccessibleObject> > maChildren;
- ::std::vector<Reference<XAccessibleEventListener> > maListeners;
-
- virtual awt::Point GetRelativeLocation();
- virtual awt::Size GetSize();
- virtual awt::Point GetAbsoluteParentLocation();
-
- virtual bool GetWindowState (const sal_Int64 nType) const;
-
- void UpdateState (const sal_Int64 aState, const bool bValue);
-
- /// @throws css::lang::DisposedException
- void ThrowIfDisposed() const;
-};
-
namespace {
//===== AccessibleRelationSet =================================================
@@ -226,7 +90,7 @@ private:
//===== PresenterAccessibleParagraph ==========================================
typedef ::cppu::ImplInheritanceHelper <
- PresenterAccessible::AccessibleObject,
+ AccessibleObject,
css::accessibility::XAccessibleText
> PresenterAccessibleParagraphInterfaceBase;
}
@@ -315,7 +179,7 @@ namespace {
class AccessibleConsole
{
public:
- static rtl::Reference<PresenterAccessible::AccessibleObject> Create (
+ static rtl::Reference<AccessibleObject> Create (
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
{
OUString sName (u"Presenter Console"_ustr);
@@ -326,8 +190,8 @@ public:
aConfiguration.GetConfigurationNode(u"Presenter/Accessibility/Console/String"_ustr)
>>= sName;
- rtl::Reference<PresenterAccessible::AccessibleObject> pObject (
- new PresenterAccessible::AccessibleObject(AccessibleRole::PANEL,
sName));
+ rtl::Reference<AccessibleObject> pObject (
+ new AccessibleObject(AccessibleRole::PANEL, sName));
pObject->LateInitialization();
pObject->UpdateStateSet();
@@ -340,7 +204,7 @@ public:
class AccessiblePreview
{
public:
- static rtl::Reference<PresenterAccessible::AccessibleObject> Create (
+ static rtl::Reference<AccessibleObject> Create (
const Reference<css::uno::XComponentContext>& rxContext,
const Reference<awt::XWindow>& rxContentWindow,
const Reference<awt::XWindow>& rxBorderWindow)
@@ -355,8 +219,8 @@ public:
>>= sName;
}
- rtl::Reference<PresenterAccessible::AccessibleObject> pObject (
- new PresenterAccessible::AccessibleObject(
+ rtl::Reference<AccessibleObject> pObject (
+ new AccessibleObject(
AccessibleRole::LABEL,
sName));
pObject->LateInitialization();
@@ -369,12 +233,12 @@ public:
//===== AccessibleNotes =======================================================
-class AccessibleNotes : public PresenterAccessible::AccessibleObject
+class AccessibleNotes : public AccessibleObject
{
public:
AccessibleNotes(const OUString& rsName);
- static rtl::Reference<PresenterAccessible::AccessibleObject> Create (
+ static rtl::Reference<AccessibleObject> Create (
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const Reference<awt::XWindow>& rxContentWindow,
const Reference<awt::XWindow>& rxBorderWindow,
@@ -396,31 +260,6 @@ private:
const sal_Int32 nNewCharacterIndex);
};
-//===== AccessibleFocusManager ================================================
-
-/** A singleton class that makes sure that only one accessibility object in
- the PresenterConsole hierarchy has the focus.
-*/
-class AccessibleFocusManager
-{
-public:
- static std::shared_ptr<AccessibleFocusManager> const & Instance();
-
- void AddFocusableObject (const
::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject);
- void RemoveFocusableObject (const
::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject);
-
- void FocusObject (const
::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject);
-
- ~AccessibleFocusManager();
-
-private:
- static std::shared_ptr<AccessibleFocusManager> mpInstance;
- ::std::vector<rtl::Reference<PresenterAccessible::AccessibleObject> >
maFocusableObjects;
- bool m_isInDtor = false;
-
- AccessibleFocusManager();
-};
-
}
//===== PresenterAccessible ===================================================
@@ -667,507 +506,6 @@ void SAL_CALL PresenterAccessible::initialize (const
css::uno::Sequence<css::uno
}
}
-//===== PresenterAccessible::AccessibleObject
=========================================
-
-PresenterAccessible::AccessibleObject::AccessibleObject(
- const sal_Int16 nRole,
- OUString sName)
- : PresenterAccessibleObjectInterfaceBase(m_aMutex),
- msName(std::move(sName)),
- mnRole(nRole),
- mnStateSet(0),
- mbIsFocused(false)
-{
-}
-
-void PresenterAccessible::AccessibleObject::LateInitialization()
-{
- AccessibleFocusManager::Instance()->AddFocusableObject(this);
-}
-
-void PresenterAccessible::AccessibleObject::SetWindow (
- const Reference<awt::XWindow>& rxContentWindow,
- const Reference<awt::XWindow>& rxBorderWindow)
-{
- Reference<awt::XWindow2> xContentWindow (rxContentWindow, UNO_QUERY);
-
- if (mxContentWindow.get() == xContentWindow.get())
- return;
-
- if (mxContentWindow.is())
- {
- mxContentWindow->removeWindowListener(this);
- }
-
- mxContentWindow = std::move(xContentWindow);
- mxBorderWindow.set(rxBorderWindow, UNO_QUERY);
-
- if (mxContentWindow.is())
- {
- mxContentWindow->addWindowListener(this);
- }
-
- UpdateStateSet();
-}
-
-void PresenterAccessible::AccessibleObject::SetAccessibleParent (
- const Reference<XAccessible>& rxAccessibleParent)
-{
- mxParentAccessible = rxAccessibleParent;
-}
-
-void SAL_CALL PresenterAccessible::AccessibleObject::disposing()
-{
- AccessibleFocusManager::Instance()->RemoveFocusableObject(this);
- SetWindow(nullptr, nullptr);
-}
-
-//----- XAccessible -------------------------------------------------------
-
-Reference<XAccessibleContext> SAL_CALL
- PresenterAccessible::AccessibleObject::getAccessibleContext()
-{
- ThrowIfDisposed();
-
- return this;
-}
-
-//----- XAccessibleContext ----------------------------------------------
-
-sal_Int64 SAL_CALL
PresenterAccessible::AccessibleObject::getAccessibleChildCount()
-{
- ThrowIfDisposed();
-
- return maChildren.size();
-}
-
-Reference<XAccessible> SAL_CALL
- PresenterAccessible::AccessibleObject::getAccessibleChild (sal_Int64
nIndex)
-{
- ThrowIfDisposed();
-
- if (nIndex<0 || o3tl::make_unsigned(nIndex)>=maChildren.size())
- throw lang::IndexOutOfBoundsException(u"invalid child index"_ustr,
static_cast<uno::XWeak*>(this));
-
- return maChildren[nIndex];
-}
-
-Reference<XAccessible> SAL_CALL
- PresenterAccessible::AccessibleObject::getAccessibleParent()
-{
- ThrowIfDisposed();
-
- return mxParentAccessible;
-}
-
-sal_Int64 SAL_CALL
- PresenterAccessible::AccessibleObject::getAccessibleIndexInParent()
-{
- ThrowIfDisposed();
-
- const Reference<XAccessible> xThis (this);
- if (mxParentAccessible.is())
- {
- const Reference<XAccessibleContext> xContext
(mxParentAccessible->getAccessibleContext());
- for (sal_Int64 nIndex = 0, nCount=xContext->getAccessibleChildCount();
- nIndex<nCount;
- ++nIndex)
- {
- if (xContext->getAccessibleChild(nIndex) == xThis)
- return nIndex;
- }
- }
-
- return 0;
-}
-
-sal_Int16 SAL_CALL
- PresenterAccessible::AccessibleObject::getAccessibleRole()
-{
- ThrowIfDisposed();
-
- return mnRole;
-}
-
-OUString SAL_CALL
- PresenterAccessible::AccessibleObject::getAccessibleDescription()
-{
- ThrowIfDisposed();
-
- return msName;
-}
-
-OUString SAL_CALL
- PresenterAccessible::AccessibleObject::getAccessibleName()
-{
- ThrowIfDisposed();
-
- return msName;
-}
-
-Reference<XAccessibleRelationSet> SAL_CALL
- PresenterAccessible::AccessibleObject::getAccessibleRelationSet()
-{
- ThrowIfDisposed();
-
- return nullptr;
-}
-
-sal_Int64 SAL_CALL
- PresenterAccessible::AccessibleObject::getAccessibleStateSet()
-{
- ThrowIfDisposed();
-
- return mnStateSet;
-}
-
-lang::Locale SAL_CALL
- PresenterAccessible::AccessibleObject::getLocale()
-{
- ThrowIfDisposed();
-
- if (mxParentAccessible.is())
- {
- Reference<XAccessibleContext> xParentContext
(mxParentAccessible->getAccessibleContext());
- if (xParentContext.is())
- return xParentContext->getLocale();
- }
- return css::lang::Locale();
-}
-
-//----- XAccessibleComponent ------------------------------------------------
-
-sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint (
- const awt::Point& rPoint)
-{
- ThrowIfDisposed();
-
- if (mxContentWindow.is())
- {
- const awt::Rectangle aBox (getBounds());
- return rPoint.X>=aBox.X
- && rPoint.Y>=aBox.Y
- && rPoint.X<aBox.X+aBox.Width
- && rPoint.Y<aBox.Y+aBox.Height;
- }
- else
- return false;
-}
-
-Reference<XAccessible> SAL_CALL
- PresenterAccessible::AccessibleObject::getAccessibleAtPoint (const
awt::Point&)
-{
- ThrowIfDisposed();
-
- return Reference<XAccessible>();
-}
-
-awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds()
-{
- ThrowIfDisposed();
-
- const awt::Point aLocation (GetRelativeLocation());
- const awt::Size aSize (GetSize());
-
- return awt::Rectangle (aLocation.X, aLocation.Y, aSize.Width,
aSize.Height);
-}
-
-awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation()
-{
- ThrowIfDisposed();
-
- const awt::Point aLocation (GetRelativeLocation());
-
- return aLocation;
-}
-
-awt::Point SAL_CALL
PresenterAccessible::AccessibleObject::getLocationOnScreen()
-{
- ThrowIfDisposed();
-
- awt::Point aRelativeLocation (GetRelativeLocation());
- awt::Point aParentLocationOnScreen (GetAbsoluteParentLocation());
-
- return awt::Point(
- aRelativeLocation.X + aParentLocationOnScreen.X,
- aRelativeLocation.Y + aParentLocationOnScreen.Y);
-}
-
-awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize()
-{
- ThrowIfDisposed();
-
- const awt::Size aSize (GetSize());
-
- return aSize;
-}
-
-void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus()
-{
- ThrowIfDisposed();
- if (mxBorderWindow.is())
- mxBorderWindow->setFocus();
- else if (mxContentWindow.is())
- mxContentWindow->setFocus();
-}
-
-sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground()
-{
- ThrowIfDisposed();
-
- return 0x00ffffff;
-}
-
-sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground()
-{
- ThrowIfDisposed();
-
- return 0x00000000;
-}
-
-//----- XAccessibleEventBroadcaster -------------------------------------------
-
-void SAL_CALL
PresenterAccessible::AccessibleObject::addAccessibleEventListener (
- const Reference<XAccessibleEventListener>& rxListener)
-{
- if (!rxListener.is())
- return;
-
- const osl::MutexGuard aGuard(m_aMutex);
-
- if (rBHelper.bDisposed || rBHelper.bInDispose)
- {
- uno::Reference<uno::XInterface> xThis (static_cast<XWeak*>(this),
UNO_QUERY);
- rxListener->disposing (lang::EventObject(xThis));
- }
- else
- {
- maListeners.push_back(rxListener);
- }
-}
-
-void SAL_CALL
PresenterAccessible::AccessibleObject::removeAccessibleEventListener (
- const Reference<XAccessibleEventListener>& rxListener)
-{
- ThrowIfDisposed();
- if (rxListener.is())
- {
- const osl::MutexGuard aGuard(m_aMutex);
-
- std::erase(maListeners, rxListener);
- }
-}
-
-//----- XWindowListener ---------------------------------------------------
-
-void SAL_CALL PresenterAccessible::AccessibleObject::windowResized (
- const css::awt::WindowEvent&)
-{
- FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any());
-}
-
-void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved (
- const css::awt::WindowEvent&)
-{
- FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any());
-}
-
-void SAL_CALL PresenterAccessible::AccessibleObject::windowShown (
- const css::lang::EventObject&)
-{
- UpdateStateSet();
-}
-
-void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden (
- const css::lang::EventObject&)
-{
- UpdateStateSet();
-}
-
-//----- XEventListener --------------------------------------------------------
-
-void SAL_CALL PresenterAccessible::AccessibleObject::disposing (const
css::lang::EventObject& rEvent)
-{
- if (rEvent.Source == mxContentWindow)
- {
- mxContentWindow = nullptr;
- mxBorderWindow = nullptr;
- }
- else
- {
- SetWindow(nullptr, nullptr);
- }
-}
-
-//----- private ---------------------------------------------------------------
-
-bool PresenterAccessible::AccessibleObject::GetWindowState (const sal_Int64
nType) const
-{
- switch (nType)
- {
- case AccessibleStateType::ENABLED:
- return mxContentWindow.is() && mxContentWindow->isEnabled();
-
- case AccessibleStateType::FOCUSABLE:
- return true;
-
- case AccessibleStateType::FOCUSED:
- return mbIsFocused;
-
- case AccessibleStateType::SHOWING:
- return mxContentWindow.is() && mxContentWindow->isVisible();
-
- default:
- return false;
- }
-}
-
-void PresenterAccessible::AccessibleObject::UpdateStateSet()
-{
- UpdateState(AccessibleStateType::FOCUSABLE, true);
- UpdateState(AccessibleStateType::VISIBLE, true);
- UpdateState(AccessibleStateType::ENABLED, true);
- UpdateState(AccessibleStateType::MULTI_LINE, true);
- UpdateState(AccessibleStateType::SENSITIVE, true);
-
- UpdateState(AccessibleStateType::ENABLED,
GetWindowState(AccessibleStateType::ENABLED));
- UpdateState(AccessibleStateType::FOCUSED,
GetWindowState(AccessibleStateType::FOCUSED));
- UpdateState(AccessibleStateType::SHOWING,
GetWindowState(AccessibleStateType::SHOWING));
- // UpdateState(AccessibleStateType::ACTIVE,
GetWindowState(AccessibleStateType::ACTIVE));
-}
-
-void PresenterAccessible::AccessibleObject::UpdateState(
- const sal_Int64 nState,
- const bool bValue)
-{
- if (((mnStateSet & nState) != 0) == bValue)
- return;
- if (bValue)
- {
- mnStateSet |= nState;
- FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, Any(),
Any(nState));
- }
- else
- {
- mnStateSet &= ~nState;
- FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, Any(nState),
Any());
- }
-}
-
-void PresenterAccessible::AccessibleObject::AddChild (
- const ::rtl::Reference<AccessibleObject>& rpChild)
-{
- maChildren.push_back(rpChild);
- rpChild->SetAccessibleParent(this);
- FireAccessibleEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(),
Any());
-}
-
-void PresenterAccessible::AccessibleObject::RemoveChild (
- const ::rtl::Reference<AccessibleObject>& rpChild)
-{
- rpChild->SetAccessibleParent(Reference<XAccessible>());
- maChildren.erase(::std::find(maChildren.begin(), maChildren.end(),
rpChild));
- FireAccessibleEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(),
Any());
-}
-
-void PresenterAccessible::AccessibleObject::SetIsFocused (const bool
bIsFocused)
-{
- if (mbIsFocused != bIsFocused)
- {
- mbIsFocused = bIsFocused;
- UpdateStateSet();
- }
-}
-
-void PresenterAccessible::AccessibleObject::SetAccessibleName (const OUString&
rsName)
-{
- if (msName != rsName)
- {
- const OUString sOldName(msName);
- msName = rsName;
- FireAccessibleEvent(AccessibleEventId::NAME_CHANGED, Any(sOldName),
Any(msName));
- }
-}
-
-void PresenterAccessible::AccessibleObject::FireAccessibleEvent (
- const sal_Int16 nEventId,
- const uno::Any& rOldValue,
- const uno::Any& rNewValue )
-{
- AccessibleEventObject aEventObject;
-
- aEventObject.Source = Reference<XWeak>(this);
- aEventObject.EventId = nEventId;
- aEventObject.NewValue = rNewValue;
- aEventObject.OldValue = rOldValue;
-
- ::std::vector<Reference<XAccessibleEventListener> >
aListenerCopy(maListeners);
- for (const auto& rxListener : aListenerCopy)
- {
- try
- {
- rxListener->notifyEvent(aEventObject);
- }
- catch (const lang::DisposedException&)
- {
- // Listener has been disposed and should have been removed
- // already.
- removeAccessibleEventListener(rxListener);
- }
- catch (const Exception&)
- {
- // Ignore all other exceptions and assume that they are
- // caused by a temporary problem.
- }
- }
-}
-
-awt::Point PresenterAccessible::AccessibleObject::GetRelativeLocation()
-{
- awt::Point aLocation;
- if (mxContentWindow.is())
- {
- const awt::Rectangle aContentBox (mxContentWindow->getPosSize());
- aLocation.X = aContentBox.X;
- aLocation.Y = aContentBox.Y;
- if (mxBorderWindow.is())
- {
- const awt::Rectangle aBorderBox (mxBorderWindow->getPosSize());
- aLocation.X += aBorderBox.X;
- aLocation.Y += aBorderBox.Y;
- }
- }
- return aLocation;
-}
-
-awt::Size PresenterAccessible::AccessibleObject::GetSize()
-{
- if (mxContentWindow.is())
- {
- const awt::Rectangle aBox (mxContentWindow->getPosSize());
- return awt::Size(aBox.Width, aBox.Height);
- }
- else
- return awt::Size();
-}
-
-awt::Point PresenterAccessible::AccessibleObject::GetAbsoluteParentLocation()
-{
- Reference<XAccessibleComponent> xParentComponent;
- if (mxParentAccessible.is())
- xParentComponent.set( mxParentAccessible->getAccessibleContext(),
UNO_QUERY);
- if (xParentComponent.is())
- return xParentComponent->getLocationOnScreen();
- else
- return awt::Point();
-}
-
-void PresenterAccessible::AccessibleObject::ThrowIfDisposed() const
-{
- if (rBHelper.bDisposed || rBHelper.bInDispose)
- throw lang::DisposedException(u"object has already been
disposed"_ustr,
uno::Reference<uno::XInterface>(const_cast<uno::XWeak*>(static_cast<uno::XWeak
const *>(this))));
-}
-
//===== AccessibleRelationSet =================================================
@@ -1541,7 +879,7 @@ AccessibleNotes::AccessibleNotes(const OUString& rsName)
{
}
-rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
+rtl::Reference<AccessibleObject> AccessibleNotes::Create (
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const Reference<awt::XWindow>& rxContentWindow,
const Reference<awt::XWindow>& rxBorderWindow,
@@ -1570,7 +908,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject>
AccessibleNotes::Create (
void AccessibleNotes::SetTextView (
const std::shared_ptr<PresenterTextView>& rpTextView)
{
- ::std::vector<rtl::Reference<PresenterAccessible::AccessibleObject> >
aChildren;
+ ::std::vector<rtl::Reference<AccessibleObject> > aChildren;
// Release any listeners to the current text view.
if (mpTextView)
@@ -1676,70 +1014,6 @@ void AccessibleNotes::NotifyCaretChange (
}
}
-
-//===== AccessibleFocusManager ================================================
-
-std::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance;
-
-std::shared_ptr<AccessibleFocusManager> const &
AccessibleFocusManager::Instance()
-{
- if ( ! mpInstance)
- {
- mpInstance.reset(new AccessibleFocusManager());
- }
- return mpInstance;
-}
-
-AccessibleFocusManager::AccessibleFocusManager()
-{
-}
-
-AccessibleFocusManager::~AccessibleFocusManager()
-{
- // copy member to stack, then drop it - otherwise will get use-after-free
- // from AccessibleObject::disposing(), it will call ~Reference *twice*
- auto const temp(std::move(maFocusableObjects));
- (void) temp;
- m_isInDtor = true;
-}
-
-void AccessibleFocusManager::AddFocusableObject (
- const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject)
-{
- OSL_ASSERT(rpObject.is());
-
OSL_ASSERT(::std::find(maFocusableObjects.begin(),maFocusableObjects.end(),
rpObject)==maFocusableObjects.end());
-
- maFocusableObjects.push_back(rpObject);
-}
-
-void AccessibleFocusManager::RemoveFocusableObject (
- const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject)
-{
- ::std::vector<rtl::Reference<PresenterAccessible::AccessibleObject>
>::iterator iObject (
- ::std::find(maFocusableObjects.begin(),maFocusableObjects.end(),
rpObject));
-
- if (iObject != maFocusableObjects.end())
- maFocusableObjects.erase(iObject);
- else
- {
- OSL_ASSERT(m_isInDtor); // in dtor, was removed already
- }
-}
-
-void AccessibleFocusManager::FocusObject (
- const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject)
-{
- // Remove the focus of any of the other focusable objects.
- for (auto& rxObject : maFocusableObjects)
- {
- if (rxObject!=rpObject)
- rxObject->SetIsFocused(false);
- }
-
- if (rpObject.is())
- rpObject->SetIsFocused(true);
-}
-
} // end of namespace ::sd::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/console/PresenterAccessibility.hxx
b/sd/source/console/PresenterAccessibility.hxx
index 350f0995fc56..ef33567dcc5e 100644
--- a/sd/source/console/PresenterAccessibility.hxx
+++ b/sd/source/console/PresenterAccessibility.hxx
@@ -19,6 +19,7 @@
#pragma once
+#include "AccessibleObject.hxx"
#include "PresenterPaneContainer.hxx"
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -79,8 +80,6 @@ public:
//----- XInitialization ---------------------------------------------------
virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>&
rArguments) override;
-
- class AccessibleObject;
class AccessibleParagraph;
private:
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index dc69473a12bf..7e5ea4a4d633 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -9253,6 +9253,10 @@ sd/qa/unit/dialogs-test.cxx
sd/qa/unit/filters-test.cxx
sd/qa/unit/tiledrendering/tiledrendering.cxx
sd/qa/unit/uimpress.cxx
+sd/source/console/AccessibleFocusManager.cxx
+sd/source/console/AccessibleFocusManager.hxx
+sd/source/console/AccessibleObject.cxx
+sd/source/console/AccessibleObject.hxx
sd/source/console/PresenterAccessibility.cxx
sd/source/console/PresenterAccessibility.hxx
sd/source/console/PresenterBitmapContainer.cxx
commit da3c954c95b2cc8e9316a36f76ec5f7bfadce868
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 12:17:47 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 23:00:54 2025 +0100
sd presenter a11y: Construct default Locale on demand
The PresenterAccessible::AccessibleObject was always
called with a default-constructed css::lang::Locale.
Avoid the impression that the Locale that gets passed
could be something meaningful and simply call the
default ctor on demand in
PresenterAccessible::AccessibleObject::getLocale instead.
Change-Id: I362ffbb755ac1a3bcffc1edc2e572a7046f96bd3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182301
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/source/console/PresenterAccessibility.cxx
b/sd/source/console/PresenterAccessibility.cxx
index 346aa882b25e..da98db49dda4 100644
--- a/sd/source/console/PresenterAccessibility.cxx
+++ b/sd/source/console/PresenterAccessibility.cxx
@@ -70,10 +70,7 @@ class PresenterAccessible::AccessibleObject
public PresenterAccessibleObjectInterfaceBase
{
public:
- AccessibleObject (
- css::lang::Locale aLocale,
- const sal_Int16 nRole,
- OUString sName);
+ AccessibleObject(const sal_Int16 nRole, OUString sName);
void LateInitialization();
virtual void SetWindow (
@@ -174,7 +171,6 @@ protected:
OUString msName;
css::uno::Reference<css::awt::XWindow2> mxContentWindow;
css::uno::Reference<css::awt::XWindow2> mxBorderWindow;
- const css::lang::Locale maLocale;
const sal_Int16 mnRole;
sal_Int64 mnStateSet;
bool mbIsFocused;
@@ -239,8 +235,7 @@ class PresenterAccessible::AccessibleParagraph
: public PresenterAccessibleParagraphInterfaceBase
{
public:
- AccessibleParagraph (
- const css::lang::Locale& rLocale,
+ AccessibleParagraph(
const OUString& rsName,
SharedPresenterTextParagraph pParagraph,
const sal_Int32 nParagraphIndex);
@@ -321,8 +316,7 @@ class AccessibleConsole
{
public:
static rtl::Reference<PresenterAccessible::AccessibleObject> Create (
- const css::uno::Reference<css::uno::XComponentContext>& rxContext,
- const lang::Locale& rLocale)
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
{
OUString sName (u"Presenter Console"_ustr);
PresenterConfigurationAccess aConfiguration (
@@ -333,8 +327,7 @@ public:
>>= sName;
rtl::Reference<PresenterAccessible::AccessibleObject> pObject (
- new PresenterAccessible::AccessibleObject(
- rLocale, AccessibleRole::PANEL, sName));
+ new PresenterAccessible::AccessibleObject(AccessibleRole::PANEL,
sName));
pObject->LateInitialization();
pObject->UpdateStateSet();
@@ -349,7 +342,6 @@ class AccessiblePreview
public:
static rtl::Reference<PresenterAccessible::AccessibleObject> Create (
const Reference<css::uno::XComponentContext>& rxContext,
- const lang::Locale& rLocale,
const Reference<awt::XWindow>& rxContentWindow,
const Reference<awt::XWindow>& rxBorderWindow)
{
@@ -365,7 +357,6 @@ public:
rtl::Reference<PresenterAccessible::AccessibleObject> pObject (
new PresenterAccessible::AccessibleObject(
- rLocale,
AccessibleRole::LABEL,
sName));
pObject->LateInitialization();
@@ -381,13 +372,10 @@ public:
class AccessibleNotes : public PresenterAccessible::AccessibleObject
{
public:
- AccessibleNotes (
- const css::lang::Locale& rLocale,
- const OUString& rsName);
+ AccessibleNotes(const OUString& rsName);
static rtl::Reference<PresenterAccessible::AccessibleObject> Create (
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
- const lang::Locale& rLocale,
const Reference<awt::XWindow>& rxContentWindow,
const Reference<awt::XWindow>& rxBorderWindow,
const std::shared_ptr<PresenterTextView>& rpTextView);
@@ -552,7 +540,6 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (
{
mpAccessiblePreview = AccessiblePreview::Create(
mxComponentContext,
- lang::Locale(),
mxPreviewContentWindow,
mxPreviewBorderWindow);
mpAccessibleConsole->AddChild(mpAccessiblePreview);
@@ -576,7 +563,6 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (
{
mpAccessibleNotes = AccessibleNotes::Create(
mxComponentContext,
- lang::Locale(),
mxNotesContentWindow,
mxNotesBorderWindow,
rpNotesTextView);
@@ -636,7 +622,7 @@ Reference<XAccessibleContext> SAL_CALL
PresenterAccessible::getAccessibleContext
mxMainWindow->addFocusListener(this);
}
mpAccessibleConsole = AccessibleConsole::Create(
- mxComponentContext, css::lang::Locale());
+ mxComponentContext);
mpAccessibleConsole->SetWindow(mxMainWindow, nullptr);
mpAccessibleConsole->SetAccessibleParent(mxAccessibleParent);
UpdateAccessibilityHierarchy();
@@ -683,13 +669,11 @@ void SAL_CALL PresenterAccessible::initialize (const
css::uno::Sequence<css::uno
//===== PresenterAccessible::AccessibleObject
=========================================
-PresenterAccessible::AccessibleObject::AccessibleObject (
- lang::Locale aLocale,
+PresenterAccessible::AccessibleObject::AccessibleObject(
const sal_Int16 nRole,
OUString sName)
: PresenterAccessibleObjectInterfaceBase(m_aMutex),
msName(std::move(sName)),
- maLocale(std::move(aLocale)),
mnRole(nRole),
mnStateSet(0),
mbIsFocused(false)
@@ -848,7 +832,7 @@ lang::Locale SAL_CALL
if (xParentContext.is())
return xParentContext->getLocale();
}
- return maLocale;
+ return css::lang::Locale();
}
//----- XAccessibleComponent ------------------------------------------------
@@ -1233,12 +1217,11 @@ AccessibleRelation SAL_CALL
AccessibleRelationSet::getRelationByType(AccessibleR
//===== PresenterAccessible::AccessibleParagraph ==============================
-PresenterAccessible::AccessibleParagraph::AccessibleParagraph (
- const lang::Locale& rLocale,
+PresenterAccessible::AccessibleParagraph::AccessibleParagraph(
const OUString& rsName,
SharedPresenterTextParagraph xParagraph,
const sal_Int32 nParagraphIndex)
- : PresenterAccessibleParagraphInterfaceBase(rLocale,
AccessibleRole::PARAGRAPH, rsName),
+ : PresenterAccessibleParagraphInterfaceBase(AccessibleRole::PARAGRAPH,
rsName),
mpParagraph(std::move(xParagraph)),
mnParagraphIndex(nParagraphIndex)
{
@@ -1553,16 +1536,13 @@ bool
PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int64 n
//===== AccessibleNotes =======================================================
-AccessibleNotes::AccessibleNotes (
- const css::lang::Locale& rLocale,
- const OUString& rsName)
- : AccessibleObject(rLocale,AccessibleRole::PANEL,rsName)
+AccessibleNotes::AccessibleNotes(const OUString& rsName)
+ : AccessibleObject(AccessibleRole::PANEL, rsName)
{
}
rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
- const lang::Locale& rLocale,
const Reference<awt::XWindow>& rxContentWindow,
const Reference<awt::XWindow>& rxBorderWindow,
-e
... etc. - the rest is truncated
