sfx2/source/view/viewsh.cxx | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 56b13bd6f251f66132e2131e4ba825c3e661293d
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Sun Nov 5 18:13:22 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Nov 12 13:02:03 2023 +0100
lok: a11y: corelog: re-introducing LOK_INFO in attachRecursive
Change-Id: I5866e9990a4758fad4b1c2a5e26072c31658db89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158955
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Marco Cecchetti <marco.cecche...@collabora.com>
(cherry picked from commit fd08e16e96cfd2d84b9eb4200f35fa6b4b4e3bd5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159335
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 66a86dc4cf60..5e725e18c1c2 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1690,7 +1690,7 @@ void LOKDocumentFocusListener::attachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible
)
{
- SAL_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(1):
xAccessible: " << xAccessible.get());
+ LOK_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(1):
xAccessible: " << xAccessible.get());
uno::Reference< accessibility::XAccessibleContext > xContext =
xAccessible->getAccessibleContext();
@@ -1704,7 +1704,7 @@ void LOKDocumentFocusListener::attachRecursive(
const uno::Reference< accessibility::XAccessibleContext >& xContext
)
{
- SAL_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(2):
xAccessible: " << xAccessible.get()
+ LOK_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(2):
xAccessible: " << xAccessible.get()
<< ", role: " << xContext->getAccessibleRole()
<< ", name: " << xContext->getAccessibleName()
<< ", parent: " << xContext->getAccessibleParent().get()
@@ -1728,7 +1728,7 @@ void LOKDocumentFocusListener::attachRecursive(
)
{
aboutView("LOKDocumentFocusListener::attachRecursive (3)", this,
m_pViewShell);
- SAL_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #1:
this: " << this
+ LOK_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #1:
this: " << this
<< ", xAccessible: " << xAccessible.get()
<< ", role: " << xContext->getAccessibleRole()
<< ", name: " << xContext->getAccessibleName()
@@ -1741,12 +1741,12 @@ void LOKDocumentFocusListener::attachRecursive(
if (!xBroadcaster.is())
return;
- SAL_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #2:
xBroadcaster.is()");
+ LOK_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 )
{
- SAL_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #3:
m_aRefList.insert(xInterface).second");
+ LOK_INFO("lok.a11y", "LOKDocumentFocusListener::attachRecursive(3) #3:
m_aRefList.insert(xInterface).second");
xBroadcaster->addAccessibleEventListener(static_cast<
accessibility::XAccessibleEventListener *>(this));
if (isDocument(xContext->getAccessibleRole()))
commit 1b0107429da1895c992789a2f610d70dbd05000e
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Sun Nov 5 16:26:11 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Nov 12 13:01:50 2023 +0100
lok: a11y: corelog: re-introducing LOK_WARN in viewsh
Change-Id: Ia76e079da1f532b0a4ce9ba24de1b058deef5a12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158953
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Marco Cecchetti <marco.cecche...@collabora.com>
(cherry picked from commit 6a9c4306c9c8173ff99184199b18f24f05b35b51)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159334
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c335b0555280..66a86dc4cf60 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -541,7 +541,7 @@ void aboutEvent(std::string msg, const
accessibility::AccessibleEventObject& aEv
}
catch( const lang::IndexOutOfBoundsException& /*e*/ )
{
- SAL_WARN("lok.a11y", "Focused object has invalid index in parent");
+ LOK_WARN("lok.a11y", "Focused object has invalid index in parent");
}
}
@@ -1650,7 +1650,7 @@ void LOKDocumentFocusListener::notifyEvent(const
accessibility::AccessibleEventO
}
catch( const lang::IndexOutOfBoundsException& )
{
- SAL_WARN("lok.a11y",
+ LOK_WARN("lok.a11y",
"LOKDocumentFocusListener::notifyEvent:Focused object has
invalid index in parent");
}
}
@@ -1680,7 +1680,7 @@ uno::Reference< accessibility::XAccessible >
LOKDocumentFocusListener::getAccess
}
}
- SAL_WARN("lok.a11y",
+ LOK_WARN("lok.a11y",
"LOKDocumentFocusListener::getAccessible: Can't get any
accessible object from event source.");
return uno::Reference< accessibility::XAccessible >();
@@ -3374,7 +3374,7 @@ void SfxViewShell::SetLOKAccessibilityState(bool bEnabled)
}
catch (const uno::Exception&)
{
- SAL_WARN("lok.a11y", "SetLOKAccessibilityState: Exception caught
processing LOKDocumentFocusListener::attachRecursive");
+ LOK_WARN("SetLOKAccessibilityState", "Exception caught processing
LOKDocumentFocusListener::attachRecursive");
}
}
else
@@ -3385,7 +3385,7 @@ void SfxViewShell::SetLOKAccessibilityState(bool bEnabled)
}
catch (const uno::Exception&)
{
- SAL_WARN("lok.a11y", "SetLOKAccessibilityState: Exception caught
processing LOKDocumentFocusListener::detachRecursive");
+ LOK_WARN("SetLOKAccessibilityState", "Exception caught processing
LOKDocumentFocusListener::detachRecursive");
}
}
}
