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

[Caolán McNamara]

 configmgr/source/components.cxx                  |    5 ++++-
 desktop/source/deployment/gui/dp_gui_dialog2.cxx |   10 ++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 1240f54ad459fc4bc2214b542a156b34e8c25925
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 13 14:24:23 2010 +0000

    cppcheck: unused variables

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 53628fb..9b23ed5 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1154,12 +1154,11 @@ void ExtMgrDialog::Resize()
     if( IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
     {
         ImplControlValue aValue;
-        bool bNativeOK;
         Rectangle aControlRegion( Point( 0, 0 ), m_aProgressBar.GetSizePixel() );
         Rectangle aNativeControlRegion, aNativeContentRegion;
-        if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
+        if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
                                                  CTRL_STATE_ENABLED, aValue, rtl::OUString(),
-                                                 aNativeControlRegion, aNativeContentRegion ) ) != FALSE )
+                                                 aNativeControlRegion, aNativeContentRegion ) != FALSE )
         {
             nProgressHeight = aNativeControlRegion.GetHeight();
         }
@@ -1599,12 +1598,11 @@ void UpdateRequiredDialog::Resize()
     if( IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
     {
         ImplControlValue aValue;
-        bool bNativeOK;
         Rectangle aControlRegion( Point( 0, 0 ), m_aProgressBar.GetSizePixel() );
         Rectangle aNativeControlRegion, aNativeContentRegion;
-        if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
+        if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
                                                  CTRL_STATE_ENABLED, aValue, rtl::OUString(),
-                                                 aNativeControlRegion, aNativeContentRegion ) ) != FALSE )
+                                                 aNativeControlRegion, aNativeContentRegion ) != FALSE )
         {
             nProgressHeight = aNativeControlRegion.GetHeight();
         }
commit e65850b4411c59a5c664b002c6ab4ae385fd2261
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 13 12:48:47 2010 +0000

    valgrind: don't leave an evil thread running after main is completed

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index e6cfb10..44c2d32 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -595,7 +595,10 @@ Components::Components(
     RTL_LOGFILE_TRACE_AUTHOR("configmgr", "sb", "end parsing");
 }
 
-Components::~Components() {}
+Components::~Components()
+{
+    flushModifications();
+}
 
 void Components::parseFileLeniently(
     FileParser * parseFile, rtl::OUString const & url, int layer, Data & data,