diff options
Diffstat (limited to 'sfx2/source/view/viewfrm.cxx')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 432e7da5a3d2..82667530348d 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -417,7 +417,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if ( rReq.IsAPI() ) { // Control through API if r/w or r/o - SFX_REQUEST_ARG(rReq, pEditItem, SfxBoolItem, SID_EDITDOC); + const SfxBoolItem* pEditItem = rReq.GetArg<SfxBoolItem>(SID_EDITDOC); if ( pEditItem ) nOpenMode = pEditItem->GetValue() ? SFX_STREAM_READWRITE : SFX_STREAM_READONLY; } @@ -559,7 +559,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if ( !pSh || !pSh->CanReload_Impl() ) break; SfxApplication* pApp = SfxGetpApp(); - SFX_REQUEST_ARG(rReq, pForceReloadItem, SfxBoolItem, SID_FORCERELOAD); + const SfxBoolItem* pForceReloadItem = rReq.GetArg<SfxBoolItem>(SID_FORCERELOAD); if( pForceReloadItem && !pForceReloadItem->GetValue() && !pSh->GetMedium()->IsExpired() ) return; @@ -567,20 +567,20 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) return; // AutoLoad is prohibited if possible - SFX_REQUEST_ARG(rReq, pAutoLoadItem, SfxBoolItem, SID_AUTOLOAD); + const SfxBoolItem* pAutoLoadItem = rReq.GetArg<SfxBoolItem>(SID_AUTOLOAD); if ( pAutoLoadItem && pAutoLoadItem->GetValue() && GetFrame().IsAutoLoadLocked_Impl() ) return; SfxObjectShellLock xOldObj( pSh ); pImp->bReloading = true; - SFX_REQUEST_ARG(rReq, pURLItem, SfxStringItem, SID_FILE_NAME); + const SfxStringItem* pURLItem = rReq.GetArg<SfxStringItem>(SID_FILE_NAME); // Open as editable? bool bForEdit = !pSh->IsReadOnly(); // If possible ask the User bool bDo = GetViewShell()->PrepareClose(); - SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT); + const SfxBoolItem* pSilentItem = rReq.GetArg<SfxBoolItem>(SID_SILENT); if ( bDo && GetFrame().DocIsModified_Impl() && !rReq.IsAPI() && ( !pSilentItem || !pSilentItem->GetValue() ) ) { @@ -633,7 +633,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // Filter Detection OUString referer; - SFX_REQUEST_ARG(rReq, refererItem, SfxStringItem, SID_REFERER); + const SfxStringItem* refererItem = rReq.GetArg<SfxStringItem>(SID_REFERER); if (refererItem != 0) { referer = refererItem->GetValue(); } @@ -1942,8 +1942,8 @@ SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId ) { - SFX_REQUEST_ARG(i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME); - SFX_REQUEST_ARG(i_rCreateDocRequest, pHiddenItem, SfxBoolItem, SID_HIDDEN); + const SfxUnoFrameItem* pFrameItem = i_rCreateDocRequest.GetArg<SfxUnoFrameItem>(SID_FILLFRAME); + const SfxBoolItem* pHiddenItem = i_rCreateDocRequest.GetArg<SfxBoolItem>(SID_HIDDEN); return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, @@ -2217,12 +2217,12 @@ void SfxViewFrame::ExecView_Impl pMed->GetItemSet()->ClearItem( SID_HIDDEN ); // the view ID (optional arg. TODO: this is currently not supported in the slot definition ...) - SFX_REQUEST_ARG(rReq, pViewIdItem, SfxUInt16Item, SID_VIEW_ID); + const SfxUInt16Item* pViewIdItem = rReq.GetArg<SfxUInt16Item>(SID_VIEW_ID); const sal_uInt16 nViewId = pViewIdItem ? pViewIdItem->GetValue() : GetCurViewId(); Reference < XFrame > xFrame; // the frame (optional arg. TODO: this is currently not supported in the slot definition ...) - SFX_REQUEST_ARG(rReq, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME); + const SfxUnoFrameItem* pFrameItem = rReq.GetArg<SfxUnoFrameItem>(SID_FILLFRAME); if ( pFrameItem ) xFrame = pFrameItem->GetFrame(); @@ -2234,7 +2234,7 @@ void SfxViewFrame::ExecView_Impl case SID_OBJECT: { - SFX_REQUEST_ARG(rReq, pItem, SfxInt16Item, SID_OBJECT); + const SfxInt16Item* pItem = rReq.GetArg<SfxInt16Item>(SID_OBJECT); SfxViewShell *pViewShell = GetViewShell(); if ( pViewShell && pItem ) @@ -2713,7 +2713,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) xRecorder = xSupplier->getDispatchRecorder(); bool bIsRecording = xRecorder.is(); - SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, SID_RECORDMACRO); + const SfxBoolItem* pItem = rReq.GetArg<SfxBoolItem>(SID_RECORDMACRO); if ( pItem && pItem->GetValue() == bIsRecording ) return; @@ -2723,7 +2723,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) aProp <<= com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier >(); xSet->setPropertyValue(sProperty,aProp); - SFX_REQUEST_ARG(rReq, pRecordItem, SfxBoolItem, FN_PARAM_1); + const SfxBoolItem* pRecordItem = rReq.GetArg<SfxBoolItem>(FN_PARAM_1); if ( !pRecordItem || !pRecordItem->GetValue() ) // insert script into basic library container of application AddDispatchMacroToBasic_Impl(xRecorder->getRecordedMacro()); @@ -2782,7 +2782,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); // Evaluate parameter. - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot()); + const SfxBoolItem* pShowItem = rReq.GetArg<SfxBoolItem>(rReq.GetSlot()); bool bShow( true ); if ( !pShowItem ) bShow = xLayoutManager->isElementVisible( aStatusbarResString ); @@ -2807,7 +2807,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_WIN_FULLSCREEN: { - SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot()); + const SfxBoolItem* pItem = rReq.GetArg<SfxBoolItem>(rReq.GetSlot()); SfxViewFrame *pTop = GetTopViewFrame(); if ( pTop ) { @@ -3002,7 +3002,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) // Evaluate Parameter sal_uInt16 nSID = rReq.GetSlot(); - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID); + const SfxBoolItem* pShowItem = rReq.GetArg<SfxBoolItem>(nSID); if ( nSID == SID_VIEW_DATA_SOURCE_BROWSER ) { if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DATABASE)) |