mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#123819: Revert "Use comphelper::getProcessComponentContext()"

Browse Source 
Even though in theory it was worse to get an exception and return an
empty Any for CommandBars, in practice there are not resources to
figure out why that change apparently then caused a crash in the
customer application. Let's hope that it doesn't actually need the
CommandBars object for anything essential.

This reverts commit 87b4bd61792b28fe475c71d4484cd219c1e533ae.

Change-Id: Id2ec3a7254c5dd5a36ce2d5e930a457b9abd44f1
Reviewed-on: https://gerrit.libreoffice.org/68881
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Tor Lillqvist
2019-03-07 15:49:21 +02:00
parent 4985bdc407
commit 50ffab5ff0
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vbahelper/source/vbahelper/vbacommandbarhelper.cxx
View File

@@ -111,13 +111,12 @@ void VbaCommandBarHelper::Init( )
throw uno::RuntimeException( "Not implemented" );
}
css::uno::Reference< css::uno::XComponentContext > xContext(comphelper::getProcessComponentContext());
css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUICfgMgrSupp(
css::ui::theModuleUIConfigurationManagerSupplier::get( xContext ) );
css::ui::theModuleUIConfigurationManagerSupplier::get(mxContext) );
m_xAppCfgMgr.set( xUICfgMgrSupp->getUIConfigurationManager( maModuleId ), uno::UNO_QUERY_THROW );
css::uno::Reference< css::container::XNameAccess > xNameAccess = css::ui::theWindowStateConfiguration::get( xContext );
css::uno::Reference< css::container::XNameAccess > xNameAccess = css::ui::theWindowStateConfiguration::get( mxContext );
m_xWindowState.set( xNameAccess->getByName( maModuleId ), uno::UNO_QUERY_THROW );
}