From ba0a866b83f016fd460320e7d057dd107e019f19 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 30 Mar 2016 14:39:54 +0200 Subject: 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 --- sd/source/ui/view/drviewse.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd/source/ui/view/drviewse.cxx') diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 1599fb8e188f..d22f581206cc 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -619,7 +619,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) SfxUInt16Item aItem (SID_TEXTEDIT, 1); GetViewFrame()->GetDispatcher()-> Execute(SID_TEXTEDIT, SfxCallMode::SYNCHRON | - SfxCallMode::RECORD, &aItem, 0); + SfxCallMode::RECORD, &aItem, nullptr); // Put text object into edit mode. GetView()->SdrBeginTextEdit(static_cast(pObj), pPageView); break; -- cgit