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/view/tabvwshe.cxx | |
| 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/view/tabvwshe.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwshe.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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: |