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

[Libreoffice Gerrit user]

 vbahelper/source/vbahelper/vbacommandbarhelper.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 50ffab5ff0b17add475c3199cd889196d4af2ce2
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Mar 7 15:49:21 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Mar 7 20:49:48 2019 +0100

    tdf#123819: Revert "Use comphelper::getProcessComponentContext()"
    
    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 at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
index 533f96713d18..1406376ed307 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
@@ -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 );
 }