summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-12-15 23:08:53 +0100
committerMichael Stahl <mstahl@redhat.com>2016-12-19 19:48:07 +0000
commit2e74bf2e05f0c98bb9ca318e6b0f9e715d0fdba7 (patch)
tree31cb69c2477b62b59a167a5438c748d66b9c295f
parentb8210011695eef5cb63e479d806baa13c4373516 (diff)
tdf#104488 sw: assert if exception escapes from UpdateAccessible()
SwViewShellImp::UpdateAccessible() is called during scrolling and the like, and if the a11y code doesn't catch the exceptions the document view won't get repainted. Change-Id: I4ec591aacf514bef8c5a66a7e674b0cee3b7201a (cherry picked from commit 9ada2da6f1bceb5d24f23d8df08103535714918a) Reviewed-on: https://gerrit.libreoffice.org/32189 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sw/source/core/view/viewimp.cxx12
1 files changed, 11 insertions, 1 deletions
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index e403be91202e..335f45a38d1a 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -297,7 +297,17 @@ void SwViewShellImp::UpdateAccessible()
OSL_ENSURE( pWin, "no window, no access" );
if( IsAccessible() && rIDLA.GetCurrentViewShell() && pWin )
- GetAccessibleMap().GetDocumentView();
+ {
+ try
+ {
+ GetAccessibleMap().GetDocumentView();
+ }
+ catch (uno::Exception const& e)
+ {
+ SAL_WARN("sw.a11y", "exception: " << e.Message);
+ assert(!"SwViewShellImp::UpdateAccessible: unhandled exception");
+ }
+ }
}
void SwViewShellImp::DisposeAccessible(const SwFrame *pFrame,