diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-12-24 16:40:38 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-12-24 16:40:58 +0100 |
| commit | 4df49447134a08b58a579f5bb65c6e1055b855bd (patch) | |
| tree | b66d2c6fa14d8123fffd892f7cb7a93b8a88ce64 /sd/source/ui/view | |
| parent | Some cppcheck cleaning in framework (diff) | |
| download | core-4df49447134a08b58a579f5bb65c6e1055b855bd.tar.gz core-4df49447134a08b58a579f5bb65c6e1055b855bd.zip | |
Some cppcheck cleaning in sd
Change-Id: I48b86bf206808e1d19343622b640c80b61b40a48
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsg.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 9871c3d5d537..001d5d674a53 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -400,12 +400,11 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); const SdrObject* pObj = NULL; sal_uInt16 nId = SvxBmpMaskChildWindow::GetChildWindowId(); - SvxBmpMask* pDlg = NULL; sal_Bool bEnable = sal_False; if ( GetViewFrame()->HasChildWindow( nId ) ) { - pDlg = (SvxBmpMask*) ( GetViewFrame()->GetChildWindow( nId )->GetWindow() ); + SvxBmpMask* pDlg = (SvxBmpMask*) ( GetViewFrame()->GetChildWindow( nId )->GetWindow() ); if ( pDlg->NeedsColorList() ) pDlg->SetColorList( GetDoc()->GetColorList() ); diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index 6318b10770a3..eee39f0ba3ef 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -84,12 +84,11 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) if( GetViewFrame()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) { const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - const SdrObject* pObj = NULL; sal_uLong nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount == 1 ) { - pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); + const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); SvxIMapDlg* pImageMapDialog = ViewShell::Implementation::GetImageMapDialog(); if ( ( pObj->ISA( SdrGrafObj ) /*|| pObj->ISA( SdrOle2Obj )*/ ) |