[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/filter/ww8/ww8par.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c0dcf49731c66b7169f668328ed4df73d1920b09
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Dec 9 10:21:50 2014 +0100

    SwWW8ImplReader::CoreLoad: tolerate missing ooo.vba.word.Globals
    
    SwDoc::GetVbaEventProcessor() already tolerates missing VBA related UNO
    components, do the same here. This fixes loading of a simple .doc file
    on Android.
    
    Change-Id: Ie45c34ca36e5c888b9719bb056946d3778fd6df4

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index bddd82e..ada85e9 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5188,7 +5188,14 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
             uno::Any aGlobs;
             uno::Sequence< uno::Any > aArgs(1);
             aArgs[ 0 ] <<= mpDocShell->GetModel();
-            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( "ooo.vba.word.Globals", aArgs );
+            try
+            {
+                aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( "ooo.vba.word.Globals", aArgs );
+            }
+            catch (const uno::Exception& rException)
+            {
+                SAL_WARN("sw.ww8", "SwWW8ImplReader::CoreLoad: ooo.vba.word.Globals is not available");
+            }
 
 #if HAVE_FEATURE_SCRIPTING
             BasicManager *pBasicMan = mpDocShell->GetBasicManager();