Kaydet (Commit) c0dcf497 authored tarafından Miklos Vajna's avatar Miklos Vajna

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
üst b5e9d7e8
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment