diff options
Diffstat (limited to 'chart2/source/controller/itemsetwrapper')
7 files changed, 22 insertions, 22 deletions
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 59f0b791ccf0..d42c166edf89 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -84,8 +84,8 @@ AxisItemConverter::AxisItemConverter( const awt::Size* pRefSize ) : ItemConverter( rPropertySet, rItemPool ), m_xChartDoc( xChartDoc ), - m_pExplicitScale( NULL ), - m_pExplicitIncrement( NULL ) + m_pExplicitScale( nullptr ), + m_pExplicitIncrement( nullptr ) { Reference< lang::XMultiServiceFactory > xNamedPropertyContainerFactory( xChartDoc, uno::UNO_QUERY ); diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 805c1d21c480..714bb23fd697 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -168,7 +168,7 @@ GraphicPropertyItemConverter::~GraphicPropertyItemConverter() const sal_uInt16 * GraphicPropertyItemConverter::GetWhichPairs() const { - const sal_uInt16 * pResult = NULL; + const sal_uInt16 * pResult = nullptr; switch( m_eGraphicObjectType ) { diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index a5acbc5be764..312eaeadecbb 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -34,7 +34,7 @@ ItemConverter::ItemConverter( const uno::Reference< beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool ) : m_xPropertySet( rPropertySet ), - m_xPropertySetInfo( NULL ), + m_xPropertySetInfo( nullptr ), m_rItemPool( rItemPool ), m_bIsValid( true ) { @@ -83,7 +83,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const tPropertyNameWithMemberId aProperty; SfxItemPool & rPool = GetItemPool(); - assert(pRanges != NULL); + assert(pRanges != nullptr); OSL_ASSERT( m_xPropertySetInfo.is()); OSL_ASSERT( m_xPropertySet.is()); @@ -221,7 +221,7 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItem { SfxWhichIter aIter (rSourceSet); sal_uInt16 nWhich = aIter.FirstWhich (); - const SfxPoolItem *pPoolItem = NULL; + const SfxPoolItem *pPoolItem = nullptr; while (nWhich) { diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 41b65a980bc6..7dd83bdd9473 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -104,7 +104,7 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe { case SCHATTR_LEGEND_SHOW: { - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = nullptr; if( rInItemSet.GetItemState( SCHATTR_LEGEND_SHOW, true, &pPoolItem ) == SfxItemState::SET ) { bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); @@ -121,7 +121,7 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe break; case SCHATTR_LEGEND_POS: { - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = nullptr; if( rInItemSet.GetItemState( SCHATTR_LEGEND_POS, true, &pPoolItem ) == SfxItemState::SET ) { chart2::LegendPosition eNewPos = static_cast<chart2::LegendPosition>(static_cast<const SfxInt32Item*>(pPoolItem)->GetValue()); diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index af676b1823fe..bfcd17a10cf3 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -54,7 +54,7 @@ AllAxisItemConverter::AllAxisItemConverter( uno::Reference< beans::XPropertySet > xObjectProperties(aElementList[nA], uno::UNO_QUERY); m_aConverters.push_back( new ::chart::wrapper::AxisItemConverter( xObjectProperties, rItemPool, rDrawModel, - uno::Reference< chart2::XChartDocument >( xChartModel, uno::UNO_QUERY ), 0, 0, + uno::Reference< chart2::XChartDocument >( xChartModel, uno::UNO_QUERY ), nullptr, nullptr, pRefSize)); } } @@ -112,7 +112,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( for( aIt = aSeriesList.begin(); aIt != aSeriesList.end(); ++aIt ) { uno::Reference< beans::XPropertySet > xObjectProperties( *aIt, uno::UNO_QUERY); - uno::Reference< uno::XComponentContext> xContext(0);//do not need Context for label properties + uno::Reference< uno::XComponentContext> xContext(nullptr);//do not need Context for label properties sal_Int32 nNumberFormat=ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( xObjectProperties, *aIt, -1/*nPointIndex*/, ChartModelHelper::findDiagram( xChartModel ) ); sal_Int32 nPercentNumberFormat=ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabel( diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx index 32dd551f2987..3570366d0936 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; namespace chart { namespace wrapper { MultipleItemConverter::MultipleItemConverter( SfxItemPool& rItemPool ) - : ItemConverter( NULL, rItemPool ) + : ItemConverter( nullptr, rItemPool ) { } MultipleItemConverter::~MultipleItemConverter() diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index f7d905c440a2..999bbe888699 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -119,7 +119,7 @@ uno::Reference< beans::XPropertySet > lcl_getEquationProperties( if( pItemSet ) { SvxChartRegress eRegress = CHREGRESS_NONE; - const SfxPoolItem *pPoolItem = NULL; + const SfxPoolItem *pPoolItem = nullptr; if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, true, &pPoolItem ) == SfxItemState::SET ) { eRegress = static_cast< const SvxChartRegressItem * >( pPoolItem )->GetValue(); @@ -150,7 +150,7 @@ uno::Reference< beans::XPropertySet > lcl_getCurveProperties( if( pItemSet ) { SvxChartRegress eRegress = CHREGRESS_NONE; - const SfxPoolItem *pPoolItem = NULL; + const SfxPoolItem *pPoolItem = nullptr; if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, true, &pPoolItem ) == SfxItemState::SET ) { eRegress = static_cast< const SvxChartRegressItem * >( pPoolItem )->GetValue(); @@ -722,63 +722,63 @@ void StatisticsItemConverter::FillSpecialItem( case SCHATTR_REGRESSION_DEGREE: { - uno::Reference<beans::XPropertySet> xProperties( lcl_getCurveProperties( GetPropertySet(), 0 )); + uno::Reference<beans::XPropertySet> xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, "PolynomialDegree"); } break; case SCHATTR_REGRESSION_PERIOD: { - uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), 0 )); + uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, "MovingAveragePeriod"); } break; case SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD: { - uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), 0 )); + uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); lclConvertToItemSetDouble(rOutItemSet, nWhichId, xProperties, "ExtrapolateForward"); } break; case SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD: { - uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), 0 )); + uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); lclConvertToItemSetDouble(rOutItemSet, nWhichId, xProperties, "ExtrapolateBackward"); } break; case SCHATTR_REGRESSION_SET_INTERCEPT: { - uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), 0 )); + uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); lclConvertToItemSet<sal_Bool, SfxBoolItem>(rOutItemSet, nWhichId, xProperties, "ForceIntercept"); } break; case SCHATTR_REGRESSION_INTERCEPT_VALUE: { - uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), 0 )); + uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); lclConvertToItemSetDouble(rOutItemSet, nWhichId, xProperties, "InterceptValue"); } break; case SCHATTR_REGRESSION_CURVE_NAME: { - uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), 0 )); + uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xProperties, "CurveName"); } break; case SCHATTR_REGRESSION_SHOW_EQUATION: { - uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), 0 )); + uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), nullptr )); lclConvertToItemSet<sal_Bool, SfxBoolItem>(rOutItemSet, nWhichId, xEqProp, "ShowEquation"); } break; case SCHATTR_REGRESSION_SHOW_COEFF: { - uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), 0 )); + uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), nullptr )); lclConvertToItemSet<sal_Bool, SfxBoolItem>(rOutItemSet, nWhichId, xEqProp, "ShowCorrelationCoefficient"); } break; |