diff options
author | Jan Holesovsky <kendy@collabora.com> | 2015-10-16 07:54:12 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2015-10-16 12:12:27 +0200 |
commit | 427c5dc6e0f817253b2f8cd7727e447ac4f4d656 (patch) | |
tree | b79121a9292f90bd4712d3895a498aac121de471 /sfx2/source | |
parent | 67fe42070332709823f0b00e6311809bc3e5341c (diff) |
sfx items: The bDeep parameter of SFX_REQUEST_ARG is always false.
Change-Id: I6d4f4cd09c83f94b26dd90577bdc6bc3226f58ab
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/appbas.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appopen.cxx | 58 | ||||
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 11 | ||||
-rw-r--r-- | sfx2/source/doc/objserv.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 35 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm2.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/view/viewprn.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/view/viewsh.cxx | 10 |
8 files changed, 69 insertions, 73 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index df23fcd9b4a6..6dd18292a9c8 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -152,7 +152,7 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq ) { case SID_ATTR_UNDO_COUNT: { - SFX_REQUEST_ARG(rReq, pCountItem, SfxUInt16Item, nSID, false); + SFX_REQUEST_ARG(rReq, pCountItem, SfxUInt16Item, nSID); std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); officecfg::Office::Common::Undo::Steps::set( diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 3aecc38f4007..ae314e1deefe 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -413,7 +413,7 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUStri void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) { - SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, false); + SFX_REQUEST_ARG(rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT); OUString aFactName; if ( pFactoryItem ) aFactName = pFactoryItem->GetValue(); @@ -429,10 +429,10 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString( "_default" ) ) ); // TODO/LATER: Should the other arguments be transferred as well? - SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, false); + SFX_REQUEST_ARG(rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH); if ( pDefaultPathItem ) aReq.AppendItem( *pDefaultPathItem ); - SFX_REQUEST_ARG( rReq, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME, false); + SFX_REQUEST_ARG(rReq, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME); if ( pDefaultNameItem ) aReq.AppendItem( *pDefaultNameItem ); @@ -447,9 +447,9 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) { // No Parameter from BASIC only Factory given? - SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, false); - SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, false); - SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, false); + SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME); + SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME); + SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME); SfxObjectShellLock xDoc; @@ -576,12 +576,12 @@ bool lcl_isFilterNativelySupported(const SfxFilter& rFilter) void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { OUString aDocService; - SFX_REQUEST_ARG(rReq, pDocSrvItem, SfxStringItem, SID_DOC_SERVICE, false); + SFX_REQUEST_ARG(rReq, pDocSrvItem, SfxStringItem, SID_DOC_SERVICE); if (pDocSrvItem) aDocService = pDocSrvItem->GetValue(); sal_uInt16 nSID = rReq.GetSlot(); - SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, false ); + SFX_REQUEST_ARG(rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME); if ( pFileNameItem ) { OUString aCommand( pFileNameItem->GetValue() ); @@ -608,7 +608,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) OUString aFilter; SfxItemSet* pSet = NULL; OUString aPath; - SFX_REQUEST_ARG( rReq, pFolderNameItem, SfxStringItem, SID_PATH, false ); + SFX_REQUEST_ARG(rReq, pFolderNameItem, SfxStringItem, SID_PATH); if ( pFolderNameItem ) aPath = pFolderNameItem->GetValue(); else if ( nSID == SID_OPENTEMPLATE ) @@ -619,23 +619,23 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG; - SFX_REQUEST_ARG( rReq, pSystemDialogItem, SfxBoolItem, SID_FILE_DIALOG, false ); + SFX_REQUEST_ARG(rReq, pSystemDialogItem, SfxBoolItem, SID_FILE_DIALOG); if ( pSystemDialogItem ) nDialog = pSystemDialogItem->GetValue() ? SFX2_IMPL_DIALOG_SYSTEM : SFX2_IMPL_DIALOG_OOO; - SFX_REQUEST_ARG( rReq, pRemoteDialogItem, SfxBoolItem, SID_REMOTE_DIALOG, false ); + SFX_REQUEST_ARG(rReq, pRemoteDialogItem, SfxBoolItem, SID_REMOTE_DIALOG); if ( pRemoteDialogItem && pRemoteDialogItem->GetValue()) nDialog = SFX2_IMPL_DIALOG_REMOTE; OUString sStandardDir; - SFX_REQUEST_ARG( rReq, pStandardDirItem, SfxStringItem, SID_STANDARD_DIR, false ); + SFX_REQUEST_ARG(rReq, pStandardDirItem, SfxStringItem, SID_STANDARD_DIR); if ( pStandardDirItem ) sStandardDir = pStandardDirItem->GetValue(); ::com::sun::star::uno::Sequence< OUString > aBlackList; - SFX_REQUEST_ARG( rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST, false ); + SFX_REQUEST_ARG(rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST); if ( pBlackListItem ) pBlackListItem->GetStringList( aBlackList ); @@ -672,7 +672,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) css::uno::Reference< css::task::XInteractionHandler > xWrappedHandler; // wrap existing handler or create new UUI handler - SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false); + SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER); if (pInteractionItem) { pInteractionItem->GetValue() >>= xWrappedHandler; @@ -760,22 +760,22 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) // no else here! It's optional ... if (!bHyperlinkUsed) { - SFX_REQUEST_ARG(rReq, pHyperLinkUsedItem, SfxBoolItem, SID_BROWSE, false); + SFX_REQUEST_ARG(rReq, pHyperLinkUsedItem, SfxBoolItem, SID_BROWSE); if ( pHyperLinkUsedItem ) bHyperlinkUsed = pHyperLinkUsedItem->GetValue(); // no "official" item, so remove it from ItemSet before using UNO-API rReq.RemoveItem( SID_BROWSE ); } - SFX_REQUEST_ARG( rReq, pFileName, SfxStringItem, SID_FILE_NAME, false ); + SFX_REQUEST_ARG(rReq, pFileName, SfxStringItem, SID_FILE_NAME); OUString aFileName = pFileName->GetValue(); OUString aReferer; - SFX_REQUEST_ARG( rReq, pRefererItem, SfxStringItem, SID_REFERER, false ); + SFX_REQUEST_ARG(rReq, pRefererItem, SfxStringItem, SID_REFERER); if ( pRefererItem ) aReferer = pRefererItem->GetValue(); - SFX_REQUEST_ARG( rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS, false); + SFX_REQUEST_ARG(rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS); if ( pFileFlagsItem ) { OUString aFileFlags = pFileFlagsItem->GetValue(); @@ -936,13 +936,13 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) SfxFrame* pTargetFrame = NULL; Reference< XFrame > xTargetFrame; - SFX_REQUEST_ARG(rReq, pFrameItem, SfxFrameItem, SID_DOCFRAME, false); + SFX_REQUEST_ARG(rReq, pFrameItem, SfxFrameItem, SID_DOCFRAME); if ( pFrameItem ) pTargetFrame = pFrameItem->GetFrame(); if ( !pTargetFrame ) { - SFX_REQUEST_ARG(rReq, pUnoFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false); + SFX_REQUEST_ARG(rReq, pUnoFrameItem, SfxUnoFrameItem, SID_FILLFRAME); if ( pUnoFrameItem ) xTargetFrame = pUnoFrameItem->GetFrame(); } @@ -951,7 +951,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) pTargetFrame = &SfxViewFrame::Current()->GetFrame(); // check if caller has set a callback - SFX_REQUEST_ARG(rReq, pLinkItem, SfxLinkItem, SID_DONELINK, false ); + SFX_REQUEST_ARG(rReq, pLinkItem, SfxLinkItem, SID_DONELINK); // remove from Itemset, because it confuses the parameter transformation if ( pLinkItem ) @@ -961,19 +961,19 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) // check if the view must be hidden bool bHidden = false; - SFX_REQUEST_ARG(rReq, pHidItem, SfxBoolItem, SID_HIDDEN, false); + SFX_REQUEST_ARG(rReq, pHidItem, SfxBoolItem, SID_HIDDEN); if ( pHidItem ) bHidden = pHidItem->GetValue(); // This request is a UI call. We have to set the right values inside the MediaDescriptor // for: InteractionHandler, StatusIndicator, MacroExecutionMode and DocTemplate. // But we have to look for already existing values or for real hidden requests. - SFX_REQUEST_ARG(rReq, pPreviewItem, SfxBoolItem, SID_PREVIEW, false); + SFX_REQUEST_ARG(rReq, pPreviewItem, SfxBoolItem, SID_PREVIEW); if (!bHidden && ( !pPreviewItem || !pPreviewItem->GetValue() ) ) { - SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false); - SFX_REQUEST_ARG(rReq, pMacroExecItem , SfxUInt16Item, SID_MACROEXECMODE , false); - SFX_REQUEST_ARG(rReq, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE , false); + SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER); + SFX_REQUEST_ARG(rReq, pMacroExecItem , SfxUInt16Item, SID_MACROEXECMODE); + SFX_REQUEST_ARG(rReq, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE); if (!pInteractionItem) { @@ -988,12 +988,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) // extract target name OUString aTarget; - SFX_REQUEST_ARG(rReq, pTargetItem, SfxStringItem, SID_TARGETNAME, false); + SFX_REQUEST_ARG(rReq, pTargetItem, SfxStringItem, SID_TARGETNAME); if ( pTargetItem ) aTarget = pTargetItem->GetValue(); else { - SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, false ); + SFX_REQUEST_ARG(rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW); if ( pNewViewItem && pNewViewItem->GetValue() ) aTarget = "_blank" ; } @@ -1020,7 +1020,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } // make URL ready - SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_FILE_NAME, false ); + SFX_REQUEST_ARG(rReq, pURLItem, SfxStringItem, SID_FILE_NAME); aFileName = pURLItem->GetValue(); if( aFileName.startsWith("#") ) // Mark without URL { diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 9bd8e892a335..e126695f5417 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -346,8 +346,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( pFact ) { - SFX_REQUEST_ARG(rReq, pStringItem, - SfxStringItem, SID_CONFIG, false); + SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, SID_CONFIG); SfxItemSet aSet( GetPool(), SID_CONFIG, SID_CONFIG ); @@ -482,7 +481,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_HELPTIPS: { // Evaluate Parameter - SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPTIPS, false); + SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPTIPS); bool bOn = pOnItem ? pOnItem->GetValue() : !Help::IsQuickHelpEnabled(); @@ -509,7 +508,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_HELPBALLOONS: { // Evaluate Parameter - SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPBALLOONS, false); + SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPBALLOONS); bool bOn = pOnItem ? pOnItem->GetValue() : !Help::IsBalloonHelpEnabled(); @@ -963,7 +962,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) case SID_OPTIONS_TREEDIALOG: { OUString sPageURL; - SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_OPTIONS_PAGEURL, false ); + SFX_REQUEST_ARG(rReq, pURLItem, SfxStringItem, SID_OPTIONS_PAGEURL); if ( pURLItem ) sPageURL = pURLItem->GetValue(); const SfxItemSet* pArgs = rReq.GetInternalArgs_Impl(); @@ -1221,7 +1220,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) case SID_OFFICE_CHECK_PLZ: { bool bRet = false; - SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, rReq.GetSlot(), false); + SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, rReq.GetSlot()); if ( pStringItem ) { diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 7e33950825b8..2bd58b2fff08 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -450,7 +450,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_DOCINFO: { - SFX_REQUEST_ARG(rReq, pDocInfItem, SfxDocumentInfoItem, SID_DOCINFO, false); + SFX_REQUEST_ARG(rReq, pDocInfItem, SfxDocumentInfoItem, SID_DOCINFO); if ( pDocInfItem ) { // parameter, e.g. from replayed macro @@ -461,7 +461,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) { // no argument containing DocInfo; check optional arguments bool bReadOnly = IsReadOnly(); - SFX_REQUEST_ARG(rReq, pROItem, SfxBoolItem, SID_DOC_READONLY, false); + SFX_REQUEST_ARG(rReq, pROItem, SfxBoolItem, SID_DOC_READONLY); if ( pROItem ) // override readonly attribute of document // e.g. if a readonly document is saved elsewhere and user asks for editing DocInfo before @@ -573,7 +573,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // TODO/LATER: do the following GUI related actions in standalown method // Introduce a status indicator for GUI operation - SFX_REQUEST_ARG( rReq, pStatusIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, false ); + SFX_REQUEST_ARG(rReq, pStatusIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL); if ( !pStatusIndicatorItem ) { // get statusindicator @@ -610,7 +610,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } // Introduce an interaction handler for GUI operation - SFX_REQUEST_ARG( rReq, pInteractionHandlerItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false ); + SFX_REQUEST_ARG(rReq, pInteractionHandlerItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER); if ( !pInteractionHandlerItem ) { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -707,7 +707,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( lErr && nErrorCode == ERRCODE_NONE ) { - SFX_REQUEST_ARG( rReq, pWarnItem, SfxBoolItem, SID_FAIL_ON_WARNING, false ); + SFX_REQUEST_ARG(rReq, pWarnItem, SfxBoolItem, SID_FAIL_ON_WARNING); if ( pWarnItem && pWarnItem->GetValue() ) nErrorCode = lErr; } @@ -806,8 +806,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } // Evaluate Parameter - SFX_REQUEST_ARG(rReq, pSaveItem, SfxBoolItem, SID_CLOSEDOC_SAVE, false); - SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_CLOSEDOC_FILENAME, false); + SFX_REQUEST_ARG(rReq, pSaveItem, SfxBoolItem, SID_CLOSEDOC_SAVE); + SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_CLOSEDOC_FILENAME); if ( pSaveItem ) { if ( pSaveItem->GetValue() ) diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 9db77b1f3ba4..432e7da5a3d2 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, false); + SFX_REQUEST_ARG(rReq, pEditItem, SfxBoolItem, SID_EDITDOC); if ( pEditItem ) nOpenMode = pEditItem->GetValue() ? SFX_STREAM_READWRITE : SFX_STREAM_READONLY; } @@ -559,8 +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, false); + SFX_REQUEST_ARG(rReq, pForceReloadItem, SfxBoolItem, SID_FORCERELOAD); if( pForceReloadItem && !pForceReloadItem->GetValue() && !pSh->GetMedium()->IsExpired() ) return; @@ -568,21 +567,20 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) return; // AutoLoad is prohibited if possible - SFX_REQUEST_ARG(rReq, pAutoLoadItem, SfxBoolItem, SID_AUTOLOAD, false); + SFX_REQUEST_ARG(rReq, pAutoLoadItem, 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, false); + SFX_REQUEST_ARG(rReq, pURLItem, 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, false); + SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT); if ( bDo && GetFrame().DocIsModified_Impl() && !rReq.IsAPI() && ( !pSilentItem || !pSilentItem->GetValue() ) ) { @@ -635,8 +633,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // Filter Detection OUString referer; - SFX_REQUEST_ARG( - rReq, refererItem, SfxStringItem, SID_REFERER, false); + SFX_REQUEST_ARG(rReq, refererItem, SfxStringItem, SID_REFERER); if (refererItem != 0) { referer = refererItem->GetValue(); } @@ -1945,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, false ); - SFX_REQUEST_ARG( i_rCreateDocRequest, pHiddenItem, SfxBoolItem, SID_HIDDEN, false ); + SFX_REQUEST_ARG(i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME); + SFX_REQUEST_ARG(i_rCreateDocRequest, pHiddenItem, SfxBoolItem, SID_HIDDEN); return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, @@ -2220,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, false ); + SFX_REQUEST_ARG(rReq, pViewIdItem, 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, false ); + SFX_REQUEST_ARG(rReq, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME); if ( pFrameItem ) xFrame = pFrameItem->GetFrame(); @@ -2237,7 +2234,7 @@ void SfxViewFrame::ExecView_Impl case SID_OBJECT: { - SFX_REQUEST_ARG( rReq, pItem, SfxInt16Item, SID_OBJECT, false ); + SFX_REQUEST_ARG(rReq, pItem, SfxInt16Item, SID_OBJECT); SfxViewShell *pViewShell = GetViewShell(); if ( pViewShell && pItem ) @@ -2716,7 +2713,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) xRecorder = xSupplier->getDispatchRecorder(); bool bIsRecording = xRecorder.is(); - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_RECORDMACRO, false); + SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, SID_RECORDMACRO); if ( pItem && pItem->GetValue() == bIsRecording ) return; @@ -2726,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, false); + SFX_REQUEST_ARG(rReq, pRecordItem, SfxBoolItem, FN_PARAM_1); if ( !pRecordItem || !pRecordItem->GetValue() ) // insert script into basic library container of application AddDispatchMacroToBasic_Impl(xRecorder->getRecordedMacro()); @@ -2785,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(), false); + SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot()); bool bShow( true ); if ( !pShowItem ) bShow = xLayoutManager->isElementVisible( aStatusbarResString ); @@ -2810,7 +2807,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_WIN_FULLSCREEN: { - SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot(), false); + SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot()); SfxViewFrame *pTop = GetTopViewFrame(); if ( pTop ) { @@ -3005,7 +3002,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) // Evaluate Parameter sal_uInt16 nSID = rReq.GetSlot(); - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, false); + SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID); if ( nSID == SID_VIEW_DATA_SOURCE_BROWSER ) { if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DATABASE)) diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 93940f35100b..e44350c2e5f3 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -163,9 +163,9 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) { case SID_SHOWPOPUPS : { - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, false); + SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS); bool bShow = pShowItem == nullptr || pShowItem->GetValue(); - SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, false); + SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID); sal_uInt16 nId = pIdItem ? pIdItem->GetValue() : 0; SfxWorkWindow *pWorkWin = GetFrame().GetWorkWindow_Impl(); @@ -206,7 +206,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) case SID_NEWDOCDIRECT : { - SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, false); + SFX_REQUEST_ARG(rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT); OUString aFactName; if ( pFactoryItem ) aFactName = pFactoryItem->GetValue(); diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index a98791e03016..b11b990e5f77 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -646,7 +646,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) // Should it be visible on the user interface, // should it launch popup dialogue ? - SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, false); + SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT); bSilent = pSilentItem && pSilentItem->GetValue(); } @@ -677,7 +677,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) return; // should we print only the selection or the whole document - SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, false); + SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION); bool bSelection = ( pSelectItem != NULL && pSelectItem->GetValue() ); // detect non api call from writer ( that adds SID_SELECTION ) and reset bIsAPI if ( pSelectItem && rReq.GetArgs()->Count() == 1 ) @@ -764,7 +764,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) SfxPrinter *pDocPrinter = GetPrinter(true); // look for printer in parameters - SFX_REQUEST_ARG( rReq, pPrinterItem, SfxStringItem, SID_PRINTER_NAME, false ); + SFX_REQUEST_ARG(rReq, pPrinterItem, SfxStringItem, SID_PRINTER_NAME); if ( pPrinterItem ) { // use PrinterName parameter to create a printer diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index e927323ab27f..47597535194f 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -472,7 +472,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { case SID_STYLE_FAMILY : { - SFX_REQUEST_ARG(rReq, pItem, SfxUInt16Item, nId, false); + SFX_REQUEST_ARG(rReq, pItem, SfxUInt16Item, nId); if (pItem) { pImp->m_nFamily = pItem->GetValue(); @@ -555,11 +555,11 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) SfxMailModel aModel; OUString aDocType; - SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, false ); + SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT); if ( pMailSubject ) aModel.SetSubject( pMailSubject->GetValue() ); - SFX_REQUEST_ARG(rReq, pMailRecipient, SfxStringItem, SID_MAIL_RECIPIENT, false ); + SFX_REQUEST_ARG(rReq, pMailRecipient, SfxStringItem, SID_MAIL_RECIPIENT); if ( pMailRecipient ) { OUString aRecipient( pMailRecipient->GetValue() ); @@ -569,7 +569,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) aRecipient = aRecipient.copy( aMailToStr.getLength() ); aModel.AddAddress( aRecipient, SfxMailModel::ROLE_TO ); } - SFX_REQUEST_ARG(rReq, pMailDocType, SfxStringItem, SID_TYPE_NAME, false ); + SFX_REQUEST_ARG(rReq, pMailDocType, SfxStringItem, SID_TYPE_NAME); if ( pMailDocType ) aDocType = pMailDocType->GetValue(); @@ -750,7 +750,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_PLUGINS_ACTIVE: { - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nId, false); + SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nId); bool const bActive = (pShowItem) ? pShowItem->GetValue() : !pImp->m_bPlugInsActive; |