diff options
| -rw-r--r-- | sc/sdi/scalc.sdi | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsha.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/control/unoctitm.cxx | 8 |
3 files changed, 11 insertions, 8 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; diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 30538c614772..ab63e7697c91 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1135,9 +1135,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra aEvent.FeatureURL.Path == "StatusSelectionMode" || aEvent.FeatureURL.Path == "Signature" || aEvent.FeatureURL.Path == "SelectionMode" || - aEvent.FeatureURL.Path == "StatusBarFunc" || - aEvent.FeatureURL.Path == "FreezePanesColumn" || - aEvent.FeatureURL.Path == "FreezePanesRow") + aEvent.FeatureURL.Path == "StatusBarFunc") { sal_Int32 aInt32; @@ -1214,7 +1212,9 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra aBuffer.append("disabled"); } } - else if (aEvent.FeatureURL.Path == "Position") + else if (aEvent.FeatureURL.Path == "Position" || + aEvent.FeatureURL.Path == "FreezePanesColumn" || + aEvent.FeatureURL.Path == "FreezePanesRow") { css::awt::Point aPoint; |