officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |    8 ++++
 sc/inc/sc.hrc                                                     |    1 
 sc/sdi/scalc.sdi                                                  |   18 
++++++++++
 sc/sdi/tabvwsh.sdi                                                |    1 
 sc/source/ui/view/tabvwsh3.cxx                                    |   13 
+++++++
 sc/source/ui/view/tabvwsha.cxx                                    |    7 +++
 sc/uiconfig/scalc/menubar/menubar.xml                             |    1 
 7 files changed, 49 insertions(+)

New commits:
commit d981ee6256a905eb8a45557869288a06eb5ae0fc
Author:     Sahil <me.sahilgau...@gmail.com>
AuthorDate: Sat Dec 9 22:03:33 2023 +0530
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Dec 12 22:18:05 2023 +0100

    tdf#33201 Add UNO command for Column/Row Highlighting
    
    * Add uno command
    * Add menubar Entry [x] Column/Row Highlighting under View
    
    Change-Id: I86cb0034d5bd7d64bd6bfd64cf6e20507d14e5fe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159364
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index fe726492ffb4..723ece46d7ce 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1378,6 +1378,14 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:ViewColumnRowHighlighting" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Column/Row Highlighting</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:ViewHiddenColRow" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Show Hidden Row/Column Indicator</value>
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index f9c04a6e2e53..f6f445fc5a2e 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -277,6 +277,7 @@ class SvxZoomSliderItem;
 #define FID_TOGGLEHEADERS       (VIEW_MENU_START + 2)
 #define FID_SCALE               TypedWhichId<SvxZoomItem>(VIEW_MENU_START + 4)
 #define FID_TOGGLESYNTAX        (VIEW_MENU_START + 5)
+#define FID_TOGGLECOLROWHIGHLIGHTING (VIEW_MENU_START + 6)
 #define FID_PAGEBREAKMODE       (VIEW_MENU_START + 7)
 #define FID_FUNCTION_BOX        (VIEW_MENU_START + 8)
 #define FID_NORMALVIEWMODE      (VIEW_MENU_START + 9)
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 614293cc90bb..d26e99ce2f5d 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -6054,6 +6054,24 @@ SfxBoolItem ViewValueHighlighting FID_TOGGLESYNTAX
     GroupId = SfxGroupId::View;
 ]
 
+SfxBoolItem ViewColumnRowHighlighting FID_TOGGLECOLROWHIGHLIGHTING
+
+[
+    AutoUpdate = FALSE,
+    FastCall = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+
+
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    ToolBoxConfig = FALSE,
+    GroupId = SfxGroupId::View;
+]
+
 SfxBoolItem ViewHiddenColRow FID_TOGGLEHIDDENCOLROW
 
 [
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index e1da8b2f5d14..7130ff4cabd8 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -174,6 +174,7 @@ interface TableEditView
 
     FID_SCALESTATUS     [ ExecMethod = Execute; StateMethod = GetState; ]
     FID_TOGGLESYNTAX    [ ExecMethod = Execute; StateMethod = GetState; ]
+    FID_TOGGLECOLROWHIGHLIGHTING [ ExecMethod = Execute; StateMethod = 
GetState; ]
     FID_TOGGLEHEADERS   [ ExecMethod = Execute; StateMethod = GetState; ]
     FID_TOGGLEFORMULA   [ ExecMethod = Execute; StateMethod = GetState; ]
     FID_NORMALVIEWMODE  [ ExecMethod = Execute; StateMethod = GetState; ]
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 60754c58baff..208748b7110f 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -56,6 +56,7 @@
 #include <comphelper/string.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <scabstdlg.hxx>
+#include <officecfg/Office/Calc.hxx>
 
 #include <basegfx/utils/zoomtools.hxx>
 
@@ -696,6 +697,18 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 rReq.Done();
             }
             break;
+        case FID_TOGGLECOLROWHIGHLIGHTING:
+            {
+                bool bNewVal = 
!officecfg::Office::Calc::Content::Display::ColumnRowHighlighting::get();
+
+                auto pChange(comphelper::ConfigurationChanges::create());
+                
officecfg::Office::Calc::Content::Display::ColumnRowHighlighting::set(bNewVal, 
pChange);
+                pChange->commit();
+
+                rReq.AppendItem(SfxBoolItem(nSlot, bNewVal));
+                rReq.Done();
+            }
+            break;
         case FID_TOGGLEHEADERS:
             {
                 bool bSet = !GetViewData().IsHeaderMode();
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 84a3acbcdf44..c332c9542a66 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/table/BorderLineStyle.hpp>
+#include <officecfg/Office/Calc.hxx>
 
 #include <comphelper/lok.hxx>
 #include <editeng/boxitem.hxx>
@@ -378,6 +379,12 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
                 rSet.Put(SfxBoolItem(nWhich, GetViewData().IsSyntaxMode()));
                 break;
 
+            case FID_TOGGLECOLROWHIGHLIGHTING:
+                rSet.Put(SfxBoolItem(
+                    nWhich,
+                    
officecfg::Office::Calc::Content::Display::ColumnRowHighlighting::get()));
+                break;
+
             case FID_TOGGLEHEADERS:
                 rSet.Put(SfxBoolItem(nWhich, GetViewData().IsHeaderMode()));
                 break;
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index ab2c7f81f672..dad1d6844f4e 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -165,6 +165,7 @@
       </menu:menu>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ViewValueHighlighting"/>
+      <menu:menuitem menu:id=".uno:ViewColumnRowHighlighting"/>
       <menu:menuitem menu:id=".uno:ViewHiddenColRow"/>
       <menu:menuitem menu:id=".uno:ToggleFormula"/>
       <menu:menuitem menu:id=".uno:ShowAnnotations"/>

Reply via email to