summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-12-10 08:06:06 +0100
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-20 01:25:49 -0400
commit5e94b28f3392f544d52a72836521be9168db2768 (patch)
treef0e152e0e42128543958487e8e3e81d94a58a750 /svx
parent9eef06f0db88461e9efa92c8cac6107200f7b942 (diff)
loplugin:nullptr: More NULL -> nullptr automatic rewrite
Change-Id: Ie83819e2bcdc5fa160b39296b005ca9a5ff74b1d (cherry picked from commit fb8a3fac5d448451794804a7470be45fa14da453)
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/fmcontrollayout.cxx2
-rw-r--r--svx/source/form/fmshell.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 85061c89531f..87d1bc2dd052 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -94,7 +94,7 @@ namespace svxform
if ( xChild.is() )
return getTypedModelNode< INTERFACE_TYPE >( xChild->getParent() );
else
- return NULL;
+ return nullptr;
}
}
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index c8bbc1bc60bd..18a29f44c7ed 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -521,7 +521,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
// name, so I do not really have a big problem with this ....
SfxBoolItem aGrabFocusIndicatorItem( SID_FM_TOGGLECONTROLFOCUS, true );
GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSlot, SfxCallMode::ASYNCHRON,
- &aGrabFocusIndicatorItem, NULL );
+ &aGrabFocusIndicatorItem, nullptr );
}
rReq.Done();
@@ -816,7 +816,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
// initially open the filter navigator, the whole form based filter is pretty useless without it
SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, true );
GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SfxCallMode::ASYNCHRON,
- &aIdentifierItem, NULL );
+ &aIdentifierItem, nullptr );
} break;
}
}