core.git: sc/source

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

 sc/source/ui/view/cellsh1.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7903e2b59fa000d67f8c5bc7a0536f40569489aa
Author:     Armin Le Grand (allotropia) <armin.le.grand.ext...@allotropia.de>
AuthorDate: Tue Oct 29 10:57:21 2024 +0100
Commit:     Armin Le Grand <armin.le.gr...@me.com>
CommitDate: Tue Oct 29 14:53:35 2024 +0100

    tdf#162692 partial take back of tdf#160252
    
    to no longer make the wrong data appear when a
    CF gets changed on one tab. For more info, see
    text in task.
    
    Change-Id: I7bf582eb9a2fe59b9a4b3d280639661c3aa7e608
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175779
    Reviewed-by: Armin Le Grand <armin.le.gr...@me.com>
    Tested-by: Jenkins

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 71a827abc1f3..c12077c76d2e 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2933,7 +2933,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     pDlg->SetModified();
 
                 pDlg->StartExecuteAsync(
-                    [pDlg, &rData, aPos](sal_Int32 nRet)
+                    [pDlg, &rData, pTabViewShell, rDlgItem, aPos](sal_Int32 
nRet)
                     {
                         std::unique_ptr<ScConditionalFormatList> 
pCondFormatList
                             = pDlg->GetConditionalFormatList();
@@ -2953,6 +2953,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         else
                             pCondFormatList.reset();
 
+                        if (rDlgItem)
+                            pTabViewShell->setScCondFormatDlgItem(nullptr);
+
                         pDlg->disposeOnce();
                     });
             }