basctl/source/basicide/basicbox.cxx | 2 +-
basctl/source/basicide/bastype2.cxx | 2 +-
basctl/source/basicide/bastypes.cxx | 2 +-
basctl/source/basicide/macrodlg.cxx | 14 +++++++++++---
basctl/source/basicide/moduldl2.cxx | 2 +-
basctl/source/basicide/moduldlg.cxx | 22 ++++++++++++++--------
sc/source/core/data/global.cxx | 2 +-
sc/source/ui/app/inputwin.cxx | 2 +-
sc/source/ui/condformat/condformatdlgentry.cxx | 2 +-
sc/source/ui/dialogs/searchresults.cxx | 6 ++++--
sc/source/ui/formdlg/formula.cxx | 2 +-
sc/source/ui/view/tabvwsh5.cxx | 2 +-
sc/source/ui/view/tabvwsh9.cxx | 3 ++-
sc/source/ui/view/tabvwshe.cxx | 4 ++--
sc/source/ui/view/viewfun2.cxx | 3 ++-
sc/source/ui/view/viewfun4.cxx | 4 ++--
sc/source/ui/view/viewfun6.cxx | 2 +-
sc/source/ui/view/viewutil.cxx | 2 +-
sd/source/ui/view/drviews1.cxx | 2 +-
sd/source/ui/view/drviews2.cxx | 8 +++++---
sd/source/ui/view/drviews5.cxx | 6 ++++--
sd/source/ui/view/drviews9.cxx | 3 ++-
sd/source/ui/view/drviewsa.cxx | 2 +-
sd/source/ui/view/drviewsb.cxx | 4 ++--
sd/source/ui/view/drviewsd.cxx | 2 +-
sd/source/ui/view/drviewse.cxx | 2 +-
sd/source/ui/view/drviewsi.cxx | 3 ++-
27 files changed, 67 insertions(+), 43 deletions(-)
New commits:
commit ba0a866b83f016fd460320e7d057dd107e019f19
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Mar 30 14:39:54 2016 +0200
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
diff --git a/basctl/source/basicide/basicbox.cxx
b/basctl/source/basicide/basicbox.cxx
index 847a1a0..131e510 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -311,7 +311,7 @@ void LibBox::NotifyIDE()
if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute(
SID_BASICIDE_LIBSELECTED,
- SfxCallMode::SYNCHRON, &aDocumentItem, &aLibNameItem, 0
+ SfxCallMode::SYNCHRON, &aDocumentItem, &aLibNameItem, nullptr
);
}
ReleaseFocus();
diff --git a/basctl/source/basicide/bastype2.cxx
b/basctl/source/basicide/bastype2.cxx
index 288d7ed..652d53f 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -932,7 +932,7 @@ bool TreeListBox::OpenCurrent()
);
pDispatcher->Execute(
SID_BASICIDE_SHOWSBX,
- SfxCallMode::SYNCHRON, &aSbxItem, 0
+ SfxCallMode::SYNCHRON, &aSbxItem, nullptr
);
return true;
}
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index 01e0b6d..ae6a9375 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -555,7 +555,7 @@ void TabBar::EndRenaming()
SfxStringItem aNewName( SID_BASICIDE_ARG_MODULENAME, GetEditText() );
if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute( SID_BASICIDE_NAMECHANGEDONTAB,
- SfxCallMode::SYNCHRON, &aID, &aNewName, 0 );
+ SfxCallMode::SYNCHRON, &aID, &aNewName, nullptr);
}
}
diff --git a/basctl/source/basicide/macrodlg.cxx
b/basctl/source/basicide/macrodlg.cxx
index c4a5fa4..4070b50 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -678,7 +678,10 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *,
pButton, void )
SfxGetpApp()->ExecuteSlot( aRequest );
if (SfxDispatcher* pDispatcher = GetDispatcher())
- pDispatcher->Execute( SID_BASICIDE_EDITMACRO,
SfxCallMode::ASYNCHRON, &aInfoItem, 0 );
+ {
+ pDispatcher->Execute(SID_BASICIDE_EDITMACRO,
+ SfxCallMode::ASYNCHRON, &aInfoItem, nullptr);
+ }
EndDialog(Macro_Edit);
}
else
@@ -687,8 +690,10 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *,
pButton, void )
{
DeleteMacro();
if (SfxDispatcher* pDispatcher = GetDispatcher())
+ {
pDispatcher->Execute( SID_BASICIDE_UPDATEMODULESOURCE,
- SfxCallMode::SYNCHRON, &aInfoItem, 0
);
+ SfxCallMode::SYNCHRON, &aInfoItem, nullptr);
+ }
CheckButtons();
UpdateFields();
//if ( m_pMacroBox->GetCurEntry() ) // OV-Bug ?
@@ -714,7 +719,10 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *,
pButton, void )
SfxGetpApp()->ExecuteSlot( aRequest );
if (SfxDispatcher* pDispatcher = GetDispatcher())
- pDispatcher->Execute( SID_BASICIDE_EDITMACRO,
SfxCallMode::ASYNCHRON, &aInfoItem, 0 );
+ {
+ pDispatcher->Execute(SID_BASICIDE_EDITMACRO,
+ SfxCallMode::ASYNCHRON, &aInfoItem, nullptr);
+ }
StoreMacroDescription();
EndDialog(Macro_New);
}
diff --git a/basctl/source/basicide/moduldl2.cxx
b/basctl/source/basicide/moduldl2.cxx
index 54b0a30..a263219 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -632,7 +632,7 @@ IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton,
void )
SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute( SID_BASICIDE_LIBSELECTED,
- SfxCallMode::ASYNCHRON, &aDocItem,
&aLibNameItem, 0 );
+ SfxCallMode::ASYNCHRON, &aDocItem, &aLibNameItem, nullptr);
EndTabDialog();
return;
}
diff --git a/basctl/source/basicide/moduldlg.cxx
b/basctl/source/basicide/moduldlg.cxx
index c63e885..982f77d 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -122,7 +122,7 @@ bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry,
const OUString& rNewT
{
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, rNewText,
ConvertType( eType ) );
pDispatcher->Execute( SID_BASICIDE_SBXRENAMED,
- SfxCallMode::SYNCHRON, &aSbxItem, 0 );
+ SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
}
// OV-Bug?!
@@ -355,7 +355,7 @@ TriState ExtTreeListBox::NotifyCopyingMoving(
SvTreeListEntry* pTarget, SvTreeLi
{
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rSourceDoc,
aSourceLibName, aSourceName, ConvertType( eType ) );
pDispatcher->Execute( SID_BASICIDE_SBXDELETED,
- SfxCallMode::SYNCHRON, &aSbxItem, 0 );
+ SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
}
}
@@ -447,7 +447,7 @@ TriState ExtTreeListBox::NotifyCopyingMoving(
SvTreeListEntry* pTarget, SvTreeLi
{
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDestDoc, aDestLibName,
aSourceName, ConvertType( eType ) );
pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
- SfxCallMode::SYNCHRON, &aSbxItem, 0 );
+ SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
}
}
@@ -717,7 +717,8 @@ IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton,
void )
}
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(),
aDesc.GetLibName(),
aModName, TreeListBox::ConvertType(
aDesc.GetType() ) );
- pDispatcher->Execute( SID_BASICIDE_SHOWSBX,
SfxCallMode::SYNCHRON, &aSbxItem, 0 );
+ pDispatcher->Execute(SID_BASICIDE_SHOWSBX,
+ SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
}
}
else // Nur Lib selektiert
@@ -736,7 +737,8 @@ IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton,
void )
SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
if ( pDispatcher )
{
- pDispatcher->Execute( SID_BASICIDE_LIBSELECTED,
SfxCallMode::ASYNCHRON, &aDocItem, &aLibNameItem, 0 );
+ pDispatcher->Execute(SID_BASICIDE_LIBSELECTED,
+ SfxCallMode::ASYNCHRON, &aDocItem, &aLibNameItem, nullptr);
}
}
EndTabDialog();
@@ -841,8 +843,10 @@ void ObjectPage::NewDialog()
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName,
aDlgName, TYPE_DIALOG );
if (SfxDispatcher* pDispatcher = GetDispatcher())
+ {
pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
- SfxCallMode::SYNCHRON, &aSbxItem,
0 );
+ SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
+ }
LibraryLocation eLocation = aDocument.getLibraryLocation(
aLibName );
SvTreeListEntry* pRootEntry = m_pBasicBox->FindRootEntry(
aDocument, eLocation );
if ( pRootEntry )
@@ -897,7 +901,7 @@ void ObjectPage::DeleteCurrent()
{
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName,
aName, TreeListBox::ConvertType( eType ) );
pDispatcher->Execute( SID_BASICIDE_SBXDELETED,
- SfxCallMode::SYNCHRON, &aSbxItem, 0 );
+ SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
}
try
@@ -998,8 +1002,10 @@ SbModule* createModImpl( vcl::Window* pWin, const
ScriptDocument& rDocument,
pModule = pBasic->FindModule( aModName );
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName,
aModName, TYPE_MODULE );
if (SfxDispatcher* pDispatcher = GetDispatcher())
+ {
pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
- SfxCallMode::SYNCHRON, &aSbxItem, 0 );
+ SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
+ }
LibraryLocation eLocation = rDocument.getLibraryLocation( aLibName
);
SvTreeListEntry* pRootEntry = rBasicBox.FindRootEntry( rDocument,
eLocation );
if ( pRootEntry )
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 08aba82..12bc05c 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -926,7 +926,7 @@ void ScGlobal::OpenURL(const OUString& rURL, const
OUString& rTarget, const SdrM
&aUrl, &aTarget,
&aFrm, &aReferer,
&aNewView, &aBrowsing,
- 0 );
+ nullptr);
}
bool ScGlobal::IsSystemRTL()
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 68a199f..50545c0 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 eacd422..c34d146 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 5cafdca..c78ea2e 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 1814414..53fc657 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 1d7949a..8f1fd24 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 f8ccd46..aa08427 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 1bc92f8..0807a15 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 7e36b3a..3ed76c8 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 0e23548..0c9793e 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 77f1ef8..c4acfc9 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 37b6e6b..3b3e740 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);
}
}
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 29b1b00..de29408 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 e7d431c..68aa34b 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 a084e86..477b5b7 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 30868da..b4ece57 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 a4633c6..35cfb9e 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 811dc8e..eb6842c 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 db6a024..6cf3b4e 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 1599fb8..d22f581 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 c5a3e52..7964e5d 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
