From 87b6dac1581cf224f67e86a048deef5fed2e72f9 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Fri, 18 Jan 2019 14:49:24 +0200
Subject: Try ignoring RuntimeException in ComḿandBars(), VB6 clients don't
 like them?
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ia577174fac926295db439349f6caca178b363ba0
---
 sw/source/ui/vba/vbaapplication.cxx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index b9c8bd5f4055..9c7937c4ee62 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
-- 
cgit