core.git: sc/source

[Armin Le Grand (allotropia) (via logerrit)]

 sc/source/ui/view/cellsh1.cxx  |    3 ---
 sc/source/ui/view/tabvwshc.cxx |    2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 387a9c445793e8377f85e508d935dc070fd8ab74
Author:     Armin Le Grand (allotropia) <armin.le.grand.ext...@allotropia.de>
AuthorDate: Fri Mar 29 16:28:04 2024 +0100
Commit:     Armin Le Grand <armin.le.gr...@me.com>
CommitDate: Wed Apr 3 15:49:06 2024 +0200

    tdf#160252 ITEM remove unnecessary cleanups of shared_ptr
    
    Change-Id: I5654d65097bf88b70cb85937de3ce111fa7e4345
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165552
    Tested-by: Jenkins
    Reviewed-by: Armin Le Grand <armin.le.gr...@me.com>

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index ac70ef49ae14..a8297303ee8f 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2919,9 +2919,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     else
                         pCondFormatList.reset();
 
-                    if (rDlgItem)
-                        pTabViewShell->setScCondFormatDlgItem(nullptr);
-
                     pDlg->disposeOnce();
                 });
             }
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index caa21c084c3f..7904290b6d5b 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -436,6 +436,8 @@ std::shared_ptr<SfxModelessDialogController> 
ScTabViewShell::CreateRefDialogCont
                 xResult = std::make_shared<ScCondFormatDlg>(pB, pCW, pParent, 
&rViewData, rDlgItem);
 
                 // Remove the pool item stored by Conditional Format Manager 
Dialog.
+                // tdf#160252 still needed *after* change to 
ScCondFormatDlgData due to
+                // UnitTest UITest_conditional_format
                 setScCondFormatDlgItem(nullptr);
             }