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-16 10:20:50 +0100
commit9ada2da6f1bceb5d24f23d8df08103535714918a (patch)
treeb9814bf09251055b70727095a11eb8dfc2956ce8
parentffb5bf421f5c0c565128116df40318f5b707b821 (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
-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,