tdf#93837 Convert sheet row/col header context menus to xml

This commit shows some weakness of the current approach with
PopupLabel, as in many cases it's exactly the same as Label.
Have some ideas on how to improve that, but will look at it
after converting the remaining menus (at least in sfx2 based
modules), so I could have a broader look at what we have.

Change-Id: I78dfdb4a6f2ea3faf84f3a521067c6c15df96852

9 files changed, 97 insertions, 218 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index ff1091f85c0d..9fa2e8336b04 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1130,6 +1130,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Rows ~Above</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Rows ~Above</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -1153,6 +1156,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Columns ~Left</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Columns ~Left</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -1164,6 +1170,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Rows ~Below</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Rows ~Below</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -1175,6 +1184,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Columns ~Right</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Columns ~Right</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -1266,6 +1278,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Height...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Row ~Height...</value>
+        </prop>
       </node>
       <node oor:name=".uno:SetOptimalRowHeight" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1285,6 +1300,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">H~ide</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">H~ide Rows</value>
+        </prop>
       </node>
       <node oor:name=".uno:ShowRow" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1293,6 +1311,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Show</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Sho~w Rows</value>
+        </prop>
       </node>
       <node oor:name=".uno:ColumnWidth" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1301,6 +1322,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Width...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Column ~Width...</value>
+        </prop>
       </node>
       <node oor:name=".uno:SetOptimalColumnWidth" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1320,6 +1344,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Hide</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">H~ide Columns</value>
+        </prop>
       </node>
       <node oor:name=".uno:ShowColumn" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1328,6 +1355,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Show</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">S~how Columns</value>
+        </prop>
       </node>
       <node oor:name=".uno:Hide" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 9adc27edb95b..2ec5c220341c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -40,6 +40,11 @@
           <value xml:lang="en-US">Chart</value>
         </prop>
       </node>
+      <node oor:name="private:resource/popupmenu/colheader" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Column Header</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/draw" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Shape</value>
@@ -85,6 +90,11 @@
           <value xml:lang="en-US">Print Preview</value>
         </prop>
       </node>
+      <node oor:name="private:resource/popupmenu/rowheader" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Row Header</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/sheettab" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Sheet Tabs Bar</value>
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 57035f01c56a..9063108315db 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
     sc/source/ui/src/toolbox.src \
     sc/source/ui/src/scfuncs.src \
     sc/source/ui/src/sc.src \
-    sc/source/ui/src/hdrcont.src \
     sc/source/ui/src/scerrors.src \
     sc/source/ui/src/scstring.src \
     sc/source/ui/src/filter.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index f5ec631e1264..760cc5ba133d 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
 	sc/uiconfig/scalc/popupmenu/cell \
 	sc/uiconfig/scalc/popupmenu/celledit \
 	sc/uiconfig/scalc/popupmenu/chart \
+	sc/uiconfig/scalc/popupmenu/colheader \
 	sc/uiconfig/scalc/popupmenu/draw \
 	sc/uiconfig/scalc/popupmenu/drawtext \
 	sc/uiconfig/scalc/popupmenu/form \
@@ -33,6 +34,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
 	sc/uiconfig/scalc/popupmenu/pagebreak \
 	sc/uiconfig/scalc/popupmenu/pivot \
 	sc/uiconfig/scalc/popupmenu/preview \
+	sc/uiconfig/scalc/popupmenu/rowheader \
 	sc/uiconfig/scalc/popupmenu/sheettab \
 ))
 
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index 706555d44511..ad95740103de 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -19,26 +19,6 @@
 #ifndef INCLUDED_SC_INC_SCCOMMANDS_H
 #define INCLUDED_SC_INC_SCCOMMANDS_H
 
