diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-08 10:27:53 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-08 10:56:40 +0200 |
commit | de1f156c6a35757d74b0e337b02743f1962ff0ae (patch) | |
tree | 08556f9e0a21a3bca6bb5847b88abb3a3dc899c8 /desktop | |
parent | dd7d97589bcbed22cf2dd12b574fc28baedf24af (diff) |
lok::Document::initializeForRendering(): handle lack of lok_init()
Normally lok_init() sets the component context, but not e.g. during unit
testing.
Change-Id: If3760f31af2e4b870f65e5aa7557607e8b6a1114
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/lib/init.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 5883857d1a8f..dc738921a04f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -569,6 +569,14 @@ static void doc_iniUnoCommands () return; } + if (!xContext.is()) + xContext = comphelper::getProcessComponentContext(); + if (!xContext.is()) + { + SAL_WARN("lok", "iniUnoCommands: Component context is not available"); + return; + } + SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool(pViewFrame); uno::Reference<util::XURLTransformer> xParser(util::URLTransformer::create(xContext)); |