diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-01 09:27:07 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:40:40 +0100 |
| commit | 4ff758fea152d6de492d472fba1f889592a3f696 (patch) | |
| tree | 673296a7e7baed667ff66a1262978a66853debf4 /svx | |
| parent | 8a65284fe31e6c0a927cb88b75df7845cd248572 (diff) | |
Manual cleanup of misc. issues.
Change-Id: Ib0b9b17010f7c1b0814b48f6fb0144e5296418df
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmshell.cxx | 5 | ||||
| -rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 2 | ||||
| -rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 69514c7d37a9..c4714155e1a2 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -269,8 +269,9 @@ bool FmFormShell::PrepareClose(bool bUI) if ( bModified && bUI ) { - ScopedVclPtr<MessageDialog> aQry(nullptr, "SaveModifiedDialog", - "svx/ui/savemodifieddialog.ui"); + ScopedVclPtrInstance<MessageDialog> aQry( + nullptr, "SaveModifiedDialog", + "svx/ui/savemodifieddialog.ui"); switch (aQry->Execute()) { case RET_NO: diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index bde80c43b67d..912b8d8fa357 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -583,7 +583,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB double fDepth = static_cast<const SvxDoubleItem*>(rReq.GetArgs()->GetItem(SID_EXTRUSION_DEPTH))->GetValue(); FieldUnit eUnit = (FieldUnit)static_cast<const SfxUInt16Item*>(rReq.GetArgs()->GetItem(SID_ATTR_METRIC))->GetValue(); - ScopedVclPtrInstance< ExtrusionDepthDialog > aDlg(0L, fDepth, eUnit); + ScopedVclPtrInstance< ExtrusionDepthDialog > aDlg(nullptr, fDepth, eUnit); sal_uInt16 nRet = aDlg->Execute(); if( nRet != 0 ) { diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 575cdc81d5d1..72b2661cfd73 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -491,7 +491,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi if( rReq.GetArgs() && ( rReq.GetArgs()->GetItemState( SID_FONTWORK_CHARACTER_SPACING ) == SfxItemState::SET ) ) { sal_Int32 nCharSpacing = static_cast<const SfxInt32Item*>(rReq.GetArgs()->GetItem(SID_FONTWORK_CHARACTER_SPACING))->GetValue(); - ScopedVclPtrInstance< FontworkCharacterSpacingDialog > aDlg( 0L, nCharSpacing ); + ScopedVclPtrInstance< FontworkCharacterSpacingDialog > aDlg( nullptr, nCharSpacing ); sal_uInt16 nRet = aDlg->Execute(); if( nRet != 0 ) { |