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

Julien Nabet serval2412 at yahoo.fr
Thu Aug 22 22:43:13 PDT 2013


 cui/source/tabpages/backgrnd.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit b51dc041b5c4cdec2ba89984c38bc6d1f0cff178
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Aug 23 07:42:43 2013 +0200

    cppcheck: reduce scope + remove commented lines
    
    Change-Id: I51656a8bce5c2fdaf267582846ab82df838f05a6

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index b1dae28..4e002f8 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -660,11 +660,10 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
     sal_uInt16 nSlot = SID_VIEW_FLD_PIC;
     sal_uInt16 nWhich = GetWhich( nSlot );
     SvxBrushItem* pTemp = 0;
-    const CntWallpaperItem* pItem = 0;
 
     if ( rSet.GetItemState( nWhich, sal_False ) >= SFX_ITEM_AVAILABLE )
     {
-        pItem = (const CntWallpaperItem*)&rSet.Get( nWhich );
+        const CntWallpaperItem* pItem = (const CntWallpaperItem*)&rSet.Get( nWhich );
         pTemp = new SvxBrushItem( *pItem, nWhich );
         pBgdAttr = pTemp;
     }
@@ -697,8 +696,6 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
     bLinkOnly = sal_True;
     m_pBtnLink->Check( sal_True );
     m_pBtnLink->Show( sal_False );
-//  if( !pItem || !pItem->GetWallpaper(sal_False).IsBitmap() )
-//      m_pBtnLink->Check();
 
     delete pTemp;
 }


More information about the Libreoffice-commits mailing list