-#define CMD_FID_COL_WIDTH                           ".uno:ColumnWidth"
-#define CMD_SID_CREATE_SW_DRAWVIEW                  ".uno:CreateSWDrawView"
-#define CMD_SID_DEL_COLS                            ".uno:DeleteColumns"
-#define CMD_SID_DEL_ROWS                            ".uno:DeleteRows"
-#define CMD_FID_CELL_FORMAT                         ".uno:FormatCellDialog"
-#define CMD_FID_COL_HIDE                            ".uno:HideColumn"
-#define CMD_FID_ROW_HIDE                            ".uno:HideRow"
-#define CMD_FID_INS_COLUMNS_AFTER                   ".uno:InsertColumnsAfter"
-#define CMD_FID_INS_COLUMN                          ".uno:InsertColumns"
-#define CMD_FID_INS_COLUMNS_BEFORE                  ".uno:InsertColumnsBefore"
-#define CMD_FID_INS_ROWS_AFTER                      ".uno:InsertRowsAfter"
-#define CMD_FID_INS_ROW                             ".uno:InsertRows"
-#define CMD_FID_INS_ROWS_BEFORE                     ".uno:InsertRowsBefore"
-#define CMD_SID_OBJECT_MIRROR                       ".uno:Mirror"
-#define CMD_FID_ROW_HEIGHT                          ".uno:RowHeight"
-#define CMD_FID_COL_OPT_WIDTH                       ".uno:SetOptimalColumnWidth"
-#define CMD_FID_ROW_OPT_HEIGHT                      ".uno:SetOptimalRowHeight"
-#define CMD_FID_COL_SHOW                            ".uno:ShowColumn"
-#define CMD_FID_ROW_SHOW                            ".uno:ShowRow"
-#define CMD_SID_ULINE_VAL_DOUBLE                    ".uno:UnderlineDouble"
 #define CMD_FID_TAB_SET_TAB_BG_COLOR                ".uno:TabBgColor"
 
 #endif
diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src
deleted file mode 100644
index 33209bae658e..000000000000
--- a/sc/source/ui/src/hdrcont.src
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "sc.hrc"
-
-#define PART1 \
-    MenuItem\
-    {\
-        Identifier = FID_CELL_FORMAT ; \
-        HelpId = CMD_FID_CELL_FORMAT ; \
-        Text [ en-US ] = "~Format Cells..." ; \
-    };
-
-#define PART2 \
-    MenuItem\
-    {\
-        Identifier = SID_CUT ; \
-        HelpId = CMD_SID_CUT ; \
-        Text [ en-US ] = "Cu~t" ; \
-    };\
-    MenuItem\
-    {\
-        Identifier = SID_COPY ; \
-        HelpId = CMD_SID_COPY ; \
-        Text [ en-US ] = "~Copy" ; \
-    };\
-    MenuItem\
-    {\
-        Identifier = SID_PASTE ; \
-        HelpId = CMD_SID_PASTE ; \
-        Text [ en-US ] = "~Paste" ; \
-    };
-
-Menu RID_POPUP_ROWHEADER
-{
-    ItemList =
-    {
-        PART2
-        MenuItem
-        {
-            Identifier = SID_PASTE_SPECIAL ;
-            HelpId = CMD_SID_PASTE_SPECIAL ;
-            Text [ en-US ] = "P~aste Special..." ;
-        };
-
-        MenuItem { Separator = TRUE ; };
-
-        MenuItem
-        {
-            Identifier = FID_INS_ROWS_BEFORE ;
-            HelpId = CMD_FID_INS_ROWS_BEFORE ;
-            Text [ en-US ] = "~Insert Rows Above" ;
-        };
-        MenuItem
-        {
-            Identifier = FID_INS_ROWS_AFTER ;
-            HelpId = CMD_FID_INS_ROWS_AFTER ;
-            Text [ en-US ] = "Insert Rows ~Below" ;
-        };
-        MenuItem
-        {
-            Identifier = SID_DEL_ROWS ;
-            HelpId = CMD_SID_DEL_ROWS ;
-            Text [ en-US ] = "~Delete Rows" ;
-        };
-        MenuItem
-        {
-            Identifier = SID_DELETE ;
-            HelpId = CMD_SID_DELETE ;
-            Text [ en-US ] = "Cl~ear Contents..." ;
-        };
-
-        MenuItem { Separator = TRUE ; };
-
-        PART1
-
-        MenuItem
-        {
-            Identifier = FID_ROW_HEIGHT ;
-            HelpId = CMD_FID_ROW_HEIGHT ;
-            Text [ en-US ] = "Row Hei~ght..." ;
-        };
-        MenuItem
-        {
-            Identifier = FID_ROW_OPT_HEIGHT ;
-            HelpId = CMD_FID_ROW_OPT_HEIGHT ;
-            Text [ en-US ] = "~Optimal Row Height..." ;
-        };
-
-        MenuItem { Separator = TRUE ; };
-
-        MenuItem
-        {
-            Identifier = FID_ROW_HIDE ;
-            HelpId = CMD_FID_ROW_HIDE ;
-            Text [ en-US ] = "~Hide Rows" ;
-        };
-        MenuItem
-        {
-            Identifier = FID_ROW_SHOW ;
-            HelpId = CMD_FID_ROW_SHOW ;
-            Text [ en-US ] = "~Show Rows" ;
-        };
-    };
-};
-
-Menu RID_POPUP_COLHEADER
-{
-    ItemList =
-    {
-        PART2
-        MenuItem
-        {
-            Identifier = SID_PASTE_SPECIAL ;
-            HelpId = CMD_SID_PASTE_SPECIAL ;
-            Text [ en-US ] = "P~aste Special..." ;
-        };
-
-        MenuItem { Separator = TRUE ; };
-
-        MenuItem
-        {
-            Identifier = FID_INS_COLUMNS_BEFORE ;
-            HelpId = CMD_FID_INS_COLUMNS_BEFORE ;
-            Text [ en-US ] = "Insert Columns ~Left" ;
-        };
-        MenuItem
-        {
-            Identifier = FID_INS_COLUMNS_AFTER ;
-            HelpId = CMD_FID_INS_COLUMNS_AFTER ;
-            Text [ en-US ] = "Insert Columns ~Right" ;
-        };
-        MenuItem
-        {
-            Identifier = SID_DEL_COLS ;
-            HelpId = CMD_SID_DEL_COLS ;
-            Text [ en-US ] = "~Delete Columns" ;
-        };
-        MenuItem
-        {
-            Identifier = SID_DELETE ;
-            HelpId = CMD_SID_DELETE ;
-            Text [ en-US ] = "Cl~ear Contents..." ;
-        };
-
-        MenuItem { Separator = TRUE ; };
-
-        PART1
-
-        MenuItem
-        {
-            Identifier = FID_COL_WIDTH ;
-            HelpId = CMD_FID_COL_WIDTH ;
-            Text [ en-US ] = "Column ~Width..." ;
-        };
-        MenuItem
-        {
-            Identifier = FID_COL_OPT_WIDTH ;
-            HelpId = CMD_FID_COL_OPT_WIDTH ;
-            Text [ en-US ] = "~Optimal Column Width..." ;
-        };
-
-        MenuItem { Separator = TRUE ; };
-
-        MenuItem
-        {
-            Identifier = FID_COL_HIDE ;
-            HelpId = CMD_FID_COL_HIDE ;
-            Text [ en-US ] = "~Hide Columns" ;
-        };
-        MenuItem
-        {
-            Identifier = FID_COL_SHOW ;
-            HelpId = CMD_FID_COL_SHOW ;
-            Text [ en-US ] = "~Show Columns" ;
-        };
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 2218484616c2..34b7c1ff3f9d 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -902,8 +902,7 @@ void ScHeaderControl::Command( const CommandEvent& rCEvt )
                     pViewSh->MarkRange( aNewRange );
             }
 
-            ScResId aResId( bVertical ? RID_POPUP_ROWHEADER : RID_POPUP_COLHEADER );
-            pViewSh->GetDispatcher()->ExecutePopup( aResId );
+            pViewSh->GetDispatcher()->ExecutePopup( bVertical ? OUString( "rowheader" ) : OUString( "colheader" ) );
         }
     }
     else if ( nCmd == CommandEventId::StartDrag )
