summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-03-30 14:39:54 +0200
committerMichael Stahl <mstahl@redhat.com>2016-03-30 14:42:47 +0200
commitba0a866b83f016fd460320e7d057dd107e019f19 (patch)
tree155cc41d0f52eeb52732df9d7d159fcfa45cc0c9 /sd/source/ui
parent1f611f3bb3b3d30b2b30570a09b4477ffb585ce4 (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 'sd/source/ui')
-rw-r--r--sd/source/ui/view/drviews1.cxx2
-rw-r--r--sd/source/ui/view/drviews2.cxx8
-rw-r--r--sd/source/ui/view/drviews5.cxx6
-rw-r--r--sd/source/ui/view/drviews9.cxx3
-rw-r--r--sd/source/ui/view/drviewsa.cxx2
-rw-r--r--sd/source/ui/view/drviewsb.cxx4
-rw-r--r--sd/source/ui/view/drviewsd.cxx2
-rw-r--r--sd/source/ui/view/drviewse.cxx2
-rw-r--r--sd/source/ui/view/drviewsi.cxx3
9 files changed, 19 insertions, 13 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 29b1b00cba96..de29408f2abd 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -163,7 +163,7 @@ void DrawViewShell::SelectionHasChanged()
//Update3DWindow(); // 3D-Controller
SfxBoolItem aItem( SID_3D_STATE, true );
GetViewFrame()->GetDispatcher()->Execute(
- SID_3D_STATE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0 );
+ SID_3D_STATE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, nullptr);
SdrOle2Obj* pOleObj = nullptr;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index e7d431c926d3..68aa34b767b4 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1049,7 +1049,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
// The value (sal_uInt16)0xFFFF means set bullet on/off.
SfxUInt16Item aItem(FN_SVX_SET_BULLET, (sal_uInt16)0xFFFF);
- GetViewFrame()->GetDispatcher()->Execute( FN_SVX_SET_BULLET, SfxCallMode::RECORD, &aItem, 0 );
+ GetViewFrame()->GetDispatcher()->Execute(FN_SVX_SET_BULLET,
+ SfxCallMode::RECORD, &aItem, nullptr);
}
break;
@@ -1057,7 +1058,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
// The value (sal_uInt16)0xFFFF means set bullet on/off.
SfxUInt16Item aItem(FN_SVX_SET_NUMBER, (sal_uInt16)0xFFFF);
- GetViewFrame()->GetDispatcher()->Execute( FN_SVX_SET_NUMBER, SfxCallMode::RECORD, &aItem, 0 );
+ GetViewFrame()->GetDispatcher()->Execute(FN_SVX_SET_NUMBER,
+ SfxCallMode::RECORD, &aItem, nullptr);
}
break;
@@ -1740,7 +1742,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
&aUrl, &aTarget,
&aFrm, &aReferer,
&aNewView, &aBrowsing,
- 0 );
+ nullptr);
}
}
}
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index a084e86360a5..477b5b79413d 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -74,7 +74,7 @@ void DrawViewShell::ModelHasChanged()
SfxBoolItem aItem( SID_3D_STATE, true );
GetViewFrame()->GetDispatcher()->Execute(
- SID_3D_STATE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0 );
+ SID_3D_STATE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, nullptr);
// now initialize the TextEditOutliner which was newly created by the draw engine
::Outliner* pOutliner = mpDrawView->GetTextEditOutliner();
@@ -300,7 +300,9 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
if ( mpDrawView->IsDesignMode() != pView->IsDesignMode() )
{
SfxBoolItem aDesignModeItem( SID_FM_DESIGN_MODE, pView->IsDesignMode() );
- GetViewFrame()->GetDispatcher()->Execute( SID_FM_DESIGN_MODE, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aDesignModeItem, 0 );
+ GetViewFrame()->GetDispatcher()->Execute(SID_FM_DESIGN_MODE,
+ SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
+ &aDesignModeItem, nullptr);
}
// has to be called in the end, because it executes a WriteFrameViewData()
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 30868dadeaea..b4ece57c30c5 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -177,7 +177,8 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
else if( nType == css::gallery::GalleryItemType::MEDIA )
{
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);
}
GetDocSh()->SetWaitCursor( false );
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index a4633c60a69b..35cfb9e6593e 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -750,7 +750,7 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint)
SfxBoolItem aItem( SID_FM_DESIGN_MODE, !mbReadOnly );
GetViewFrame()->GetDispatcher()->Execute( SID_FM_DESIGN_MODE,
- SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0 );
+ SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, nullptr);
}
}
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 811dc8e8360a..eb6842c8eb29 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -121,8 +121,8 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName )
// inform navigator about change
SfxBoolItem aItem( SID_NAVIGATOR_INIT, true );
- GetViewFrame()->GetDispatcher()->Execute(
- SID_NAVIGATOR_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0 );
+ GetViewFrame()->GetDispatcher()->Execute(SID_NAVIGATOR_INIT,
+ SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, nullptr);
// Tell the slide sorter about the name change (necessary for
// accessibility.)
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index db6a02423807..6cf3b4e9a9b1 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -136,7 +136,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
SfxBoolItem aBrowseItem(SID_BROWSE, true);
pFrame->GetDispatcher()->
Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
- &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0);
+ &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, nullptr);
}
SfxBindings& rBindings = GetViewFrame()->GetBindings();
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<SdrTextObj*>(pObj), pPageView);
break;
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index c5a3e5201e9a..7964e5dcd305 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -140,7 +140,8 @@ void DrawViewShell::AssignFrom3DWindow()
sal_uInt16 nSId = SID_CONVERT_TO_3D;
SfxBoolItem aItem( nSId, true );
GetViewFrame()->GetDispatcher()->Execute(
- nSId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aItem, 0 );
+ nSId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
+ &aItem, nullptr);
// Determine if a FILL attribute is set.
// If not, hard set a fill attribute