[Libreoffice-commits] .: 2 commits - configmgr/source framework/source

[Caolán McNamara]

 configmgr/source/parsemanager.cxx                |    1 +
 framework/source/layoutmanager/layoutmanager.cxx |   11 ++---------
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 6bb0121249de3a35880c19c6eb9d3b2b583fe9bc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 18 19:56:21 2011 +0000

    WaE: fix dubious undefined behaviour

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 380df48..7b1a64d 100755
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -258,7 +258,7 @@ void LayoutManager::implts_lock()
 sal_Bool LayoutManager::implts_unlock()
 {
     WriteGuard aWriteLock( m_aLock );
-    m_nLockCount = std::max( --m_nLockCount, static_cast<sal_Int32>(0) );
+    m_nLockCount = std::max( m_nLockCount-1, static_cast<sal_Int32>(0) );
     return ( m_nLockCount == 0 );
 }
 
@@ -1659,7 +1659,6 @@ throw (uno::RuntimeException)
 {
     bool            bResult( false );
     bool            bNotify( false );
-    bool            bDoLayout( false );
     ::rtl::OUString aElementType;
     ::rtl::OUString aElementName;
 
@@ -1693,7 +1692,6 @@ throw (uno::RuntimeException)
                     pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
                     bResult   = true;
                     bNotify   = true;
-                    bDoLayout = true;
                 }
             }
         }
@@ -1704,7 +1702,6 @@ throw (uno::RuntimeException)
         implts_showProgressBar();
         bResult   = true;
         bNotify   = true;
-        bDoLayout = true;
     }
     else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ) && m_bVisible )
     {
@@ -1716,7 +1713,6 @@ throw (uno::RuntimeException)
         if ( pToolbarManager && bComponentAttached )
         {
                 bNotify   = pToolbarManager->requestToolbar( rResourceURL );
-            bDoLayout = true;
             }
     }
     else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
@@ -1875,7 +1871,6 @@ throw (RuntimeException)
 {
     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::hideElement" );
 
-    bool            bResult( false );
     bool            bNotify( false );
     bool            bMustLayout( false );
     ::rtl::OUString aElementType;
@@ -1901,7 +1896,6 @@ throw (RuntimeException)
                 if ( pMenuBar )
                 {
                     pMenuBar->SetDisplayable( sal_False );
-                    bResult = true;
                     bNotify = true;
                 }
             }
@@ -1916,12 +1910,11 @@ throw (RuntimeException)
             implts_writeWindowStateData( m_aStatusBarAlias, m_aStatusBarElement );
             bMustLayout = sal_True;
             bNotify     = sal_True;
-            bResult     = sal_True;
         }
     }
     else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
     {
-        bResult = bNotify = implts_hideProgressBar();
+        bNotify = implts_hideProgressBar();
     }
     else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
commit ec234ed518fef31125820497252a2c6d3e8fe421
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 18 16:41:29 2011 +0000

    WaE: id only used in debugging code

diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index d5a2d2d..c62df8e 100755
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -68,6 +68,7 @@ ParseManager::ParseManager(
             RTL_CONSTASCII_STRINGPARAM(
                 "http://www.w3.org/2001/XMLSchema-instance")));
     OSL_ASSERT(id == NAMESPACE_XSI);
+    (void)id;
 }
 
 bool ParseManager::parse() {