summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-02-21 12:02:33 +0000
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2022-02-23 13:07:43 +0100
commit72b2afe901b4d830f81152e8c1d1de54ed0fee17 (patch)
tree8a4655b3a5e772a2962a96e93ca046ec1aeee8ca
parentf096ab00cd946f194ae5d3358c5077f1b3d40f6e (diff)
cid#1500612 Dereference after null check
otherwise this doesn't make sense Change-Id: I321a86cf8f9f05639b686a4c15b2e8fca2e10955 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130255 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit ec21d93f5b649353439d7498d9e0fb9136a5fb6b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130322 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--sw/source/core/layout/fly.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 8a6cad12ecfc..1a0a93e5fc01 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1909,7 +1909,7 @@ void SwFlyFrame::ActiveUnfloatButton(SwWrtShell* pWrtSh)
SwEditWin& rEditWin = pWrtSh->GetView().GetEditWin();
SwFrameControlsManager& rMngr = rEditWin.GetFrameControlsManager();
SwFrameControlPtr pControl = rMngr.GetControl(FrameControlType::FloatingTable, this);
- if (pControl || pControl->GetWindow())
+ if (pControl && pControl->GetWindow())
{
pControl->GetWindow()->MouseButtonDown(MouseEvent());
}