diff --git a/sc/uiconfig/scalc/popupmenu/colheader.xml b/sc/uiconfig/scalc/popupmenu/colheader.xml
new file mode 100644
index 000000000000..32650ff8b2fa
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/colheader.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuitem menu:id=".uno:PasteSpecial"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertColumnsBefore"/>
+  <menu:menuitem menu:id=".uno:InsertColumnsAfter"/>
+  <menu:menuitem menu:id=".uno:DeleteColumns"/>
+  <menu:menuitem menu:id=".uno:Delete"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatCellDialog"/>
+  <menu:menuitem menu:id=".uno:ColumnWidth"/>
+  <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:HideColumn"/>
+  <menu:menuitem menu:id=".uno:ShowColumn"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/rowheader.xml b/sc/uiconfig/scalc/popupmenu/rowheader.xml
new file mode 100644
index 000000000000..3027b3003721
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/rowheader.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuitem menu:id=".uno:PasteSpecial"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertRowsBefore"/>
+  <menu:menuitem menu:id=".uno:InsertRowsAfter"/>
+  <menu:menuitem menu:id=".uno:DeleteRows"/>
+  <menu:menuitem menu:id=".uno:Delete"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatCellDialog"/>
+  <menu:menuitem menu:id=".uno:RowHeight"/>
+  <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:HideRow"/>
+  <menu:menuitem menu:id=".uno:ShowRow"/>
+</menu:menupopup>