diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-09 10:21:50 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-09 10:42:39 +0100 |
| commit | c0dcf49731c66b7169f668328ed4df73d1920b09 (patch) | |
| tree | 50123b827a91e206d35186f1c60a264a69305c5d /sw | |
| parent | b5e9d7e83419c1c7e143732ad162d6fc56882de8 (diff) | |
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
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index bddd82e883b8..ada85e92587a 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(); |