[Libreoffice-commits] .: 2 commits - cui/source editeng/source

[Libreoffice Gerrit user]

 cui/source/customize/cfg.cxx         |    3 ++-
 cui/source/inc/cfg.hxx               |    3 ---
 editeng/source/outliner/outliner.cxx |    4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 243630f394d5a332a7b214970b1f9924650f0255
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 17 08:30:18 2012 +0100

    fdo#58362 do not crash on customize toolbar
    
    Change-Id: I7102a1635329b3bcdd3bf6bc250555cc71e0977e

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 1c234cb..aadccd8 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 87c758d..0dc86a5 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
commit 7cc485c88f1722b14bdc0dc07b7ada7ab3cf65d9
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 11 16:10:50 2012 +0100

    drop useless check
    
    Change-Id: I3da8370930bafa6e1744291391c71871d203bb00

diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 4fa52bd..607e66a 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -556,10 +556,6 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
 
     ImplBlockInsertionCallbacks( sal_True );
     pEditEngine->SetText(rPObj.GetTextObject());
-    if( rPObj.Count() != pEditEngine->GetParagraphCount() )
-    {
-        int nop=0;nop++;
-    }
 
     bFirstParaIsEmpty = sal_False;