Skip to content

C
core
Kaydet (Commit) a28ad8c9 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

coverity#1265798 Dereference null return value 

Change-Id: Ic4a9a42bafdc72be3de067b5f47dc98f0250f575
üst 397ca5ca
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
sd/source/ui/func/fudraw.cxx
Dosyayı görüntüle @ a28ad8c9
...@@ -523,7 +523,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) ...@@ -523,7 +523,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
mpViewShell->GetViewFrame()->HasChildWindow(SvxBmpMaskChildWindow::GetChildWindowId())) mpViewShell->GetViewFrame()->HasChildWindow(SvxBmpMaskChildWindow::GetChildWindowId()))
{ {
// pipette mode // pipette mode
SfxChildWindow* pWnd = mpViewShell->GetViewFrame()->GetChildWindow(SvxBmpMaskChildWindow::GetChildWindowId()); SfxChildWindow* pWnd = mpViewShell->GetViewFrame()->GetChildWindow(SvxBmpMaskChildWindow::GetChildWindowId());
SvxBmpMask* pMask = pWnd ? static_cast<SvxBmpMask*>(pWnd->GetWindow()) : NULL; SvxBmpMask* pMask = pWnd ? static_cast<SvxBmpMask*>(pWnd->GetWindow()) : NULL;
if (pMask && pMask->IsEyedropping()) if (pMask && pMask->IsEyedropping())
{ {
......
sd/source/ui/view/drviews6.cxx
Dosyayı görüntüle @ a28ad8c9
...@@ -301,21 +301,21 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) ...@@ -301,21 +301,21 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq )
} }
} }
if( bCont ) SfxChildWindow* pWnd = GetViewFrame()->GetChildWindow(
SvxBmpMaskChildWindow::GetChildWindowId());
SvxBmpMask* pBmpMask = pWnd ? static_cast<SvxBmpMask*>(pWnd->GetWindow()) : NULL;
assert(pBmpMask);
if (bCont && pBmpMask)
{ {
const Graphic& rOldGraphic = pNewObj->GetGraphic(); const Graphic& rOldGraphic = pNewObj->GetGraphic();
const Graphic aNewGraphic( static_cast<SvxBmpMask*>( GetViewFrame()->GetChildWindow( const Graphic aNewGraphic(pBmpMask->Mask(rOldGraphic));
SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )->
Mask( rOldGraphic ) );
if( aNewGraphic != rOldGraphic ) if( aNewGraphic != rOldGraphic )
{ {
SdrPageView* pPV = mpDrawView->GetSdrPageView(); SdrPageView* pPV = mpDrawView->GetSdrPageView();
pNewObj->SetEmptyPresObj( false ); pNewObj->SetEmptyPresObj( false );
pNewObj->SetGraphic( static_cast<SvxBmpMask*>( GetViewFrame()->GetChildWindow( pNewObj->SetGraphic(pBmpMask->Mask(pNewObj->GetGraphic()));
SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )->
Mask( pNewObj->GetGraphic() ) );
OUString aStr( mpDrawView->GetDescriptionOfMarkedObjects() ); OUString aStr( mpDrawView->GetDescriptionOfMarkedObjects() );
aStr += " " + SD_RESSTR(STR_EYEDROPPER); aStr += " " + SD_RESSTR(STR_EYEDROPPER);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment