sfx2/source/view/viewsh.cxx | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
New commits:
commit 4e6848628cbff418896b7653eadac80c57ceaf25
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Sun Nov 5 21:08:26 2023 +0100
Commit: Marco Cecchetti <marco.cecche...@collabora.com>
CommitDate: Sun Nov 5 22:00:47 2023 +0100
lok: a11y: corelog: removing LOK_INFO in attachRecursive (3)
Change-Id: Ic2967d9fa24674ed61ab7a251bd2a584a74e4cea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158959
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Marco Cecchetti <marco.cecche...@collabora.com>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 916899fdd694..1b39dcaf7acf 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1702,21 +1702,28 @@ void LOKDocumentFocusListener::attachRecursive(
const uno::Reference< accessibility::XAccessibleContext >& xContext
)
{
- LOK_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(2):
xAccessible: " << xAccessible.get()
- << ", role: " << xContext->getAccessibleRole()
- << ", name: " << xContext->getAccessibleName()
- << ", parent: " << xContext->getAccessibleParent().get()
- << ", child count: " << xContext->getAccessibleChildCount());
+ try
+ {
+ LOK_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(2):
xAccessible: "
+ << xAccessible.get() << ", role: " <<
xContext->getAccessibleRole()
+ << ", name: " << xContext->getAccessibleName()
+ << ", parent: " <<
xContext->getAccessibleParent().get()
+ << ", child count: " <<
xContext->getAccessibleChildCount());
- sal_Int64 nStateSet = xContext->getAccessibleStateSet();
+ sal_Int64 nStateSet = xContext->getAccessibleStateSet();
- if (!m_bIsEditingCell)
+ if (!m_bIsEditingCell)
+ {
+ ::rtl::OUString sName = xContext->getAccessibleName();
+ m_bIsEditingCell = sName.startsWith("Cell");
+ }
+
+ attachRecursive(xAccessible, xContext, nStateSet);
+ }
+ catch (const uno::Exception& e)
{
- ::rtl::OUString sName = xContext->getAccessibleName();
- m_bIsEditingCell = sName.startsWith("Cell");
+ LOK_WARN("lok.a11y", "LOKDocumentFocusListener::attachRecursive(2):
raised exception: " << e.Message);
}
-
- attachRecursive(xAccessible, xContext, nStateSet);
}
void LOKDocumentFocusListener::attachRecursive(
@@ -1726,7 +1733,7 @@ void LOKDocumentFocusListener::attachRecursive(
)
{
aboutView("LOKDocumentFocusListener::attachRecursive (3)", this,
m_pViewShell);
- LOK_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #1:
this: " << this
+ SAL_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #1:
this: " << this
<< ", xAccessible: " << xAccessible.get()
<< ", role: " << xContext->getAccessibleRole()
<< ", name: " << xContext->getAccessibleName()
@@ -1740,12 +1747,12 @@ void LOKDocumentFocusListener::attachRecursive(
if (!xBroadcaster.is())
return;
- LOK_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #2:
xBroadcaster.is()");
+ SAL_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #2:
xBroadcaster.is()");
// If not already done, add the broadcaster to the list and attach as
listener.
const uno::Reference< uno::XInterface >& xInterface = xBroadcaster;
if( m_aRefList.insert(xInterface).second )
{
- LOK_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #3:
m_aRefList.insert(xInterface).second");
+ SAL_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #3:
m_aRefList.insert(xInterface).second");
xBroadcaster->addAccessibleEventListener(static_cast<
accessibility::XAccessibleEventListener *>(this));
if (isDocument(xContext->getAccessibleRole()))
