diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:26:16 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:54 +0100 |
commit | 175e2adfd1677cb83373b0ba47853493f3b77859 (patch) | |
tree | 8509fc88a7b4875ece2b50530e35bef17d9d4d29 /toolkit/source/controls/grid | |
parent | a9b4c9ca3df362cbe0f7904003197bcadd607215 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Ied9204441c07f1f6a6026c8c1a2fa21b93b98e1a
Diffstat (limited to 'toolkit/source/controls/grid')
4 files changed, 5 insertions, 5 deletions
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 8de9356bffd0..41d95d5f8824 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -114,7 +114,7 @@ private: Reference< XGridColumn > const xClone( xCloneable->createClone(), UNO_QUERY_THROW ); GridColumn* const pGridColumn = GridColumn::getImplementation( xClone ); - if ( pGridColumn == NULL ) + if ( pGridColumn == nullptr ) throw RuntimeException( "invalid clone source implementation", *this ); // that's indeed a RuntimeException, not an IllegalArgumentException or some such: // a DefaultGridColumnModel implementation whose columns are not GridColumn implementations @@ -157,7 +157,7 @@ private: ::comphelper::ComponentGuard aGuard( *this, rBHelper ); GridColumn* const pGridColumn = GridColumn::getImplementation( i_column ); - if ( pGridColumn == NULL ) + if ( pGridColumn == nullptr ) throw css::lang::IllegalArgumentException( "invalid column implementation", *this, 1 ); m_aColumns.push_back( i_column ); diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 39eaa564c270..90f79dae8fa8 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -305,7 +305,7 @@ namespace toolkit Reference< XUnoTunnel > const xTunnel( i_component, UNO_QUERY ); if ( xTunnel.is() ) return reinterpret_cast< GridColumn* >( ::sal::static_int_cast< sal_IntPtr >( xTunnel->getSomething( getUnoTunnelId() ) ) ); - return NULL; + return nullptr; } } diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 3fb05f95790c..a3991bcfb2c4 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -251,7 +251,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const ::cppu::IPropertyArrayHelper& UnoGridModel::getInfoHelper() { - static UnoPropertyArrayHelper* pHelper = NULL; + static UnoPropertyArrayHelper* pHelper = nullptr; if ( !pHelper ) { Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 7de6d318ce9e..e8809a16d2a1 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -345,7 +345,7 @@ private: GridDataEvent const & i_publicEvent, MethodGuard& i_instanceLock ) { ::cppu::OInterfaceContainerHelper* pListeners = rBHelper.getContainer( cppu::UnoType<XGridDataListener>::get() ); - if ( pListeners == NULL ) + if ( pListeners == nullptr ) return; i_instanceLock.clear(); |