diff options
author | Jan Holesovsky <kendy@collabora.com> | 2015-10-16 08:42:39 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2015-10-16 12:12:27 +0200 |
commit | e5be07f5167d4103b4620201df350b1d9e795393 (patch) | |
tree | a100ca13a792d765caf75decd2b47104bf3a9f41 /sc/source/ui/view/cellsh1.cxx | |
parent | 427c5dc6e0f817253b2f8cd7727e447ac4f4d656 (diff) |
sfx items: Kill the unreadable SFX_REQUEST_ARG, use a template param instead.
Change-Id: I7130f7a84077a63cdc0ca1e131a4d90469eac90d
Diffstat (limited to 'sc/source/ui/view/cellsh1.cxx')
-rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 445e7cb5ea79..2d7bc84f3818 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1359,11 +1359,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } - SFX_REQUEST_ARG(rReq, pFuncItem, SfxUInt16Item, FN_PARAM_1); - SFX_REQUEST_ARG(rReq, pSkipItem, SfxBoolItem, FN_PARAM_2); - SFX_REQUEST_ARG(rReq, pTransposeItem, SfxBoolItem, FN_PARAM_3); - SFX_REQUEST_ARG(rReq, pLinkItem, SfxBoolItem, FN_PARAM_4); - SFX_REQUEST_ARG(rReq, pMoveItem, SfxInt16Item, FN_PARAM_5); + const SfxUInt16Item* pFuncItem = rReq.GetArg<SfxUInt16Item>(FN_PARAM_1); + const SfxBoolItem* pSkipItem = rReq.GetArg<SfxBoolItem>(FN_PARAM_2); + const SfxBoolItem* pTransposeItem = rReq.GetArg<SfxBoolItem>(FN_PARAM_3); + const SfxBoolItem* pLinkItem = rReq.GetArg<SfxBoolItem>(FN_PARAM_4); + const SfxInt16Item* pMoveItem = rReq.GetArg<SfxInt16Item>(FN_PARAM_5); if ( pFuncItem ) nFunction = static_cast<ScPasteFunc>(pFuncItem->GetValue()); if ( pSkipItem ) @@ -2475,19 +2475,19 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) OUString aSource; sal_uLong nRefresh=0; - SFX_REQUEST_ARG(rReq, pFile, SfxStringItem, SID_FILE_NAME); - SFX_REQUEST_ARG(rReq, pSource, SfxStringItem, FN_PARAM_1); + const SfxStringItem* pFile = rReq.GetArg<SfxStringItem>(SID_FILE_NAME); + const SfxStringItem* pSource = rReq.GetArg<SfxStringItem>(FN_PARAM_1); if ( pFile && pSource ) { aFile = pFile->GetValue(); aSource = pSource->GetValue(); - SFX_REQUEST_ARG(rReq, pFilter, SfxStringItem, SID_FILTER_NAME); + const SfxStringItem* pFilter = rReq.GetArg<SfxStringItem>(SID_FILTER_NAME); if ( pFilter ) aFilter = pFilter->GetValue(); - SFX_REQUEST_ARG(rReq, pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS); + const SfxStringItem* pOptions = rReq.GetArg<SfxStringItem>(SID_FILE_FILTEROPTIONS); if ( pOptions ) aOptions = pOptions->GetValue(); - SFX_REQUEST_ARG(rReq, pRefresh, SfxUInt32Item, FN_PARAM_2); + const SfxUInt32Item* pRefresh = rReq.GetArg<SfxUInt32Item>(FN_PARAM_2); if ( pRefresh ) nRefresh = pRefresh->GetValue(); } |