[Libreoffice-commits] core.git: 4 commits - framework/source sw/source

[Andre Fischer]

 framework/source/layoutmanager/layoutmanager.cxx |    1 +
 sw/source/filter/ww8/rtfsdrexport.cxx            |    1 +
 sw/source/filter/ww8/ww8par.hxx                  |    1 -
 sw/source/ui/inc/cfgitems.hxx                    |    1 -
 4 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ce96f8b02e490b74bff57ca57a2c6a86c3041e32
Author: Andre Fischer <af at apache.org>
Date:   Tue Feb 18 09:21:55 2014 +0000

    Resolves: #i122576# Reset the docking area acceptor in the destructor
    
    (cherry picked from commit 0e90517f3dd568cfe2be4bf8c256b94c9401d046)
    
    Conflicts:
    	framework/source/layoutmanager/layoutmanager.cxx
    
    Change-Id: Ib053a1b474434f81608a04ca0d30dd32fe410e5a

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index d1267dbe..2b570dd 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -155,6 +155,7 @@ LayoutManager::~LayoutManager()
 {
     Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
     m_aAsyncLayoutTimer.Stop();
+    setDockingAreaAcceptor(NULL);
     delete m_pGlobalSettings;
 }
 
commit 5bb7c0ab476ca108aecb5bf43ec9adc6d173f13b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 19 10:21:10 2014 +0000

    coverity#738892 Uninitialized scalar field
    
    Change-Id: I4eecd759cf22f91a98830fc51b394ac959d6dc8a

diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 9a2f051..86989b8 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -39,6 +39,7 @@ RtfSdrExport::RtfSdrExport( RtfExport &rExport )
       m_rAttrOutput( (RtfAttributeOutput&)m_rExport.AttrOutput() ),
       m_pSdrObject( NULL ),
       m_nShapeType( ESCHER_ShpInst_Nil ),
+      m_nShapeFlags ( 0 ) ,
       m_pShapeStyle( new OStringBuffer( 200 ) ),
       m_pShapeTypeWritten( new bool[ ESCHER_ShpInst_COUNT ] )
 {
commit 03fb400dc3900d0ca063d9a25b5265ba4e451486
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 19 10:19:46 2014 +0000

    coverity#738895 unused member
    
    Change-Id: I6bca0a36708e4e8fd3a22a23d76a89525b6d75bc

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index d98eb0a..ba6ec23 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -640,7 +640,6 @@ public:
 
     sal_uInt16 hpsCheckBox;
     sal_uInt16 nChecked;
-    sal_uInt16 nDefaultChecked;
 
     OUString sTitle;
     OUString sDefault;
commit 285d1d1a5df5398d78bd45e6641cea371f9bbc17
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 19 10:18:14 2014 +0000

    coverity#738899 unused member
    
    Change-Id: I3f96d50709c9a6832192b97d4174b9cea07c5057

diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index af77a76..e78f850 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.hxx
@@ -91,7 +91,6 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem
     bool bSmoothScroll  :1;
     //visual aids
     bool bCrosshair     :1;
-    bool bHandles       :1;
     //display
     bool bTable             :1;
     bool bGraphic           :1;