[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source

[Julien Nabet (via logerrit)]

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

New commits:
commit 9330757e4c39b9cecfc2b08294de337129bca317
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Tue Sep 20 21:25:48 2022 +0200
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Oct 3 16:06:00 2022 +0200

    tdf#117764: fix context menu item "Conditional formatting"
    
    Respond to https://bugs.documentfoundation.org/show_bug.cgi?id=117764#c1
    a) the function should be *available* on "clean" cells (removed after 
comment in gerrit)
    b) answering "No", one would not edit the existing format, *but will edit a 
new format instead*
    c) answering "Yes", one would edit the existing format
    
    Change-Id: I8c578a59084c557939a853d4746efffbaf4e56e3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140266
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    (cherry picked from commit 45bee7678319325942664d23688367c639bdf83b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140882
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 17c4936567f9..a48c7ece8e46 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2213,6 +2213,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         {
                             pCondFormat = pList->GetFormat(rCondFormats[0]);
                             assert(pCondFormat);
+                            nIndex = pCondFormat->GetKey();
                             bCondFormatDlg = true;
                         }
                         else
@@ -2225,7 +2226,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     else
                     {
                         // define an overlapping conditional format
-                        // does not need to be handled here
+                        pCondFormat = pList->GetFormat(rCondFormats[0]);
+                        assert(pCondFormat);
+                        bCondFormatDlg = true;
                     }
                 }