diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-05 16:48:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-05 20:41:05 +0000 |
| commit | a96c4e3b1456d0f11fcd3e3374b0d457374e207b (patch) | |
| tree | 7041265ddee004d1743720487e824e5012e45376 /sd | |
| parent | 5a6195974b8d1bb2ed15d80523782c062e886b93 (diff) | |
coverity#704760 Dereference after null check
Change-Id: I16a1b9803eb4cbd6ce77c9017262093908261097
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/futext.cxx | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 5555d3ab1cd8..615ee4b04188 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -614,17 +614,24 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) if (mxTextObj.is()) { - const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); + bool bReset = true; - if (rMarkList.GetMarkCount() == 1 - && ( rMarkList.GetMark(0)->GetMarkedSdrObj() == mxTextObj.get()) ) + if (mpView) { - if( mxTextObj.is() && !GetTextObj()->GetOutlinerParaObject() ) - bEmptyTextObj = sal_True; - else - bFirstObjCreated = sal_True; + const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); + + if (rMarkList.GetMarkCount() == 1 + && ( rMarkList.GetMark(0)->GetMarkedSdrObj() == mxTextObj.get()) ) + { + if( mxTextObj.is() && !GetTextObj()->GetOutlinerParaObject() ) + bEmptyTextObj = sal_True; + else + bFirstObjCreated = sal_True; + bReset = false; + } } - else + + if (bReset) { mxTextObj.reset( 0 ); } |