[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source

[Tor Lillqvist (via logerrit)]

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

New commits:
commit b2b5405031342e85dd2a33aaa45211fb81a1b73b
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 18 14:49:24 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Sep 19 22:41:07 2019 +0200

    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 at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

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