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

Julien Nabet serval2412 at yahoo.fr
Thu Jun 13 11:37:21 PDT 2013


 framework/source/layoutmanager/layoutmanager.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 14ed0d1629daf8c53783c2c2230480de56a0f97a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Jun 13 20:36:41 2013 +0200

    cppcheck: fix redundant assignments
    
    Change-Id: I3fb495c6e18b3cb5e9d4beca4212d4aa8097401e

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 8bb3f0f..9da074e 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2748,11 +2748,9 @@ void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent ) thro
     Reference< XInterface > xIfac( xContainerWindow, UNO_QUERY );
     if ( xIfac == aEvent.Source )
     {
-        bool bSetVisible = false;
-
         WriteGuard aWriteLock( m_aLock );
         m_bParentWindowVisible = true;
-        bSetVisible = ( m_bParentWindowVisible != bParentWindowVisible );
+        bool bSetVisible = ( m_bParentWindowVisible != bParentWindowVisible );
         aWriteLock.unlock();
 
         if ( bSetVisible )
@@ -2770,11 +2768,9 @@ void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) thr
     Reference< XInterface > xIfac( xContainerWindow, UNO_QUERY );
     if ( xIfac == aEvent.Source )
     {
-        bool bSetInvisible = false;
-
         WriteGuard aWriteLock( m_aLock );
         m_bParentWindowVisible = false;
-        bSetInvisible = ( m_bParentWindowVisible != bParentWindowVisible );
+        bool bSetInvisible = ( m_bParentWindowVisible != bParentWindowVisible );
         aWriteLock.unlock();
 
         if ( bSetInvisible )


More information about the Libreoffice-commits mailing list