diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-26 12:20:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-26 21:15:43 +0200 |
| commit | a4d4445e698b78ec0c2eb61a685869bd1d8bfd85 (patch) | |
| tree | 339b05f94646ec606c7227cfb2fc15a553e92ad8 /sc | |
| parent | 370533da3f07169791c0a17013ca55c57df2f3c9 (diff) | |
use more TypedWhichId
Change-Id: Iaa7ce9165da835a638bcc1d633bed0a2ff2c4108
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152308
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/sc.hrc | 4 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/cellsh.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsha.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwshh.cxx | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index cd02a5b891d4..625206b74f8c 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -233,8 +233,8 @@ class SvxZoomSliderItem; #define SID_ZTEST_DIALOG (SC_MESSAGE_START + 81) #define SID_CHI_SQUARE_TEST_DIALOG (SC_MESSAGE_START + 82) #define SID_SEARCH_RESULTS_DIALOG (SC_MESSAGE_START + 83) -#define SID_WINDOW_FIX_ROW (SC_MESSAGE_START + 84) -#define SID_WINDOW_FIX_COL (SC_MESSAGE_START + 85) +#define SID_WINDOW_FIX_ROW TypedWhichId<SfxInt32Item>(SC_MESSAGE_START + 84) +#define SID_WINDOW_FIX_COL TypedWhichId<SfxInt32Item>(SC_MESSAGE_START + 85) #define SID_COLUMN_OPERATIONS (SC_MESSAGE_START + 86) #define SID_ROW_OPERATIONS (SC_MESSAGE_START + 87) #define SID_FOURIER_ANALYSIS_DIALOG (SC_MESSAGE_START + 88) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 1a344af959fd..cc553c38f067 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -869,7 +869,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) } } - rReq.SetReturnValue( SfxInt32Item( nSlot, 0 ) ); //! ??????? + rReq.SetReturnValue( SfxInt32Item( TypedWhichId<SfxInt32Item>(nSlot), 0 ) ); //! ??????? rReq.Done(); if (!bHadTrack) // newly turned on -> show as well diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 3b2e69e7364f..ec5914a2224b 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -733,15 +733,15 @@ void ScCellShell::GetState(SfxItemSet &rSet) break; case SID_RANGE_ROW: - rSet.Put( SfxInt32Item( nWhich, nPosY+1 ) ); + rSet.Put( SfxInt32Item( SID_RANGE_ROW, nPosY+1 ) ); break; case SID_RANGE_COL: - rSet.Put( SfxInt16Item( nWhich, nPosX+1 ) ); + rSet.Put( SfxInt16Item( SID_RANGE_COL, nPosX+1 ) ); break; case SID_RANGE_TABLE: - rSet.Put( SfxInt16Item( nWhich, nTab+1 ) ); + rSet.Put( SfxInt16Item( SID_RANGE_TABLE, nTab+1 ) ); break; case SID_RANGE_FORMULA: diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 3be0428bbc2b..71bcd6cac315 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -551,21 +551,21 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aRequest.AppendItem( SfxUInt16Item( SID_SORT_USERDEF, nUser ) ); if ( rOutParam.maKeyState[0].bDoSort ) { - aRequest.AppendItem( SfxInt32Item( FN_PARAM_1, + aRequest.AppendItem( SfxInt32Item( TypedWhichId<SfxInt32Item>(FN_PARAM_1), rOutParam.maKeyState[0].nField + 1 ) ); aRequest.AppendItem( SfxBoolItem( FN_PARAM_2, rOutParam.maKeyState[0].bAscending ) ); } if ( rOutParam.maKeyState[1].bDoSort ) { - aRequest.AppendItem( SfxInt32Item( FN_PARAM_3, + aRequest.AppendItem( SfxInt32Item( TypedWhichId<SfxInt32Item>(FN_PARAM_3), rOutParam.maKeyState[1].nField + 1 ) ); aRequest.AppendItem( SfxBoolItem( FN_PARAM_4, rOutParam.maKeyState[1].bAscending ) ); } if ( rOutParam.maKeyState[2].bDoSort ) { - aRequest.AppendItem( SfxInt32Item( FN_PARAM_5, + aRequest.AppendItem( SfxInt32Item( TypedWhichId<SfxInt32Item>(FN_PARAM_5), rOutParam.maKeyState[2].nField + 1 ) ); aRequest.AppendItem( SfxBoolItem( FN_PARAM_6, rOutParam.maKeyState[2].bAscending ) ); diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 41b9892dce1b..4021f1937f91 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -474,7 +474,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) { bool bIsCol = (nWhich == SID_WINDOW_FIX_COL); sal_Int32 nFreezeIndex = rViewData.GetLOKSheetFreezeIndex(bIsCol); - rSet.Put(SfxInt32Item(nWhich, nFreezeIndex)); + rSet.Put(SfxInt32Item(TypedWhichId<SfxInt32Item>(nWhich), nFreezeIndex)); } break; diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 4e45f0153a21..ce38719bde67 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -197,7 +197,7 @@ void ScTabViewShell::GetObjectState( SfxItemSet& rSet ) //! convert from 1/100mm to something else ?????? - rSet.Put( SfxInt32Item( nWhich, nVal ) ); + rSet.Put( SfxInt32Item( TypedWhichId<SfxInt32Item>(nWhich), nVal ) ); } } } |