summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2023-05-03 16:59:37 -0400
committerAndras Timar <andras.timar@collabora.com>2023-05-05 19:11:46 +0200
commit1b5df09a57479ecbf7b1e952f083191c56c61ab2 (patch)
tree13537f0c853c228eba1b3a7e9a05226c31c941d8 /sc
parent1947a80a7503e476089c6ab02fef0eec68ff12e3 (diff)
sc: fix freeze row/column panes
The UNO command state has changed to Point (row, tab) and Point (col, tab), Otherwise, if the row or column has the same value for all sheets, the state cache will not report any changes to the client side. Signed-off-by: Henry Castro <hcastro@collabora.com> Change-Id: I2080f5e664825d81c4fa4dbb2c5d782f188dae64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151344 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/sdi/scalc.sdi4
-rw-r--r--sc/source/ui/view/tabvwsha.cxx7
2 files changed, 7 insertions, 4 deletions
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index d7087be5c056..9219de5964ff 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -1947,7 +1947,7 @@ SfxVoidItem FreezePanes SID_WINDOW_FIX
GroupId = SfxGroupId::View;
]
-SfxInt32Item FreezePanesColumn SID_WINDOW_FIX_COL
+SfxPointItem FreezePanesColumn SID_WINDOW_FIX_COL
[
AutoUpdate = FALSE,
@@ -1964,7 +1964,7 @@ SfxInt32Item FreezePanesColumn SID_WINDOW_FIX_COL
GroupId = SfxGroupId::View;
]
-SfxInt32Item FreezePanesRow SID_WINDOW_FIX_ROW
+SfxPointItem FreezePanesRow SID_WINDOW_FIX_ROW
[
AutoUpdate = FALSE,
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 39910e32cc39..5ce345e97fea 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -31,6 +31,7 @@
#include <svl/numformat.hxx>
#include <svl/zformat.hxx>
#include <svl/int64item.hxx>
+#include <svl/ptitem.hxx>
#include <svl/srchitem.hxx>
#include <svl/srchdefs.hxx>
#include <svl/stritem.hxx>
@@ -457,9 +458,11 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
case SID_WINDOW_FIX_COL:
case SID_WINDOW_FIX_ROW:
{
+ Point aPos;
bool bIsCol = (nWhich == SID_WINDOW_FIX_COL);
- sal_Int32 nFreezeIndex = rViewData.GetLOKSheetFreezeIndex(bIsCol);
- rSet.Put(SfxInt32Item(nWhich, nFreezeIndex));
+ aPos.setX(rViewData.GetLOKSheetFreezeIndex(bIsCol));
+ aPos.setY(rViewData.GetTabNo());
+ rSet.Put(SfxPointItem(nWhich, aPos));
}
break;