diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-03-30 14:39:54 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-03-30 14:42:47 +0200 |
commit | ba0a866b83f016fd460320e7d057dd107e019f19 (patch) | |
tree | 155cc41d0f52eeb52732df9d7d159fcfa45cc0c9 /sc/source/ui | |
parent | 1f611f3bb3b3d30b2b30570a09b4477ffb585ce4 (diff) |
tdf#96505: fix wrong SfxDispatcher::Execute calls ...
... that are now busted on all 64-bit platforms since commit
57d0caacee2f395be2e89b78f8ece2d47b2c8683 but were already busted only
on 64-bit WNT before.
SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall,
const SfxPoolItem* pArg1, ...)
assigns the varargs to a "const SfxPoolItem *", so passing in
"0L" is only correct if long is 64-bit, but on WNT 64-bit long is
32-bit, so use "nullptr" already.
Change-Id: I50448d8ad121c4881be549623d44c44b00e56d98
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/app/inputwin.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/condformat/condformatdlgentry.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dialogs/searchresults.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh5.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh9.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwshe.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun4.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun6.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewutil.cxx | 2 |
11 files changed, 18 insertions, 14 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 68a199f99d61..50545c0baabb 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2277,7 +2277,7 @@ void ScPosWnd::DoEnter() pViewSh->GetViewData().GetDispatcher().Execute( SID_CURRENTCELL, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, - &aPosItem, &aUnmarkItem, 0 ); + &aPosItem, &aUnmarkItem, nullptr); } } } diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index eacd4228a470..c34d14619f76 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -499,7 +499,7 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre pDisp->Execute( SID_STYLE_NEW, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL, &aFamilyItem, &aRefItem, - 0 ); + nullptr); if (bLocked) pDisp->Lock(true); diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index 5cafdca7ed13..c78ea2e7572f 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -84,8 +84,10 @@ bool SearchResultsDlg::Close() SfxDispatcher* pDispacher = mpBindings ->GetDispatcher(); SfxBoolItem aItem(SID_SEARCH_RESULTS_DIALOG, false); if (pDispacher) - pDispacher->Execute( - SID_SEARCH_RESULTS_DIALOG, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0); + { + pDispacher->Execute(SID_SEARCH_RESULTS_DIALOG, + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, nullptr); + } } return ModelessDialog::Close(); diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 1814414a48f0..53fc65741ed7 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -533,7 +533,7 @@ void ScFormulaDlg::dispatch(bool _bOK, bool _bMatrixChecked) GetBindings().GetDispatcher()->Execute( SID_INS_FUNCTION, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, - &aRetItem, &aStrItem, &aMatItem, 0 ); + &aRetItem, &aStrItem, &aMatItem, nullptr); } void ScFormulaDlg::setDispatcherLock( bool bLock ) { diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 1d7949a57bbc..8f1fd2410ad9 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -113,7 +113,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SfxBoolItem aItem( SID_FM_DESIGN_MODE, !bReadOnly); GetViewData().GetDispatcher().Execute( SID_FM_DESIGN_MODE, SfxCallMode::ASYNCHRON, - &aItem, 0 ); + &aItem, nullptr); UpdateInputContext(); } diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index f8ccd46c5db0..aa08427f8077 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -84,7 +84,8 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) // for sounds (linked or not), insert a hyperlink button, // like in Impress and Writer const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() ); - GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, &aMediaURLItem, 0 ); + GetViewFrame()->GetDispatcher()->Execute(SID_INSERT_AVMEDIA, + SfxCallMode::SYNCHRON, &aMediaURLItem, nullptr); } } diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 1bc92f80c3f4..0807a154f13e 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -301,7 +301,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) GetViewData().GetDispatcher().Execute( FID_SEARCH_NOW, rReq.IsAPI() ? SfxCallMode::API|SfxCallMode::SYNCHRON : SfxCallMode::RECORD, - &aSearchItem, 0 ); + &aSearchItem, nullptr); const SfxChildWindow* pChildWindow = SfxViewFrame::Current()->GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId()); if (pChildWindow) @@ -338,7 +338,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) GetViewData().GetDispatcher().Execute( FID_SEARCH_NOW, rReq.IsAPI() ? SfxCallMode::API|SfxCallMode::SYNCHRON : SfxCallMode::RECORD, - &aSearchItem, 0 ); + &aSearchItem, nullptr); } break; // case FID_SEARCH_COUNT: diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 7e36b3ad2e07..3ed76c8f9a60 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2553,7 +2553,8 @@ void ScViewFunc::MoveTable( SfxStringItem aTarget( SID_TARGETNAME, OUString("_blank") ); const SfxPoolItem* pRetItem = GetViewData().GetDispatcher().Execute( - SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON, &aItem, &aTarget, 0 ); + SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON, + &aItem, &aTarget, nullptr); if ( pRetItem ) { if ( dynamic_cast<const SfxObjectItem*>( pRetItem) != nullptr ) diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 0e23548a18e0..0c9793e857fa 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -578,7 +578,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, aStrURL ); return ( nullptr != GetViewData().GetDispatcher().Execute( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, - &aMediaURLItem, 0 ) ); + &aMediaURLItem, nullptr) ); } if (!bLink) // for bLink only graphics or URL @@ -606,7 +606,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink // Open Asynchronously, because it can also happen from D&D // and that is not so good for the MAC... return ( nullptr != rDispatcher.Execute( SID_OPENDOC, - SfxCallMode::ASYNCHRON, &aFileNameItem, &aFilterItem, &aTargetItem, 0) ); + SfxCallMode::ASYNCHRON, &aFileNameItem, &aFilterItem, &aTargetItem, nullptr) ); } } diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 77f1ef8b3e9f..c4acfc923b2b 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -113,7 +113,7 @@ static void lcl_jumpToRange(const ScRange& rRange, ScViewData* pView, ScDocument SfxBoolItem aUnmarkItem(FN_PARAM_1, true); // remove existing selection pView->GetDispatcher().Execute( SID_CURRENTCELL, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, - &aPosItem, &aUnmarkItem, 0); + &aPosItem, &aUnmarkItem, nullptr); } void ScViewFunc::MarkAndJumpToRanges(const ScRangeList& rRanges) diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index 37b6e6b9999e..3b3e7407de09 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -382,7 +382,7 @@ void ScViewUtil::SetFullScreen( SfxViewShell& rViewShell, bool bSet ) if( IsFullScreen( rViewShell ) != bSet ) { SfxBoolItem aItem( SID_WIN_FULLSCREEN, bSet ); - rViewShell.GetDispatcher()->Execute( SID_WIN_FULLSCREEN, SfxCallMode::RECORD, &aItem, 0 ); + rViewShell.GetDispatcher()->Execute(SID_WIN_FULLSCREEN, SfxCallMode::RECORD, &aItem, nullptr); } } |