summaryrefslogtreecommitdiff
path: root/chart2/source/model
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:11:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:18 +0100
commit40c4a086521703e64f7f182d8e07490855cfeb0a (patch)
tree713a700c6bc2966a3d8376c5c9da661e90fd2c50 /chart2/source/model
parentc40c7a8c364bd8f1d7777e803e5a6b0cfddeaca3 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I71de514405bb9bcc746c1ab9633e7fe659888943
Diffstat (limited to 'chart2/source/model')
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx4
-rw-r--r--chart2/source/model/main/Axis.cxx8
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx2
-rw-r--r--chart2/source/model/main/ChartModel.cxx26
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx2
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx2
6 files changed, 22 insertions, 22 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index feb94a2db053..1e06b3d7500f 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -229,7 +229,7 @@ sal_Bool SAL_CALL XMLFilter::filter(
if( impl_Export( m_xSourceDoc,
aDescriptor ) == 0 )
{
- m_xSourceDoc = NULL;
+ m_xSourceDoc = nullptr;
bResult = true;
}
}
@@ -238,7 +238,7 @@ sal_Bool SAL_CALL XMLFilter::filter(
if( impl_Import( m_xTargetDoc,
aDescriptor ) == 0 )
{
- m_xTargetDoc = NULL;
+ m_xTargetDoc = nullptr;
bResult = true;
}
}
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 79855d68ac44..b8040e7b5648 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -406,7 +406,7 @@ Axis::~Axis()
if( m_aScaleData.Categories.is())
{
ModifyListenerHelper::removeListener( m_aScaleData.Categories, m_xModifyEventForwarder );
- m_aScaleData.Categories.set(0);
+ m_aScaleData.Categories.set(nullptr);
}
}
catch( const uno::Exception & ex )
@@ -415,8 +415,8 @@ Axis::~Axis()
}
m_aSubGridProperties.realloc(0);
- m_xGrid = 0;
- m_xTitle = 0;
+ m_xGrid = nullptr;
+ m_xTitle = nullptr;
}
void Axis::AllocateSubGrids()
@@ -601,7 +601,7 @@ void SAL_CALL Axis::disposing( const lang::EventObject& Source )
throw (uno::RuntimeException, std::exception)
{
if( Source.Source == m_aScaleData.Categories )
- m_aScaleData.Categories = 0;
+ m_aScaleData.Categories = nullptr;
}
// ____ OPropertySet ____
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 22701436688e..ee431a8fca6d 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -221,7 +221,7 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension(
if( m_aAllAxis[ nDimensionIndex ].size() < static_cast< tAxisVecVecType::size_type >( nIndex+1 ))
{
m_aAllAxis[ nDimensionIndex ].resize( nIndex+1 );
- m_aAllAxis[ nDimensionIndex ][nIndex] = 0;
+ m_aAllAxis[ nDimensionIndex ][nIndex] = nullptr;
}
Reference< chart2::XAxis > xOldAxis( m_aAllAxis[ nDimensionIndex ][nIndex] );
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index e38dfcee6b4f..3f7c8f3eb598 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -96,21 +96,21 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
, m_nInLoad(0)
, m_bUpdateNotificationsPending(false)
, mbTimeBased(false)
- , mpChartView(NULL)
- , m_pUndoManager( NULL )
+ , mpChartView(nullptr)
+ , m_pUndoManager( nullptr )
, m_aControllers( m_aModelMutex )
, m_nControllerLockCount(0)
, m_xContext( xContext )
, m_aVisualAreaSize( ChartModelHelper::getDefaultPageSize() )
- , m_xDataProvider( 0 )
- , m_xInternalDataProvider( 0 )
+ , m_xDataProvider( nullptr )
+ , m_xInternalDataProvider( nullptr )
, m_xPageBackground( new PageBackground( m_xContext ) )
, m_xXMLNamespaceMap( createNameContainer( ::cppu::UnoType<OUString>::get(),
"com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY)
, mnStart(0)
, mnEnd(0)
,bSet(false)
- , mpOpenGLWindow(NULL)
+ , mpOpenGLWindow(nullptr)
{
OSL_TRACE( "ChartModel: CTOR called" );
@@ -139,7 +139,7 @@ ChartModel::ChartModel( const ChartModel & rOther )
, m_nInLoad(0)
, m_bUpdateNotificationsPending(false)
, mbTimeBased(rOther.mbTimeBased)
- , mpChartView(NULL)
+ , mpChartView(nullptr)
, m_aResource( rOther.m_aResource )
, m_aMediaDescriptor( rOther.m_aMediaDescriptor )
, m_aControllers( m_aModelMutex )
@@ -147,8 +147,8 @@ ChartModel::ChartModel( const ChartModel & rOther )
, m_xContext( rOther.m_xContext )
// @note: the old model aggregate must not be shared with other models if it
// is, you get mutex deadlocks
- , m_xOldModelAgg( 0 ) //rOther.m_xOldModelAgg )
- , m_xStorage( 0 ) //rOther.m_xStorage )
+ , m_xOldModelAgg( nullptr ) //rOther.m_xOldModelAgg )
+ , m_xStorage( nullptr ) //rOther.m_xStorage )
, m_aVisualAreaSize( rOther.m_aVisualAreaSize )
, m_aGraphicObjectVector( rOther.m_aGraphicObjectVector )
, m_xDataProvider( rOther.m_xDataProvider )
@@ -156,7 +156,7 @@ ChartModel::ChartModel( const ChartModel & rOther )
, mnStart(rOther.mnStart)
, mnEnd(rOther.mnEnd)
, bSet(false)
- , mpOpenGLWindow(NULL)
+ , mpOpenGLWindow(nullptr)
{
OSL_TRACE( "ChartModel: Copy-CTOR called" );
@@ -197,7 +197,7 @@ ChartModel::~ChartModel()
{
OSL_TRACE( "ChartModel: DTOR called" );
if( m_xOldModelAgg.is())
- m_xOldModelAgg->setDelegator( NULL );
+ m_xOldModelAgg->setDelegator( nullptr );
}
void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ )
@@ -581,7 +581,7 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception)
// that's important, since the UndoManager implementation delegates its ref counting to ourself.
if( m_xOldModelAgg.is()) // #i120828#, to release cyclic reference to ChartModel object
- m_xOldModelAgg->setDelegator( 0 );
+ m_xOldModelAgg->setDelegator( nullptr );
m_aControllers.disposeAndClear( lang::EventObject( static_cast< cppu::OWeakObject * >( this )));
m_xCurrentController.clear();
@@ -589,7 +589,7 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception)
DisposeHelper::DisposeAndClear( m_xRangeHighlighter );
if( m_xOldModelAgg.is())
- m_xOldModelAgg->setDelegator( NULL );
+ m_xOldModelAgg->setDelegator( nullptr );
OSL_TRACE( "ChartModel: dispose() called" );
}
@@ -1276,7 +1276,7 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString
}
}
}
- return 0;
+ return nullptr;
}
Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments(
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index c9e247b23571..f959b625f24c 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -514,7 +514,7 @@ void SAL_CALL ChartModel::load(
aMDHelper.FilterName == "StarChart 3.0" ))
{
attachResource( aMDHelper.URL, rMediaDescriptor );
- impl_load( rMediaDescriptor, 0 ); // cannot create a storage from binary streams, but I do not need the storage here anyhow
+ impl_load( rMediaDescriptor, nullptr ); // cannot create a storage from binary streams, but I do not need the storage here anyhow
m_bReadOnly = true;
return;
}
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index f166c6d39f0b..ad12cac7cffd 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -261,7 +261,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance(
// function will just return an empty XInterface.
ASSERT_EXCEPTION( ex );
SAL_WARN("chart2", "Couldn't instantiate service: "<< aServiceSpecifier );
- xResult.set( 0 );
+ xResult.set( nullptr );
}
}
else