From 243630f394d5a332a7b214970b1f9924650f0255 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 17 Dec 2012 08:30:18 +0100 Subject: fdo#58362 do not crash on customize toolbar Change-Id: I7102a1635329b3bcdd3bf6bc250555cc71e0977e --- cui/source/customize/cfg.cxx | 3 ++- cui/source/inc/cfg.hxx | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'cui') diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 1c234cbc56a8..aadccd82cb94 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -3706,9 +3706,10 @@ ToolbarSaveInData::ToolbarSaveInData( m_aDescriptorContainer ( ITEM_DESCRIPTOR_CONTAINER ) { + uno::Reference xContext = ::comphelper::getProcessComponentContext(); // Initialize the m_xPersistentWindowState variable which is used // to get the default properties of system toolbars such as name - uno::Reference< container::XNameAccess > xPWSS = css::ui::WindowStateConfiguration::create( m_xContext ); + uno::Reference< container::XNameAccess > xPWSS = css::ui::WindowStateConfiguration::create( xContext ); xPWSS->getByName( aModuleId ) >>= m_xPersistentWindowState; } diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 87c758dd6b0c..0dc86a57086b 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -131,9 +131,6 @@ public: < ::com::sun::star::ui::XImageManager > GetParentImageManager() { return m_xParentImgMgr; }; - ::com::sun::star::uno::Reference - < com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference < com::sun::star::container::XNameAccess > m_xCommandToLabelMap; -- cgit