[Libreoffice-commits] .: sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/bastyp/fltfnc.cxx       |    1 -
 sfx2/source/control/dispatch.cxx    |    2 --
 sfx2/source/dialog/dinfdlg.cxx      |    5 -----
 sfx2/source/dialog/securitypage.cxx |    5 -----
 4 files changed, 13 deletions(-)

New commits:
commit a599f5b4b51848e3b397d471c9d12b373caadcef
Author: jailletc36 <christophe.jaillet at wanadoo.fr>
Date:   Thu Nov 8 07:25:02 2012 +0100

    cppCheck: Unused variable and Redundant assignment
    
    Change-Id: I67084c1cb9dc23eb77787d2a6d57a5b70126873c
    Signed-off-by: jailletc36 <christophe.jaillet at wanadoo.fr>
    Reviewed-on: https://gerrit.libreoffice.org/1005
    Reviewed-by: Radek Doulík <rodo at novell.com>
    Tested-by: Radek Doulík <rodo at novell.com>

diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 14df8c4..60de316 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -1147,7 +1147,6 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
                     SfxFilter* pFilter;
                     for ( size_t i = 0, n = rList.size(); i < n; ++i )
                     {
-                        pFilter = NULL;
                         pFilter = rList[ i ];
                         pFilter->nFormatType |= SFX_FILTER_NOTINSTALLED;
                     }
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 069273e..935077c 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2073,7 +2073,6 @@ SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, co
     SfxDispatcher &rDisp = *SFX_APP()->GetDispatcher_Impl();
     sal_uInt16 nShLevel = 0;
     SfxShell *pSh;
-    nShLevel=0;
 
     if ( rDisp.pImp->bQuiet )
     {
@@ -2101,7 +2100,6 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin
     sal_uInt16 nShLevel = 0;
     SfxShell *pSh;
 
-    nShLevel=0;
     if ( rDisp.pImp->bQuiet )
     {
         nConfigId = 0;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index ee59b5e..99d7dbf 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2321,11 +2321,6 @@ CustomPropertiesControl::CustomPropertiesControl( Window* pParent, const ResId&
     m_aVertScroll.SetPageSize( nVisibleEntries - 1 );
     m_aVertScroll.SetVisibleSize( nVisibleEntries );
 
-    Point aPos = m_aHeaderBar.GetPosPixel();
-    Size aSize = m_aHeaderBar.GetSizePixel();
-    aPos = m_aVertScroll.GetPosPixel();
-    aSize = m_aVertScroll.GetSizePixel();
-
     Link aScrollLink = LINK( this, CustomPropertiesControl, ScrollHdl );
     m_aVertScroll.SetScrollHdl( aScrollLink );
 }
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index ffa3a7a..b4de6af 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -200,11 +200,6 @@ SfxSecurityPage_Impl::SfxSecurityPage_Impl( SfxSecurityPage &rTabPage, const Sfx
     m_bEndRedliningWarningDone      ( false )
 {
     m_aChangeProtectionPB.SetText( m_aProtectSTR );
-    // adjust button width if necessary
-    long nBtnTextWidth = 0;
-    long nTemp = m_aChangeProtectionPB.GetCtrlTextWidth( m_aChangeProtectionPB.GetText() );
-    if (nTemp > nBtnTextWidth)
-        nBtnTextWidth = nTemp;
 
     // force toggle hdl called before visual change of checkbox
     m_aRecordChangesCB.SetStyle( m_aRecordChangesCB.GetStyle() | WB_EARLYTOGGLE );