summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-01-18 14:49:24 +0200
committerTor Lillqvist <tml@collabora.com>2019-09-19 22:41:07 +0200
commitb2b5405031342e85dd2a33aaa45211fb81a1b73b (patch)
tree2943269493dbbcef57910be8c8021e16372f17b3
parent0c201da2e1b26b38376e7fc05ba6418acef58876 (diff)
Try ignoring RuntimeException in ComḿandBars(), VB6 clients don't like them?
Change-Id: Ia577174fac926295db439349f6caca178b363ba0 (cherry picked from commit f5499236c69d602ae518359c8e3e7d5e239b8eda) Reviewed-on: https://gerrit.libreoffice.org/79147 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index a691d61709ff..9b57e50b7348 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -167,7 +167,14 @@ SwVbaApplication::getOptions()
uno::Any SAL_CALL
SwVbaApplication::CommandBars( const uno::Any& aIndex )
{
- return VbaApplicationBase::CommandBars( aIndex );
+ try
+ {
+ return VbaApplicationBase::CommandBars( aIndex );
+ }
+ catch (const uno::RuntimeException&)
+ {
+ return uno::Any();
+ }
}
uno::Reference< word::XSelection > SAL_CALL