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

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/tabvwshc.cxx |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit ff7015fd3576d3908f2bbfd267c89642e95f3e38
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jul 22 11:11:39 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 22 15:15:50 2019 +0200

    cid#1448220 Explicit null dereferenced
    
    Change-Id: I0e612cf738d54e2108458da5c4afe78f1699f475
    Reviewed-on: https://gerrit.libreoffice.org/76105
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 939a7224615d..8e4dc812c2a0 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -408,26 +408,26 @@ std::unique_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont
         }
         case WID_CONDFRMT_REF:
         {
-            bool        bFound      = false;
             const ScCondFormatDlgItem* pDlgItem = nullptr;
             // Get the pool item stored by Conditional Format Manager Dialog.
-            const SfxPoolItem* pItem = nullptr;
             auto itemsRange = GetPool().GetItemSurrogates(SCITEM_CONDFORMATDLGDATA);
             if (itemsRange.begin() != itemsRange.end())
             {
-                pItem = *itemsRange.begin();
+                const SfxPoolItem* pItem = *itemsRange.begin();
                 pDlgItem = static_cast<const ScCondFormatDlgItem*>(pItem);
-                bFound = true;
             }
 
-            ScViewData& rViewData = GetViewData();
-            rViewData.SetRefTabNo( rViewData.GetTabNo() );
+            if (pDlgItem)
+            {
+                ScViewData& rViewData = GetViewData();
+                rViewData.SetRefTabNo( rViewData.GetTabNo() );
+
+                xResult.reset(new ScCondFormatDlg(pB, pCW, pParent, &rViewData, pDlgItem));
 
-            xResult.reset(new ScCondFormatDlg(pB, pCW, pParent, &rViewData, pDlgItem));
+                // Remove the pool item stored by Conditional Format Manager Dialog.
+                GetPool().Remove(*pDlgItem);
+            }
 
-            // Remove the pool item stored by Conditional Format Manager Dialog.
-            if ( bFound && pItem )
-                GetPool().Remove( *pItem );
             break;
         }
     }