summaryrefslogtreecommitdiff
path: root/sc/uiconfig
diff options
context:
space:
mode:
authorDennis Francis <dennis.francis@collabora.com>2020-07-15 15:55:45 +0530
committerDennis Francis <dennis.francis@collabora.com>2020-07-24 15:19:40 +0200
commit7b4802070ac6fb930255536bf3ed2c52428b4181 (patch)
tree9fa0eb65a86b19cb2aea0d5cbc70b1f75ca33341 /sc/uiconfig
parent4948b14eedb79a1408e20ab477929fe062d13c27 (diff)
lok-freezepanes: Generalize FreezePanes* uno-commands...
to allow an integer parameter as the row/column index of the freeze and use them to set/get freeze indices (row/column) from the lok clients. The behaviour of the exisiting freeze/split-panes controls in desktop Calc is not affected, but new menu/notebookbar options can be added for freezing on a specific row/column in a follow-up commit. For now, the freeze-panes are shared between all views for each tab of the spreadsheet. "Private" freeze-panes support can also be added without much difficulty (for this we need another uno command for the private/shared flag, but that can be in a separate commit). Notes regarding compatibility: Since Online-Calc has support only for the freeze-panes functionality presently, any pre-exisiting 'real splits' in the spreadsheet (created using the native-desktop Calc or alternatives) are converted to equivalent 'freezes' on import, but on export, such 'freezes' are re-converted and written as 'real splits'. In case the spreadsheet has 'freezes' on import, they are used/exported as such. In short, the type of sheet-window splits in the document are preserved. Change-Id: Ia990616f5cedfb2b5db820770c17ec7e209f0e48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99347 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'sc/uiconfig')
-rw-r--r--sc/uiconfig/scalc/menubar/menubar.xml4
-rw-r--r--sc/uiconfig/scalc/popupmenu/column_operations.xml2
-rw-r--r--sc/uiconfig/scalc/popupmenu/freezepanes.xml4
-rw-r--r--sc/uiconfig/scalc/popupmenu/row_operations.xml2
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar.ui8
5 files changed, 10 insertions, 10 deletions
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 445ca1b14ab9..3f688bd29553 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -168,8 +168,8 @@
<menu:menuitem menu:id=".uno:FreezePanes"/>
<menu:menu menu:id=".uno:FreezeCellsMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FreezePanesFirstColumn"/>
- <menu:menuitem menu:id=".uno:FreezePanesFirstRow"/>
+ <menu:menuitem menu:id=".uno:FreezePanesColumn"/>
+ <menu:menuitem menu:id=".uno:FreezePanesRow"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
diff --git a/sc/uiconfig/scalc/popupmenu/column_operations.xml b/sc/uiconfig/scalc/popupmenu/column_operations.xml
index 3ed8eda5f892..2abb5c49d20f 100644
--- a/sc/uiconfig/scalc/popupmenu/column_operations.xml
+++ b/sc/uiconfig/scalc/popupmenu/column_operations.xml
@@ -28,5 +28,5 @@
<menu:menuitem menu:id=".uno:FillSeries"/>
<menu:menuitem menu:id=".uno:RandomNumberGeneratorDialog"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FreezePanesFirstColumn"/>
+ <menu:menuitem menu:id=".uno:FreezePanesColumn"/>
</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/freezepanes.xml b/sc/uiconfig/scalc/popupmenu/freezepanes.xml
index cc6d3147a446..de32001b8fa1 100644
--- a/sc/uiconfig/scalc/popupmenu/freezepanes.xml
+++ b/sc/uiconfig/scalc/popupmenu/freezepanes.xml
@@ -8,6 +8,6 @@
*
-->
<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
- <menu:menuitem menu:id=".uno:FreezePanesFirstColumn"/>
- <menu:menuitem menu:id=".uno:FreezePanesFirstRow"/>
+ <menu:menuitem menu:id=".uno:FreezePanesColumn"/>
+ <menu:menuitem menu:id=".uno:FreezePanesRow"/>
</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/row_operations.xml b/sc/uiconfig/scalc/popupmenu/row_operations.xml
index f3ebed07e4e4..84a2470cff1e 100644
--- a/sc/uiconfig/scalc/popupmenu/row_operations.xml
+++ b/sc/uiconfig/scalc/popupmenu/row_operations.xml
@@ -28,5 +28,5 @@
<menu:menuitem menu:id=".uno:FillSeries"/>
<menu:menuitem menu:id=".uno:RandomNumberGeneratorDialog"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FreezePanesFirstRow"/>
+ <menu:menuitem menu:id=".uno:FreezePanesRow"/>
</menu:menupopup>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 8077f465c3e0..c1b809eb9443 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -10002,10 +10002,10 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="View-FreezePanesFirstColumn">
+ <object class="GtkToolButton" id="View-FreezePanesColumn">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FreezePanesFirstColumn</property>
+ <property name="action_name">.uno:FreezePanesColumn</property>
</object>
<packing>
<property name="expand">True</property>
@@ -10028,10 +10028,10 @@
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="View-FreezePanesFirstRow">
+ <object class="GtkToolButton" id="View-FreezePanesRow">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FreezePanesFirstRow</property>
+ <property name="action_name">.uno:FreezePanesRow</property>
</object>
<packing>
<property name="expand">True</property>