summaryrefslogtreecommitdiff
path: root/extensions/source/propctrlr/fontdialog.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:14:53 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:25 +0100
commitf19dda5a55156afda2c6dde6c51c455cc5657fc2 (patch)
treea0ec501f676cf5ec67aaf0eb3b8572dc1bad0db0 /extensions/source/propctrlr/fontdialog.cxx
parente1e967a1bb0f4e4fac50f353c990389ccc73a053 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I5bbef6c88255f3e8c740a5239a5010cf1251b7fa
Diffstat (limited to 'extensions/source/propctrlr/fontdialog.cxx')
-rw-r--r--extensions/source/propctrlr/fontdialog.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 5ee879ccf4f1..bef80878706a 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -178,8 +178,8 @@ namespace pcr
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
assert(pFact); //CreateFactory fail!
- m_nCharsId = AddTabPage("font", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), 0 );
- AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), 0 );
+ m_nCharsId = AddTabPage("font", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr );
+ AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr );
}
@@ -483,9 +483,9 @@ namespace pcr
SfxItemSet* ControlCharacterDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults)
{
// just to be sure ....
- _rpSet = NULL;
- _rpPool = NULL;
- _rppDefaults = NULL;
+ _rpSet = nullptr;
+ _rpPool = nullptr;
+ _rppDefaults = nullptr;
// create and initialize the defaults
_rppDefaults = new SfxPoolItem*[CFID_LAST_ITEM_ID - CFID_FIRST_ITEM_ID + 1];
@@ -563,17 +563,17 @@ namespace pcr
if (_rpSet)
{
delete _rpSet;
- _rpSet = NULL;
+ _rpSet = nullptr;
}
// delete the pool
_rpPool->ReleaseDefaults(true);
// the "true" means delete the items, too
SfxItemPool::Free(_rpPool);
- _rpPool = NULL;
+ _rpPool = nullptr;
// reset the defaults ptr
- _rppDefaults = NULL;
+ _rppDefaults = nullptr;
// no need to explicitly delete the defaults, this has been done by the ReleaseDefaults
delete pFontList;