diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-17 08:30:18 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-12-17 08:30:18 +0100 |
| commit | 243630f394d5a332a7b214970b1f9924650f0255 (patch) | |
| tree | 35255db967ec9700c0087df58b511f68d8bd550a /cui | |
| parent | 7cc485c88f1722b14bdc0dc07b7ada7ab3cf65d9 (diff) | |
fdo#58362 do not crash on customize toolbar
Change-Id: I7102a1635329b3bcdd3bf6bc250555cc71e0977e
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 3 | ||||
| -rw-r--r-- | cui/source/inc/cfg.hxx | 3 |
2 files changed, 2 insertions, 4 deletions
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<uno::XComponentContext> 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 @@ -132,9 +132,6 @@ public: 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; com::sun::star::uno::Sequence |