diff options
Diffstat (limited to 'chart2/source/view')
38 files changed, 245 insertions, 245 deletions
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 6f12154c4473..f60dfce99019 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -34,7 +34,7 @@ TickInfo::TickInfo( const uno::Reference<chart2::XScaling>& xInverse ) , xInverseScaling( xInverse ) , aTickScreenPosition(0.0,0.0) , bPaintIt( true ) -, xTextShape( NULL ) +, xTextShape( nullptr ) , nFactorForLimitedTextWidth(1) { } @@ -71,7 +71,7 @@ TickInfo* PureTickIter::firstInfo() m_aTickIter = m_rTickVector.begin(); if(m_aTickIter!=m_rTickVector.end()) return &*m_aTickIter; - return 0; + return nullptr; } TickInfo* PureTickIter::nextInfo() { @@ -81,14 +81,14 @@ TickInfo* PureTickIter::nextInfo() if(m_aTickIter!=m_rTickVector.end()) return &*m_aTickIter; } - return 0; + return nullptr; } TickFactory::TickFactory( const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement ) : m_rScale( rScale ) , m_rIncrement( rIncrement ) - , m_xInverseScaling(NULL) + , m_xInverseScaling(nullptr) { //@todo: make sure that the scale is valid for the scaling diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx index 71fb1f382b8e..5b9b9dab1f11 100644 --- a/chart2/source/view/axes/Tickmarks_Dates.cxx +++ b/chart2/source/view/axes/Tickmarks_Dates.cxx @@ -36,7 +36,7 @@ DateTickFactory::DateTickFactory( const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement ) : m_aScale( rScale ) , m_aIncrement( rIncrement ) - , m_xInverseScaling(NULL) + , m_xInverseScaling(nullptr) { //@todo: make sure that the scale is valid for the scaling diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx index 6f7a39da897d..792635bb4971 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx @@ -73,8 +73,8 @@ EquidistantTickFactory::EquidistantTickFactory( const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement ) : m_rScale( rScale ) , m_rIncrement( rIncrement ) - , m_xInverseScaling(NULL) - , m_pfCurrentValues(NULL) + , m_xInverseScaling(nullptr) + , m_pfCurrentValues(nullptr) { //@todo: make sure that the scale is valid for the scaling @@ -156,7 +156,7 @@ void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno:: sal_Int32 nRealSubTickCount = 0; sal_Int32 nIntervalCount = m_rIncrement.SubIncrements[nDepth-1].IntervalCount; - double* pValue = NULL; + double* pValue = nullptr; for(; pfNextParentTick; fLastParentTick=*pfNextParentTick, pfNextParentTick = aIter.nextValue()) { for( sal_Int32 nPartTick = 1; nPartTick<nIntervalCount; nPartTick++ ) @@ -227,12 +227,12 @@ double* EquidistantTickFactory::getMajorTick( sal_Int32 nTick ) const if(m_pfCurrentValues[0]>m_fOuterMajorTickBorderMax) { if( !approxEqual(m_pfCurrentValues[0],m_fOuterMajorTickBorderMax) ) - return NULL; + return nullptr; } if(m_pfCurrentValues[0]<m_fOuterMajorTickBorderMin) { if( !approxEqual(m_pfCurrentValues[0],m_fOuterMajorTickBorderMin) ) - return NULL; + return nullptr; } //return always the value after scaling @@ -249,15 +249,15 @@ double* EquidistantTickFactory::getMinorTick( sal_Int32 nTick, sal_Int32 nDepth { //OSL_ENSURE( fStartParentTick < fNextParentTick, "fStartParentTick >= fNextParentTick"); if(fStartParentTick >= fNextParentTick) - return NULL; + return nullptr; if(nDepth>static_cast<sal_Int32>(m_rIncrement.SubIncrements.size()) || nDepth<=0) - return NULL; + return nullptr; //subticks are only calculated if they are laying between parent ticks: if(nTick<=0) - return NULL; + return nullptr; if(nTick>=m_rIncrement.SubIncrements[nDepth-1].IntervalCount) - return NULL; + return nullptr; } bool bPostEquidistant = m_rIncrement.SubIncrements[nDepth-1].PostEquidistant; @@ -280,7 +280,7 @@ double* EquidistantTickFactory::getMinorTick( sal_Int32 nTick, sal_Int32 nDepth m_pfCurrentValues[nDepth] = m_rScale.Scaling->doScaling( m_pfCurrentValues[nDepth] ); if( !isWithinOuterBorder( m_pfCurrentValues[nDepth] ) ) - return NULL; + return nullptr; return &m_pfCurrentValues[nDepth]; } @@ -417,11 +417,11 @@ EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< do , const ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth, sal_Int32 nMaxDepth ) : m_pSimpleTicks(&rTicks) - , m_pInfoTicks(0) + , m_pInfoTicks(nullptr) , m_rIncrement(rIncrement) , m_nMaxDepth(0) - , m_nTickCount(0), m_pnPositions(NULL) - , m_pnPreParentCount(NULL), m_pbIntervalFinished(NULL) + , m_nTickCount(0), m_pnPositions(nullptr) + , m_pnPreParentCount(nullptr), m_pbIntervalFinished(nullptr) , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 ) { initIter( nMinDepth, nMaxDepth ); @@ -430,12 +430,12 @@ EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< do EquidistantTickIter::EquidistantTickIter( TickInfoArraysType& rTicks , const ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth, sal_Int32 nMaxDepth ) - : m_pSimpleTicks(NULL) + : m_pSimpleTicks(nullptr) , m_pInfoTicks(&rTicks) , m_rIncrement(rIncrement) , m_nMaxDepth(0) - , m_nTickCount(0), m_pnPositions(NULL) - , m_pnPreParentCount(NULL), m_pbIntervalFinished(NULL) + , m_nTickCount(0), m_pnPositions(nullptr) + , m_pnPreParentCount(nullptr), m_pbIntervalFinished(nullptr) , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 ) { initIter( nMinDepth, nMaxDepth ); @@ -519,14 +519,14 @@ double* EquidistantTickIter::firstValue() m_fCurrentValue = getTickValue(m_nCurrentDepth, m_pnPositions[m_nCurrentDepth]); return &m_fCurrentValue; } - return NULL; + return nullptr; } TickInfo* EquidistantTickIter::firstInfo() { if( m_pInfoTicks && gotoFirst() ) return &(*m_pInfoTicks)[m_nCurrentDepth][m_pnPositions[m_nCurrentDepth]]; - return NULL; + return nullptr; } sal_Int32 EquidistantTickIter::getIntervalCount( sal_Int32 nDepth ) @@ -613,7 +613,7 @@ double* EquidistantTickIter::nextValue() m_fCurrentValue = getTickValue(m_nCurrentDepth, m_pnPositions[m_nCurrentDepth]); return &m_fCurrentValue; } - return NULL; + return nullptr; } TickInfo* EquidistantTickIter::nextInfo() @@ -624,7 +624,7 @@ TickInfo* EquidistantTickIter::nextInfo() { return &(*m_pInfoTicks)[m_nCurrentDepth][m_pnPositions[m_nCurrentDepth]]; } - return NULL; + return nullptr; } } //namespace chart diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 55c26123df79..e2e83944dedb 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -222,7 +222,7 @@ void VAxisBase::removeTextShapesFromTicks() if(rTickInfo.xTextShape.is()) { m_xTextTarget->remove(rTickInfo.xTextShape); - rTickInfo.xTextShape = NULL; + rTickInfo.xTextShape = nullptr; } } } @@ -231,7 +231,7 @@ void VAxisBase::removeTextShapesFromTicks() void VAxisBase::updateUnscaledValuesAtTicks( TickIter& rIter ) { - Reference< XScaling > xInverseScaling( NULL ); + Reference< XScaling > xInverseScaling( nullptr ); if( m_aScale.Scaling.is() ) xInverseScaling = m_aScale.Scaling->getInverseScaling(); diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 85721ada8309..ac0c4a5d7529 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -174,7 +174,7 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel , m_nAxisType(AxisType::REALNUMBER) , m_bComplexCategories(false) , m_pExplicitCategoriesProvider(pExplicitCategoriesProvider) - , m_xAxisTextProvider(0) + , m_xAxisTextProvider(nullptr) { } diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index e5f8840ab3b6..7847e2fade23 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -72,7 +72,7 @@ VCartesianAxis::VCartesianAxis( const AxisProperties& rAxisProperties VCartesianAxis::~VCartesianAxis() { delete m_pPosHelper; - m_pPosHelper = NULL; + m_pPosHelper = nullptr; } Reference< drawing::XShape > createSingleLabel( @@ -87,7 +87,7 @@ Reference< drawing::XShape > createSingleLabel( ) { if(rLabel.isEmpty()) - return 0; + return nullptr; // #i78696# use mathematically correct rotation now const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); @@ -189,7 +189,7 @@ void removeShapesAtWrongRhythm( TickIter& rIter if(pTickInfo->xTextShape.is()) { xTarget->remove(pTickInfo->xTextShape); - pTickInfo->xTextShape = NULL; + pTickInfo->xTextShape = nullptr; } } } @@ -235,7 +235,7 @@ TickInfo* LabelIterator::firstInfo() while( pTickInfo && !pTickInfo->xTextShape.is() ) pTickInfo = m_aPureTickIter.nextInfo(); if(!pTickInfo) - return NULL; + return nullptr; if( (STAGGER_EVEN==m_eAxisLabelStaggering && m_bInnerLine) || (STAGGER_ODD==m_eAxisLabelStaggering && !m_bInnerLine) @@ -247,13 +247,13 @@ TickInfo* LabelIterator::firstInfo() while( pTickInfo && !pTickInfo->xTextShape.is() ); } if(!pTickInfo) - return NULL; + return nullptr; return pTickInfo; } TickInfo* LabelIterator::nextInfo() { - TickInfo* pTickInfo = NULL; + TickInfo* pTickInfo = nullptr; //get next label do pTickInfo = m_aPureTickIter.nextInfo(); @@ -285,7 +285,7 @@ B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTick aStaggerDirection.normalize(); sal_Int32 nDistance=0; - Reference< drawing::XShape > xShape2DText(NULL); + Reference< drawing::XShape > xShape2DText(nullptr); for( TickInfo* pTickInfo = rIter.firstInfo() ; pTickInfo ; pTickInfo = rIter.nextInfo() ) @@ -314,7 +314,7 @@ void lcl_shiftLabels( TickIter& rIter, const B2DVector& rStaggerDistance ) { if(rStaggerDistance.getLength()==0.0) return; - Reference< drawing::XShape > xShape2DText(NULL); + Reference< drawing::XShape > xShape2DText(nullptr); for( TickInfo* pTickInfo = rIter.firstInfo() ; pTickInfo ; pTickInfo = rIter.nextInfo() ) @@ -469,7 +469,7 @@ TickInfo* MaxLabelTickIter::firstInfo() m_nCurrentIndex = 0; if (m_nCurrentIndex < m_aValidIndices.size()) return &m_rTickInfoVector[m_aValidIndices[m_nCurrentIndex]]; - return 0; + return nullptr; } TickInfo* MaxLabelTickIter::nextInfo() @@ -477,7 +477,7 @@ TickInfo* MaxLabelTickIter::nextInfo() m_nCurrentIndex++; if (m_nCurrentIndex < m_aValidIndices.size()) return &m_rTickInfoVector[m_aValidIndices[m_nCurrentIndex]]; - return 0; + return nullptr; } bool VCartesianAxis::isBreakOfLabelsAllowed( @@ -542,7 +542,7 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( TickInfoArraysType for(;aIt!=aEnd;++aIt) { - TickInfo aTickInfo(0); + TickInfo aTickInfo(nullptr); ComplexCategory aCat(*aIt); sal_Int32 nCount = aCat.Count; if( nCatIndex + 1.0 + nCount >= m_aScale.Maximum ) @@ -579,7 +579,7 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( TickInfoArraysType std::vector<ComplexCategory>::const_iterator aEnd = pComplexCategories->end(); for(;aIt!=aEnd;++aIt) { - TickInfo aTickInfo(0); + TickInfo aTickInfo(nullptr); ComplexCategory aCat(*aIt); aTickInfo.fScaledTickValue = nCatIndex + 1.0; aTickInfoVector.push_back(aTickInfo); @@ -592,7 +592,7 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( TickInfoArraysType //fill up with single ticks until maximum scale while( nCatIndex + 1.0 < m_aScale.Maximum ) { - TickInfo aTickInfo(0); + TickInfo aTickInfo(nullptr); aTickInfo.fScaledTickValue = nCatIndex + 1.0; aTickInfoVector.push_back(aTickInfo); nCatIndex ++; @@ -601,7 +601,7 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( TickInfoArraysType } //add an additional tick at the end { - TickInfo aTickInfo(0); + TickInfo aTickInfo(nullptr); aTickInfo.fScaledTickValue = m_aScale.Maximum; aTickInfoVector.push_back(aTickInfo); } @@ -622,7 +622,7 @@ TickIter* VCartesianAxis::createLabelTickIterator( sal_Int32 nTextLevel ) { if( nTextLevel>=0 && nTextLevel < static_cast< sal_Int32 >(m_aAllTickInfos.size()) ) return new PureTickIter( m_aAllTickInfos[nTextLevel] ); - return NULL; + return nullptr; } TickIter* VCartesianAxis::createMaximumLabelTickIterator( sal_Int32 nTextLevel ) @@ -639,13 +639,13 @@ TickIter* VCartesianAxis::createMaximumLabelTickIterator( sal_Int32 nTextLevel ) { size_t nLongestLabelIndex = m_bUseTextLabels ? getIndexOfLongestLabel(m_aTextLabels) : 0; if (nLongestLabelIndex >= m_aAllTickInfos[0].size()) - return NULL; + return nullptr; return new MaxLabelTickIter( m_aAllTickInfos[0], nLongestLabelIndex ); } } } - return NULL; + return nullptr; } sal_Int32 VCartesianAxis::getTextLevelCount() const @@ -693,7 +693,7 @@ bool VCartesianAxis::createTextShapes( // Stores an array of text label strings in case of a normal // (non-complex) category axis. - const uno::Sequence<OUString>* pCategories = NULL; + const uno::Sequence<OUString>* pCategories = nullptr; if( m_bUseTextLabels && !m_aAxisProperties.m_bComplexCategories ) pCategories = &m_aTextLabels; @@ -711,8 +711,8 @@ bool VCartesianAxis::createTextShapes( uno::Any* pLimitedSpaceAny = PropertyMapper::getValuePointerForLimitedSpace(aPropValues,aPropNames,bLimitedHeight); - const TickInfo* pPreviousVisibleTickInfo = NULL; - const TickInfo* pPREPreviousVisibleTickInfo = NULL; + const TickInfo* pPreviousVisibleTickInfo = nullptr; + const TickInfo* pPREPreviousVisibleTickInfo = nullptr; sal_Int32 nTick = 0; for( TickInfo* pTickInfo = rTickIter.firstInfo() ; pTickInfo @@ -863,7 +863,7 @@ bool VCartesianAxis::createTextShapes( // Tick interval is fixed. We have no choice but to // remove this label. xTarget->remove(pTickInfo->xTextShape); - pTickInfo->xTextShape = NULL; + pTickInfo->xTextShape = nullptr; continue; } @@ -894,7 +894,7 @@ bool VCartesianAxis::createTextShapesSimple( // Stores an array of text label strings in case of a normal // (non-complex) category axis. - const uno::Sequence<OUString>* pCategories = NULL; + const uno::Sequence<OUString>* pCategories = nullptr; if( m_bUseTextLabels && !m_aAxisProperties.m_bComplexCategories ) pCategories = &m_aTextLabels; @@ -912,7 +912,7 @@ bool VCartesianAxis::createTextShapesSimple( uno::Any* pLimitedSpaceAny = PropertyMapper::getValuePointerForLimitedSpace(aPropValues,aPropNames,bLimitedHeight); - const TickInfo* pPreviousVisibleTickInfo = NULL; + const TickInfo* pPreviousVisibleTickInfo = nullptr; sal_Int32 nTick = 0; for( TickInfo* pTickInfo = rTickIter.firstInfo() ; pTickInfo @@ -1005,7 +1005,7 @@ bool VCartesianAxis::createTextShapesSimple( // Tick interval is fixed. We have no choice but to // remove this label. xTarget->remove(pTickInfo->xTextShape); - pTickInfo->xTextShape = NULL; + pTickInfo->xTextShape = nullptr; continue; } @@ -1085,7 +1085,7 @@ B2DVector VCartesianAxis::getScreenPosition( double fLogicX, double fLogicY, dou { tPropertyNameMap aDummyPropertyNameMap; Reference< drawing::XShape > xShape3DAnchor = m_pShapeFactory->createCube( m_xLogicTarget - , aScenePos,drawing::Direction3D(1,1,1), 0, 0, aDummyPropertyNameMap); + , aScenePos,drawing::Direction3D(1,1,1), 0, nullptr, aDummyPropertyNameMap); awt::Point a2DPos = xShape3DAnchor->getPosition(); //get 2D position from xShape3DAnchor m_xLogicTarget->remove(xShape3DAnchor); aRet.setX( a2DPos.X ); diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index 69c9904f9767..5a9e931ca7af 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -32,7 +32,7 @@ public: VCartesianAxis( const AxisProperties& rAxisProperties , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier , sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount - , PlottingPositionHelper* pPosHelper = NULL //takes ownership + , PlottingPositionHelper* pPosHelper = nullptr //takes ownership ); virtual ~VCartesianAxis(); diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 63ba46e94f5b..028ab3b1942a 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -172,7 +172,7 @@ VCartesianGrid::VCartesianGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionC VCartesianGrid::~VCartesianGrid() { delete m_pPosHelper; - m_pPosHelper = NULL; + m_pPosHelper = nullptr; } void VCartesianGrid::fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index dd895c0cf5cc..5a16b8034419 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -52,12 +52,12 @@ VCoordinateSystem* VCoordinateSystem::createCoordinateSystem( const Reference< XCoordinateSystem >& xCooSysModel ) { if( !xCooSysModel.is() ) - return 0; + return nullptr; OUString aViewServiceName = xCooSysModel->getViewServiceName(); //@todo: in future the coordinatesystems should be instantiated via service factory - VCoordinateSystem* pRet=NULL; + VCoordinateSystem* pRet=nullptr; if( aViewServiceName == CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME ) pRet = new VCartesianCoordinateSystem(xCooSysModel); else if( aViewServiceName == CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME ) @@ -69,10 +69,10 @@ VCoordinateSystem* VCoordinateSystem::createCoordinateSystem( VCoordinateSystem::VCoordinateSystem( const Reference< XCoordinateSystem >& xCooSys ) : m_xCooSysModel(xCooSys) - , m_xLogicTargetForGrids(0) - , m_xLogicTargetForAxes(0) - , m_xFinalTarget(0) - , m_xShapeFactory(0) + , m_xLogicTargetForGrids(nullptr) + , m_xLogicTargetForAxes(nullptr) + , m_xFinalTarget(nullptr) + , m_xShapeFactory(nullptr) , m_aMatrixSceneToScreen() , m_eLeftWallPos(CuboidPlanePosition_Left) , m_eBackWallPos(CuboidPlanePosition_Back) @@ -204,7 +204,7 @@ Reference< XAxis > VCoordinateSystem::getAxisByDimension( sal_Int32 nDimensionIn { if( m_xCooSysModel.is() ) return m_xCooSysModel->getAxisByDimension( nDimensionIndex, nAxisIndex ); - return 0; + return nullptr; } Sequence< Reference< beans::XPropertySet > > VCoordinateSystem::getGridListFromAxis( const Reference< XAxis >& xAxis ) @@ -410,7 +410,7 @@ void VCoordinateSystem::prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAuto VAxisBase* VCoordinateSystem::getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) { - VAxisBase* pRet = 0; + VAxisBase* pRet = nullptr; tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex ); diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 47293c498638..0baae40e62b7 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -45,7 +45,7 @@ VPolarAngleAxis::VPolarAngleAxis( const AxisProperties& rAxisProperties VPolarAngleAxis::~VPolarAngleAxis() { delete m_pPosHelper; - m_pPosHelper = NULL; + m_pPosHelper = nullptr; } bool VPolarAngleAxis::createTextShapes_ForAngleAxis( @@ -75,7 +75,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( if(pColorAny) *pColorAny >>= nColor; - const uno::Sequence< OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0; + const uno::Sequence< OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : nullptr; //TickInfo* pLastVisibleNeighbourTickInfo = NULL; sal_Int32 nTick = 0; diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx index 73634058c38a..c7783d8e087e 100644 --- a/chart2/source/view/axes/VPolarAxis.cxx +++ b/chart2/source/view/axes/VPolarAxis.cxx @@ -51,7 +51,7 @@ VPolarAxis::VPolarAxis( const AxisProperties& rAxisProperties VPolarAxis::~VPolarAxis() { delete m_pPosHelper; - m_pPosHelper = NULL; + m_pPosHelper = nullptr; } void VPolarAxis::setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ) diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index ff1541df3536..9dbc47df44cd 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -49,7 +49,7 @@ VPolarGrid::VPolarGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount VPolarGrid::~VPolarGrid() { delete m_pPosHelper; - m_pPosHelper = NULL; + m_pPosHelper = nullptr; } void VPolarGrid::setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ) @@ -72,7 +72,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis( , PolarPlottingPositionHelper* pPosHelper , double fLogicRadius, double fLogicZ ) { - Reference< XScaling > xInverseScaling( NULL ); + Reference< XScaling > xInverseScaling( nullptr ); if( rScale.Scaling.is() ) xInverseScaling = rScale.Scaling->getInverseScaling(); @@ -167,7 +167,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic const ExplicitScaleData& rRadiusScale = m_pPosHelper->getScales()[1]; const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0]; const ExplicitIncrementData& rAngleIncrement = m_aIncrements[0]; - Reference< XScaling > xInverseRadiusScaling( NULL ); + Reference< XScaling > xInverseRadiusScaling( nullptr ); if( rRadiusScale.Scaling.is() ) xInverseRadiusScaling = rRadiusScale.Scaling->getInverseScaling(); diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index f5d99924487e..041c022eedac 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -49,7 +49,7 @@ VPolarRadiusAxis::VPolarRadiusAxis( const AxisProperties& rAxisProperties VPolarRadiusAxis::~VPolarRadiusAxis() { delete m_pPosHelper; - m_pPosHelper = NULL; + m_pPosHelper = nullptr; } void VPolarRadiusAxis::setTransformationSceneToScreen( const drawing::HomogenMatrix& rMatrix) @@ -134,7 +134,7 @@ void VPolarRadiusAxis::createShapes() TickFactory aAngleTickFactory( rAngleScale, rAngleIncrement ); aAngleTickFactory.getAllTicks( aAngleTickInfos ); - uno::Reference< XScaling > xInverseScaling( NULL ); + uno::Reference< XScaling > xInverseScaling( nullptr ); if( rAngleScale.Scaling.is() ) xInverseScaling = rAngleScale.Scaling->getInverseScaling(); diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index f6f6d7b17d90..577aec39ec15 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -62,10 +62,10 @@ AreaChart::AreaChart( const uno::Reference<XChartType>& xChartTypeModel , m_eCurveStyle(CurveStyle_LINES) , m_nCurveResolution(20) , m_nSplineOrder(3) - , m_xSeriesTarget(0) - , m_xErrorBarTarget(0) - , m_xTextTarget(0) - , m_xRegressionCurveEquationTarget(0) + , m_xSeriesTarget(nullptr) + , m_xErrorBarTarget(nullptr) + , m_xTextTarget(nullptr) + , m_xRegressionCurveEquationTarget(nullptr) { m_pMainPosHelper->AllowShiftXAxisPos(true); m_pMainPosHelper->AllowShiftZAxisPos(true); @@ -421,7 +421,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries pPosHelper->transformScaledLogicToScene( aPoly ); //create line: - uno::Reference< drawing::XShape > xShape(NULL); + uno::Reference< drawing::XShape > xShape(nullptr); if(m_nDimension==3) { double fDepth = this->getTransformedDepth(); @@ -484,13 +484,13 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries //clip to scale if(fMaxX<pPosHelper->getLogicMinX() || fMinX>pPosHelper->getLogicMaxX()) return false;//no visible shape needed - pPosHelper->clipLogicValues( &fMinX, &fY, 0 ); - pPosHelper->clipLogicValues( &fMaxX, 0, 0 ); + pPosHelper->clipLogicValues( &fMinX, &fY, nullptr ); + pPosHelper->clipLogicValues( &fMaxX, nullptr, nullptr ); //apply scaling { pPosHelper->doLogicScaling( &fMinX, &fY, &zValue ); - pPosHelper->doLogicScaling( &fMaxX, 0, 0 ); + pPosHelper->doLogicScaling( &fMaxX, nullptr, nullptr ); } AddPointToPoly( aPoly, drawing::Position3D( fMaxX,fY,zValue) ); @@ -517,7 +517,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries pPosHelper->transformScaledLogicToScene( aPoly ); //create area: - uno::Reference< drawing::XShape > xShape(NULL); + uno::Reference< drawing::XShape > xShape(nullptr); if(m_nDimension==3) { xShape = m_pShapeFactory->createArea3D( xSeriesGroupShape_Shapes @@ -556,7 +556,7 @@ void AreaChart::impl_createSeriesShapes() const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); std::map< sal_Int32, drawing::PolyPolygonShape3D* > aPreviousSeriesPolyMap;//a PreviousSeriesPoly for each different nAttachedAxisIndex - drawing::PolyPolygonShape3D* pSeriesPoly = NULL; + drawing::PolyPolygonShape3D* pSeriesPoly = nullptr; //iterate through all series for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) @@ -875,7 +875,7 @@ void AreaChart::createShapes() } } - Symbol* pSymbolProperties = m_bSymbol ? (*aSeriesIter)->getSymbolProperties( nIndex ) : 0; + Symbol* pSymbolProperties = m_bSymbol ? (*aSeriesIter)->getSymbolProperties( nIndex ) : nullptr; bool bCreateSymbol = pSymbolProperties && (pSymbolProperties->Style != SymbolStyle_NONE); if( !bCreateSymbol && !bCreateYErrorBar && diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 9ab6ae70483b..916013314cb9 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -290,7 +290,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar( ASSERT_EXCEPTION( e ); } - uno::Reference< drawing::XShape > xShape(NULL); + uno::Reference< drawing::XShape > xShape(nullptr); switch( nGeometry3D ) { case DataPointGeometry3D::CYLINDER: @@ -661,11 +661,11 @@ void BarChart::createShapes() //@todo clipping of X and Z is not fully integrated so far, as there is a need to create different objects //apply scaling to Y before calculating width (necessary to maintain gradient in clipped objects) - pSubPosHelper->doLogicScaling(NULL,&fLowerYValue,NULL); - pSubPosHelper->doLogicScaling(NULL,&fUpperYValue,NULL); + pSubPosHelper->doLogicScaling(nullptr,&fLowerYValue,nullptr); + pSubPosHelper->doLogicScaling(nullptr,&fUpperYValue,nullptr); //scaling of X and Z is not provided as the created objects should be symmetric in that dimensions - pSubPosHelper->doLogicScaling(NULL,&fUnclippedUpperYValue,NULL); + pSubPosHelper->doLogicScaling(nullptr,&fUnclippedUpperYValue,nullptr); //calculate resulting width double fCompleteHeight = bPositive ? fLogicPositiveYSum : fLogicNegativeYSum; diff --git a/chart2/source/view/charttypes/BarPositionHelper.cxx b/chart2/source/view/charttypes/BarPositionHelper.cxx index 58aa7786e87f..f9769125cacf 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.cxx +++ b/chart2/source/view/charttypes/BarPositionHelper.cxx @@ -62,7 +62,7 @@ double BarPositionHelper::getScaledSlotPos( double fUnscaledLogicX, double fSeri if( m_bDateAxis ) fUnscaledLogicX = DateHelper::RasterizeDateValue( fUnscaledLogicX, m_aNullDate, m_nTimeResolution ); double fScaledLogicX(fUnscaledLogicX); - doLogicScaling(&fScaledLogicX,NULL,NULL); + doLogicScaling(&fScaledLogicX,nullptr,nullptr); fScaledLogicX = CategoryPositionHelper::getScaledSlotPos( fScaledLogicX, fSeriesNumber ); return fScaledLogicX; diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index f2ace7821070..d8af62579d0c 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -114,8 +114,8 @@ void CandleStickChart::createShapes() { m_xChartTypeModelProps->getPropertyValue( "ShowFirst" ) >>= bShowFirst; - uno::Reference< beans::XPropertySet > xWhiteDayProps(0); - uno::Reference< beans::XPropertySet > xBlackDayProps(0); + uno::Reference< beans::XPropertySet > xWhiteDayProps(nullptr); + uno::Reference< beans::XPropertySet > xBlackDayProps(nullptr); m_xChartTypeModelProps->getPropertyValue( "Japanese" ) >>= bJapaneseStyle; m_xChartTypeModelProps->getPropertyValue( "WhiteDay" ) >>= xWhiteDayProps; m_xChartTypeModelProps->getPropertyValue( "BlackDay" ) >>= xBlackDayProps; @@ -200,14 +200,14 @@ void CandleStickChart::createShapes() double fScaledY_Last(fUnscaledY_Last); double fScaledY_Min(fUnscaledY_Min); double fScaledY_Max(fUnscaledY_Max); - pPosHelper->clipLogicValues( 0,&fScaledY_First,0 ); - pPosHelper->clipLogicValues( 0,&fScaledY_Last,0 ); - pPosHelper->clipLogicValues( 0,&fScaledY_Min,0 ); - pPosHelper->clipLogicValues( 0,&fScaledY_Max,0 ); - pPosHelper->doLogicScaling( 0,&fScaledY_First,0 ); - pPosHelper->doLogicScaling( 0,&fScaledY_Last,0 ); - pPosHelper->doLogicScaling( 0,&fScaledY_Min,0 ); - pPosHelper->doLogicScaling( 0,&fScaledY_Max,0 ); + pPosHelper->clipLogicValues( nullptr,&fScaledY_First,nullptr ); + pPosHelper->clipLogicValues( nullptr,&fScaledY_Last,nullptr ); + pPosHelper->clipLogicValues( nullptr,&fScaledY_Min,nullptr ); + pPosHelper->clipLogicValues( nullptr,&fScaledY_Max,nullptr ); + pPosHelper->doLogicScaling( nullptr,&fScaledY_First,nullptr ); + pPosHelper->doLogicScaling( nullptr,&fScaledY_Last,nullptr ); + pPosHelper->doLogicScaling( nullptr,&fScaledY_Min,nullptr ); + pPosHelper->doLogicScaling( nullptr,&fScaledY_Max,nullptr ); drawing::Position3D aPosLeftFirst( pPosHelper->transformScaledLogicToScene( fScaledX-fHalfScaledWidth, fScaledY_First ,0 ,true ) ); drawing::Position3D aPosRightLast( pPosHelper->transformScaledLogicToScene( fScaledX+fHalfScaledWidth, fScaledY_Last ,0 ,true ) ); @@ -221,7 +221,7 @@ void CandleStickChart::createShapes() xLossGainTarget = xLossTarget; uno::Reference< beans::XPropertySet > xPointProp( (*aSeriesIter)->getPropertiesOfPoint( nIndex )); - uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(0); + uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(nullptr); { OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex ); uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes( getSeriesGroupShape(*aSeriesIter, xSeriesTarget) ); diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 8ee0cc65c55c..b685a686b88c 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -504,7 +504,7 @@ GL3DBarChart::GL3DBarChart( mxChartType(xChartType), mpRenderer(new opengl3D::OpenGL3DRenderer()), mpWindow(pWindow), - mpCamera(NULL), + mpCamera(nullptr), mbValidContext(true), mpTextCache(new opengl3D::TextCache()), mnMaxX(0), @@ -596,7 +596,7 @@ GL3DBarChart::~GL3DBarChart() joinRenderThread(); if(mbValidContext) - mpWindow->setRenderer(NULL); + mpWindow->setRenderer(nullptr); } void GL3DBarChart::create3DShapes(const std::vector<std::unique_ptr<VDataSeries> >& rDataSeriesContainer, diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 664c2dcdd5b7..d1bd56c6f0b6 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -57,8 +57,8 @@ NetChart::NetChart( const uno::Reference<XChartType>& xChartTypeModel , m_pMainPosHelper(pPlottingPositionHelper) , m_bArea(!bNoArea) , m_bLine(bNoArea) - , m_xSeriesTarget(0) - , m_xTextTarget(0) + , m_xSeriesTarget(nullptr) + , m_xTextTarget(nullptr) { // we only support 2D Net charts assert(nDimensionCount == 2); @@ -161,7 +161,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries pPosHelper->transformScaledLogicToScene( aPoly ); //create line: - uno::Reference< drawing::XShape > xShape(NULL); + uno::Reference< drawing::XShape > xShape(nullptr); { xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes , PolyToPointSequence( aPoly ) ); @@ -200,13 +200,13 @@ bool NetChart::impl_createArea( VDataSeries* pSeries //clip to scale if(fMaxX<pPosHelper->getLogicMinX() || fMinX>pPosHelper->getLogicMaxX()) return false;//no visible shape needed - pPosHelper->clipLogicValues( &fMinX, &fY, 0 ); - pPosHelper->clipLogicValues( &fMaxX, 0, 0 ); + pPosHelper->clipLogicValues( &fMinX, &fY, nullptr ); + pPosHelper->clipLogicValues( &fMaxX, nullptr, nullptr ); //apply scaling { pPosHelper->doLogicScaling( &fMinX, &fY, &zValue ); - pPosHelper->doLogicScaling( &fMaxX, 0, 0 ); + pPosHelper->doLogicScaling( &fMaxX, nullptr, nullptr ); } AddPointToPoly( aPoly, drawing::Position3D( fMaxX,fY,zValue) ); @@ -264,7 +264,7 @@ void NetChart::impl_createSeriesShapes() const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); std::map< sal_Int32, drawing::PolyPolygonShape3D* > aPreviousSeriesPolyMap;//a PreviousSeriesPoly for each different nAttachedAxisIndex - drawing::PolyPolygonShape3D* pSeriesPoly = NULL; + drawing::PolyPolygonShape3D* pSeriesPoly = nullptr; //iterate through all series for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) @@ -554,7 +554,7 @@ void NetChart::createShapes() if( !bIsVisible && m_bArea ) { drawing::Position3D aClippedPos(aScaledLogicPosition); - pPosHelper->clipScaledLogicValues( 0, &aClippedPos.PositionY, 0 ); + pPosHelper->clipScaledLogicValues( nullptr, &aClippedPos.PositionY, nullptr ); if( pPosHelper->isLogicVisible( aClippedPos.PositionX, aClippedPos.PositionY, aClippedPos.PositionZ ) ) { AddPointToPoly( (*aSeriesIter)->m_aPolyPolygonShape3D, aClippedPos, (*aSeriesIter)->m_nPolygonIndex ); diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index cbeac17f78b9..202d786c7733 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -240,7 +240,7 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint( } //create point - uno::Reference< drawing::XShape > xShape(0); + uno::Reference< drawing::XShape > xShape(nullptr); if(m_nDimension==3) { xShape = m_pShapeFactory->createPieSegment( xTarget @@ -767,8 +767,8 @@ double lcl_getDegAngleInStandardRange(double fAngle) }//end anonymous namespace PieChart::PieLabelInfo::PieLabelInfo() - : xTextShape(0), xLabelGroupShape(0), aFirstPosition(), aOrigin(), fValue(0.0) - , bMovementAllowed(false), bMoved(false), xTextTarget(0), pPrevious(0),pNext(0) + : xTextShape(nullptr), xLabelGroupShape(nullptr), aFirstPosition(), aOrigin(), fValue(0.0) + , bMovementAllowed(false), bMoved(false), xTextTarget(nullptr), pPrevious(nullptr),pNext(nullptr) { } @@ -873,8 +873,8 @@ bool PieChart::detectLabelOverlapsAndMove( const awt::Size& rPageSize ) ///previous one; bool bOverlapFound = false; PieLabelInfo* pStart = &(*(m_aLabelInfoList.rbegin())); - PieLabelInfo* pFirstBorder = 0; - PieLabelInfo* pSecondBorder = 0; + PieLabelInfo* pFirstBorder = nullptr; + PieLabelInfo* pSecondBorder = nullptr; PieLabelInfo* pCurrent = pStart; do { @@ -1020,10 +1020,10 @@ bool PieChart::tryMoveLabels( PieLabelInfo* pFirstBorder, PieLabelInfo* pSecondB ///the inner loop starts from the previous element of `pCenter` and moves ///forward until the current `PieLabelInfo` object of the outer loop is ///reached - PieLabelInfo* pCurrent = 0; + PieLabelInfo* pCurrent = nullptr; for( pCurrent = p2 ;pCurrent->pPrevious != pSecondBorder; pCurrent = pCurrent->pNext ) { - PieLabelInfo* pFix = 0; + PieLabelInfo* pFix = nullptr; for( pFix = p2->pPrevious ;pFix != pCurrent; pFix = pFix->pNext ) { ///on the current `PieLabelInfo` object of the outer loop the @@ -1082,7 +1082,7 @@ bool PieChart::tryMoveLabels( PieLabelInfo* pFirstBorder, PieLabelInfo* pSecondB for( pCurrent = p1 ;pCurrent->pNext != pFirstBorder; pCurrent = pCurrent->pPrevious ) { - PieLabelInfo* pFix = 0; + PieLabelInfo* pFix = nullptr; for( pFix = p2->pNext ;pFix != pCurrent; pFix = pFix->pPrevious ) { if( !pCurrent->moveAwayFrom( pFix, rPageSize, false, bLabelOrderIsAntiClockWise, rbAlternativeMoveDirection ) ) diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 6add0fae65ee..164d2fd51629 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -145,7 +145,7 @@ sal_Int32 VDataSeriesGroup::getSeriesCount() const VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount, bool bCategoryXAxis ) : PlotterBase( nDimensionCount ) - , m_pMainPosHelper( 0 ) + , m_pMainPosHelper( nullptr ) , m_xChartTypeModel(xChartTypeModel) , m_xChartTypeModelProps( uno::Reference< beans::XPropertySet >::query( xChartTypeModel )) , m_aZSlots() @@ -153,7 +153,7 @@ VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeMode , m_nTimeResolution(::com::sun::star::chart::TimeUnit::DAY) , m_aNullDate(30,12,1899) , m_xColorScheme() - , m_pExplicitCategoriesProvider(0) + , m_pExplicitCategoriesProvider(nullptr) , m_bPointsWereSkipped(false) { SAL_WARN_IF(!m_xChartTypeModel.is(),"chart2","no XChartType available in view, fallback to default values may be wrong"); @@ -864,7 +864,7 @@ drawing::Position3D lcl_transformMixedToScene( PlottingPositionHelper* pPosHelpe { if(!pPosHelper) return drawing::Position3D(0,0,0); - pPosHelper->doLogicScaling( 0,&fY,&fZ ); + pPosHelper->doLogicScaling( nullptr,&fY,&fZ ); if(bClip) pPosHelper->clipScaledLogicValues( &fX,&fY,&fZ ); return pPosHelper->transformScaledLogicToScene( fX, fY, fZ, false ); @@ -926,7 +926,7 @@ void VSeriesPlotter::createErrorBar( if( pfScaledLogicX ) fScaledX = *pfScaledLogicX; else - m_pPosHelper->doLogicScaling( &fScaledX, 0, 0 ); + m_pPosHelper->doLogicScaling( &fScaledX, nullptr, nullptr ); aMiddle = lcl_transformMixedToScene( m_pPosHelper, fScaledX, fY, fZ, true ); @@ -1788,7 +1788,7 @@ private: if (!r.second) // insertion failed. - return NULL; + return nullptr; it = r.first; } @@ -1965,8 +1965,8 @@ double VSeriesPlotter::getTransformedDepth() const { double MinZ = m_pMainPosHelper->getLogicMinZ(); double MaxZ = m_pMainPosHelper->getLogicMaxZ(); - m_pMainPosHelper->doLogicScaling( 0, 0, &MinZ ); - m_pMainPosHelper->doLogicScaling( 0, 0, &MaxZ ); + m_pMainPosHelper->doLogicScaling( nullptr, nullptr, &MinZ ); + m_pMainPosHelper->doLogicScaling( nullptr, nullptr, &MaxZ ); return FIXED_SIZE_FOR_3D_CHART_VOLUME/(MaxZ-MinZ); } @@ -1981,7 +1981,7 @@ void VSeriesPlotter::addSecondaryValueScale( const ExplicitScaleData& rScale, sa PlottingPositionHelper& VSeriesPlotter::getPlottingPositionHelper( sal_Int32 nAxisIndex ) const { - PlottingPositionHelper* pRet = 0; + PlottingPositionHelper* pRet = nullptr; if(nAxisIndex>0) { tSecondaryPosHelperMap::const_iterator aPosIt = m_aSecondaryPosHelperMap.find( nAxisIndex ); @@ -2030,7 +2030,7 @@ VDataSeries* VSeriesPlotter::getFirstSeries() const } } } - return 0; + return nullptr; } uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const @@ -2054,7 +2054,7 @@ uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const if( aSeriesGroup.m_aSeriesVector.size() ) { VDataSeries* pSeries = aSeriesGroup.m_aSeriesVector[0]; - uno::Reference< XDataSeries > xSeries( pSeries ? pSeries->getModel() : 0 ); + uno::Reference< XDataSeries > xSeries( pSeries ? pSeries->getModel() : nullptr ); if( xSeries.is() ) { OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) ); @@ -2519,11 +2519,11 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter( , bool bExcludingPositioning ) { if (!xChartTypeModel.is()) - return NULL; + return nullptr; OUString aChartType = xChartTypeModel->getChartType(); - VSeriesPlotter* pRet=NULL; + VSeriesPlotter* pRet=nullptr; if( aChartType.equalsIgnoreAsciiCase( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ) ) pRet = new BarChart(xChartTypeModel,nDimensionCount); else if( aChartType.equalsIgnoreAsciiCase( CHART2_SERVICE_NAME_CHARTTYPE_BAR ) ) diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 3e3adef9e6ca..656f0aa1947f 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -48,12 +48,12 @@ using namespace ::com::sun::star::chart2; VDiagram::VDiagram( const uno::Reference<XDiagram> & xDiagram, const drawing::Direction3D& rPreferredAspectRatio, sal_Int32 nDimension ) - : m_xTarget(NULL) - , m_xShapeFactory(NULL) - , m_pShapeFactory(NULL) - , m_xOuterGroupShape(NULL) - , m_xCoordinateRegionShape(NULL) - , m_xWall2D(NULL) + : m_xTarget(nullptr) + , m_xShapeFactory(nullptr) + , m_pShapeFactory(nullptr) + , m_xOuterGroupShape(nullptr) + , m_xCoordinateRegionShape(nullptr) + , m_xWall2D(nullptr) , m_nDimensionCount(nDimension) , m_xDiagram(xDiagram) , m_aPreferredAspectRatio(rPreferredAspectRatio) @@ -211,7 +211,7 @@ void VDiagram::createShapes_2d() E3dScene* lcl_getE3dScene( const uno::Reference< drawing::XShape >& xShape ) { - E3dScene* pRet=NULL; + E3dScene* pRet=nullptr; uno::Reference< lang::XUnoTunnel > xUnoTunnel( xShape, uno::UNO_QUERY ); uno::Reference< lang::XTypeProvider > xTypeProvider( xShape, uno::UNO_QUERY ); if(xUnoTunnel.is()&&xTypeProvider.is()) @@ -489,7 +489,7 @@ void VDiagram::createShapes_3d() //add walls { - uno::Reference< beans::XPropertySet > xWallProp( NULL ); + uno::Reference< beans::XPropertySet > xWallProp( nullptr ); if( m_xDiagram.is() ) xWallProp.set( m_xDiagram->getWall() ); @@ -612,7 +612,7 @@ void VDiagram::createShapes_3d() //add floor plate { - uno::Reference< beans::XPropertySet > xFloorProp( NULL ); + uno::Reference< beans::XPropertySet > xFloorProp( nullptr ); if( m_xDiagram.is() ) xFloorProp.set( m_xDiagram->getFloor() ); diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx index 533ecee4e88d..f0e13a2f9802 100644 --- a/chart2/source/view/inc/AbstractShapeFactory.hxx +++ b/chart2/source/view/inc/AbstractShapeFactory.hxx @@ -170,7 +170,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PointSequenceSequence& rPoints - , const VLineProperties* pLineProperties = NULL ) = 0; + , const VLineProperties* pLineProperties = nullptr ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::drawing::XShape > createLine ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTarget, diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx b/chart2/source/view/inc/OpenglShapeFactory.hxx index c0645b6e7fc5..63fbd29753a9 100644 --- a/chart2/source/view/inc/OpenglShapeFactory.hxx +++ b/chart2/source/view/inc/OpenglShapeFactory.hxx @@ -119,7 +119,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PointSequenceSequence& rPoints - , const VLineProperties* pLineProperties = NULL ) override; + , const VLineProperties* pLineProperties = nullptr ) override; virtual com::sun::star::uno::Reference< com::sun::star::drawing::XShape > createLine ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTarget, diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index 6591254968c1..f524e502eef6 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -49,7 +49,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSource , const tPropertyNameMap& rMap - , tPropertyNameValueMap* pOverwriteMap=0 ); + , tPropertyNameValueMap* pOverwriteMap=nullptr ); /** * Fetch property values from the source object and map it to the diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 333faf191a72..5b05adad4e11 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -129,7 +129,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PointSequenceSequence& rPoints - , const VLineProperties* pLineProperties = NULL ) override; + , const VLineProperties* pLineProperties = nullptr ) override; virtual com::sun::star::uno::Reference< com::sun::star::drawing::XShape > createLine ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTarget, diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index d48c91d6884e..4c8f11c1eaf7 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -383,13 +383,13 @@ protected: , VDataSeries& rVDataSeries, sal_Int32 nPointIndex , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , double* pfScaledLogicX=0 ); + , double* pfScaledLogicX=nullptr ); void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , double* pfScaledLogicX=0 ); + , double* pfScaledLogicX=nullptr ); void createRegressionCurvesShapes( VDataSeries& rVDataSeries , const ::com::sun::star::uno::Reference< @@ -413,7 +413,7 @@ protected: , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSource , const tPropertyNameMap& rMap - , tPropertyNameValueMap* pOverwriteMap=0 ); + , tPropertyNameValueMap* pOverwriteMap=nullptr ); virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates whether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 ) diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx index 63fd319b43bb..3955e3167ca3 100644 --- a/chart2/source/view/main/AbstractShapeFactory.cxx +++ b/chart2/source/view/main/AbstractShapeFactory.cxx @@ -69,7 +69,7 @@ osl::Module* getOpenGLModule() if (!bLoaded) bLoaded = aModule.load(aLibName); - return bLoaded ? &aModule : NULL; + return bLoaded ? &aModule : nullptr; } #endif @@ -82,7 +82,7 @@ extern "C" opengl::OpenglShapeFactory* getOpenglShapeFactory(); AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(uno::Reference< lang::XMultiServiceFactory> xFactory) { - static AbstractShapeFactory* pShapeFactory = NULL; + static AbstractShapeFactory* pShapeFactory = nullptr; if(pShapeFactory) return pShapeFactory; diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index e6f68a99f8d8..59f114cb18b3 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -37,7 +37,7 @@ namespace chart { ChartItemPool::ChartItemPool(): - SfxItemPool( "ChartItemPool" , SCHATTR_START, SCHATTR_END, NULL, NULL ) + SfxItemPool( "ChartItemPool" , SCHATTR_START, SCHATTR_END, nullptr, nullptr ) { /************************************************************************** * PoolDefaults @@ -181,7 +181,7 @@ ChartItemPool::ChartItemPool(): } ChartItemPool::ChartItemPool(const ChartItemPool& rPool): - SfxItemPool(rPool), ppPoolDefaults(0), pItemInfos(0) + SfxItemPool(rPool), ppPoolDefaults(nullptr), pItemInfos(nullptr) { } diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 5625512a58c4..19f2521c9758 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -400,20 +400,20 @@ VCoordinateSystem* findInCooSysList( const std::vector< VCoordinateSystem* >& rV if(pVCooSys->getModel()==xCooSys) return pVCooSys; } - return NULL; + return nullptr; } VCoordinateSystem* lcl_getCooSysForPlotter( const std::vector< VCoordinateSystem* >& rVCooSysList, MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier ) { if(!pMinimumAndMaximumSupplier) - return 0; + return nullptr; for( size_t nC=0; nC < rVCooSysList.size(); nC++) { VCoordinateSystem* pVCooSys = rVCooSysList[nC]; if(pVCooSys->hasMinimumAndMaximumSupplier( pMinimumAndMaximumSupplier )) return pVCooSys; } - return 0; + return nullptr; } VCoordinateSystem* addCooSysToList( std::vector< VCoordinateSystem* >& rVCooSysList @@ -1094,7 +1094,7 @@ GL2DRenderer::~GL2DRenderer() { SolarMutexGuard g; if(!mbContextDestroyed && mpWindow) - mpWindow->setRenderer(NULL); + mpWindow->setRenderer(nullptr); mpWindow.reset(); } @@ -1136,7 +1136,7 @@ void GL2DRenderer::updateOpenGLWindow() { if(mpWindow) { - mpWindow->setRenderer(NULL); + mpWindow->setRenderer(nullptr); } if(pWindow) @@ -1155,7 +1155,7 @@ const uno::Sequence<sal_Int8>& ExplicitValueProvider::getUnoTunnelId() ExplicitValueProvider* ExplicitValueProvider::getExplicitValueProvider( const Reference< uno::XInterface >& xChartView ) { - ExplicitValueProvider* pExplicitValueProvider=0; + ExplicitValueProvider* pExplicitValueProvider=nullptr; Reference< lang::XUnoTunnel > xTunnel( xChartView, uno::UNO_QUERY ); if( xTunnel.is() ) @@ -1226,7 +1226,7 @@ ChartView::~ChartView() EndListening( m_pDrawModelWrapper->getSdrModel() ); m_pDrawModelWrapper.reset(); } - m_xDrawPage = NULL; + m_xDrawPage = nullptr; impl_deleteCoordinateSystems(); } @@ -1625,8 +1625,8 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D drawing::Direction3D aPreferredAspectRatio = rParam.mpSeriesPlotterContainer->getPreferredAspectRatio(); - uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis(0); - uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis(0); + uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis(nullptr); + uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis(nullptr); VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount); bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram); {//create diagram @@ -1722,7 +1722,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D { VSeriesPlotter* pSeriesPlotter = aPlotter.get(); OUString aCID; //III - uno::Reference< drawing::XShapes > xSeriesTarget(0); + uno::Reference< drawing::XShapes > xSeriesTarget(nullptr); if( pSeriesPlotter->WantToPlotInFrontOfAxisLine() ) xSeriesTarget = xSeriesTargetInFrontOfAxis; else @@ -1899,7 +1899,7 @@ bool ChartView::getExplicitValuesForAxis( SdrPage* ChartView::getSdrPage() { - SdrPage* pPage=0; + SdrPage* pPage=nullptr; Reference< lang::XUnoTunnel> xUnoTunnel(m_xDrawPage,uno::UNO_QUERY); if(xUnoTunnel.is()) { @@ -1919,7 +1919,7 @@ uno::Reference< drawing::XShape > ChartView::getShapeForCID( const OUString& rOb SdrObject* pObj = DrawModelWrapper::getNamedSdrObject( rObjectCID, this->getSdrPage() ); if( pObj ) return uno::Reference< drawing::XShape >( pObj->getUnoShape(), uno::UNO_QUERY); - return 0; + return nullptr; } awt::Rectangle ChartView::getDiagramRectangleExcludingAxes() @@ -2549,7 +2549,7 @@ void lcl_removeEmptyGroupShapes( const Reference< drawing::XShapes>& xParent ) for( sal_Int32 nN = xParent->getCount(); nN--; ) { uno::Any aAny = xParent->getByIndex( nN ); - Reference< drawing::XShapes> xShapes(0); + Reference< drawing::XShapes> xShapes(nullptr); if( aAny >>= xShapes ) lcl_removeEmptyGroupShapes( xShapes ); if( xShapes.is() && xShapes->getCount()==0 ) @@ -2916,7 +2916,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo() throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); - return 0; + return nullptr; } void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName @@ -2928,7 +2928,7 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName { awt::Size aNewResolution; if( ! (rValue >>= aNewResolution) ) - throw lang::IllegalArgumentException( "Property 'Resolution' requires value of type awt::Size", 0, 0 ); + throw lang::IllegalArgumentException( "Property 'Resolution' requires value of type awt::Size", nullptr, 0 ); if( m_aPageResolution.Width!=aNewResolution.Width || m_aPageResolution.Height!=aNewResolution.Height ) { @@ -2946,7 +2946,7 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100% uno::Sequence< beans::PropertyValue > aZoomFactors; if( ! (rValue >>= aZoomFactors) ) - throw lang::IllegalArgumentException( "Property 'ZoomFactors' requires value of type Sequence< PropertyValue >", 0, 0 ); + throw lang::IllegalArgumentException( "Property 'ZoomFactors' requires value of type Sequence< PropertyValue >", nullptr, 0 ); sal_Int32 nFilterArgs = aZoomFactors.getLength(); beans::PropertyValue* pDataValues = aZoomFactors.getArray(); @@ -2968,10 +2968,10 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName { //#i77362 change notification for changes on additional shapes are missing if( ! (rValue >>= m_bSdrViewIsInEditMode) ) - throw lang::IllegalArgumentException( "Property 'SdrViewIsInEditMode' requires value of type sal_Bool", 0, 0 ); + throw lang::IllegalArgumentException( "Property 'SdrViewIsInEditMode' requires value of type sal_Bool", nullptr, 0 ); } else - throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard", 0 ); + throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard", nullptr ); } Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName ) @@ -2983,7 +2983,7 @@ Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName ) aRet = uno::makeAny( m_aPageResolution ); } else - throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard", 0 ); + throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard", nullptr ); return aRet; } @@ -3019,7 +3019,7 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService { SolarMutexGuard aSolarGuard; - SdrModel* pModel = ( m_pDrawModelWrapper ? &m_pDrawModelWrapper->getSdrModel() : NULL ); + SdrModel* pModel = ( m_pDrawModelWrapper ? &m_pDrawModelWrapper->getSdrModel() : nullptr ); if ( pModel ) { if ( aServiceSpecifier == "com.sun.star.drawing.DashTable" ) @@ -3072,7 +3072,7 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService } } - return 0; + return nullptr; } Reference< uno::XInterface > ChartView::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 9cc10b4a8b67..aac0b9aa822c 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -51,10 +51,10 @@ namespace chart { DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext>& /*xContext*/ ) - : SdrModel( SvtPathOptions().GetPalettePath(), NULL, NULL, false, false ) - , m_pChartItemPool(0) - , m_xMainDrawPage(0) - , m_xHiddenDrawPage(0) + : SdrModel( SvtPathOptions().GetPalettePath(), nullptr, nullptr, false, false ) + , m_pChartItemPool(nullptr) + , m_xMainDrawPage(nullptr) + , m_xHiddenDrawPage(nullptr) { m_pChartItemPool = ChartItemPool::CreateChartItemPool(); @@ -130,7 +130,7 @@ DrawModelWrapper::~DrawModelWrapper() SfxItemPool* pSecondary = pPool->GetSecondaryPool(); if(pSecondary == m_pChartItemPool) { - pPool->SetSecondaryPool (NULL); + pPool->SetSecondaryPool (nullptr); break; } pPool = pSecondary; @@ -292,14 +292,14 @@ XBitmapListRef DrawModelWrapper::GetBitmapList() const SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName ) { if( rName.isEmpty() ) - return 0; + return nullptr; return getNamedSdrObject( rName, GetPage(0) ); } SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rObjectCID, SdrObjList* pSearchList ) { if(!pSearchList || rObjectCID.isEmpty()) - return 0; + return nullptr; const size_t nCount = pSearchList->GetObjCount(); for( size_t nN=0; nN<nCount; ++nN ) { @@ -312,7 +312,7 @@ SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rObjectCID, SdrO if(pObj) return pObj; } - return 0; + return nullptr; } bool DrawModelWrapper::removeShape( const uno::Reference< drawing::XShape >& xShape ) diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 2dc32a3614fe..78e2bbeb63cf 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -101,8 +101,8 @@ OpenGL3DRenderer::OpenGL3DRenderer(): { m_Polygon3DInfo.lineOnly = false; m_Polygon3DInfo.twoSidesLighting = false; - m_Polygon3DInfo.vertices = NULL; - m_Polygon3DInfo.normals = NULL; + m_Polygon3DInfo.vertices = nullptr; + m_Polygon3DInfo.normals = nullptr; m_Polygon3DInfo.lineWidth = 0.001f; m_Extrude3DInfo.twoSidesLighting = false; @@ -1179,8 +1179,8 @@ void OpenGL3DRenderer::AddShapePolygon3DObject(sal_uInt32 nColor, bool lineOnly, void OpenGL3DRenderer::EndAddShapePolygon3DObject() { m_Polygon3DInfoList.push_back(m_Polygon3DInfo); - m_Polygon3DInfo.normals = NULL; - m_Polygon3DInfo.vertices = NULL; + m_Polygon3DInfo.normals = nullptr; + m_Polygon3DInfo.vertices = nullptr; // TODO: moggi: memory leak??? m_Polygon3DInfo.verticesList.clear(); m_Polygon3DInfo.normalsList.clear(); @@ -1201,7 +1201,7 @@ void OpenGL3DRenderer::AddPolygon3DObjectNormalPoint(float x, float y, float z) void OpenGL3DRenderer::EndAddPolygon3DObjectNormalPoint() { m_Polygon3DInfo.normalsList.push_back(m_Polygon3DInfo.normals); - m_Polygon3DInfo.normals = NULL; + m_Polygon3DInfo.normals = nullptr; } void OpenGL3DRenderer::AddPolygon3DObjectPoint(float x, float y, float z) @@ -1221,7 +1221,7 @@ void OpenGL3DRenderer::AddPolygon3DObjectPoint(float x, float y, float z) void OpenGL3DRenderer::EndAddPolygon3DObjectPoint() { m_Polygon3DInfo.verticesList.push_back(m_Polygon3DInfo.vertices); - m_Polygon3DInfo.vertices = NULL; + m_Polygon3DInfo.vertices = nullptr; } void OpenGL3DRenderer::AddShape3DExtrudeObject(bool roundedCorner, sal_uInt32 nColor, sal_uInt32 specular, const glm::mat4& modelMatrix, sal_uInt32 nUniqueId) @@ -1307,7 +1307,7 @@ void OpenGL3DRenderer::Init3DUniformBlock() m_3DActualSizeLight = ((nBlockDataSizeLight / nUniformBufferAlignSize) + std::min(nBlockDataSizeLight % nUniformBufferAlignSize, 1)) * nUniformBufferAlignSize; // cout << "nBlockDataSizeMertrial = " << nBlockDataSizeMertrial << ", nBlockDataSizeLight = " << nBlockDataSizeLight << ", m_3DActualSizeLight = " << m_3DActualSizeLight << endl; int dataSize = m_3DActualSizeLight + nBlockDataSizeMertrial; - glBufferData(GL_UNIFORM_BUFFER, dataSize, NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_UNIFORM_BUFFER, dataSize, nullptr, GL_DYNAMIC_DRAW); glBindBufferRange(GL_UNIFORM_BUFFER, 0, m_3DUBOBuffer, 0, nBlockDataSizeLight); CHECK_GL_ERROR(); glUniformBlockBinding(maResources.m_3DProID, a3DLightBlockIndex, 0); @@ -1343,7 +1343,7 @@ void OpenGL3DRenderer::InitBatch3DUniformBlock() m_Batch3DActualSizeLight = ((nBlockDataSizeLight / nUniformBufferAlignSize) + std::min(nBlockDataSizeLight % nUniformBufferAlignSize, 1)) * nUniformBufferAlignSize; // cout << "nBlockDataSizeMertrial = " << nBlockDataSizeMertrial << ", nBlockDataSizeLight = " << nBlockDataSizeLight << ", m_3DActualSizeLight = " << m_3DActualSizeLight << endl; int dataSize = m_Batch3DActualSizeLight + nBlockDataSizeMertrial; - glBufferData(GL_UNIFORM_BUFFER, dataSize, NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_UNIFORM_BUFFER, dataSize, nullptr, GL_DYNAMIC_DRAW); glBindBufferRange(GL_UNIFORM_BUFFER, 2, m_Batch3DUBOBuffer, 0, nBlockDataSizeLight); CHECK_GL_ERROR(); glUniformBlockBinding(maResources.m_3DBatchProID, a3DLightBlockIndex, 2); @@ -1855,7 +1855,7 @@ void OpenGL3DRenderer::CreateTextTextureBatch(const boost::shared_array<sal_uInt textureArray.textureArrayWidth = bmpHeight * 8; textureArray.textureArrayHeight = bmpHeight; glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, textureArray.textureArrayWidth, textureArray.textureArrayHeight, - m_TextInfoBatch.batchNum, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + m_TextInfoBatch.batchNum, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr); CHECK_GL_ERROR(); if (m_TextInfoBatch.texture.size() > 0) { @@ -2567,7 +2567,7 @@ void OpenGL3DRenderer::RenderBatchBars(bool bNewScene) } glEnableVertexAttribArray(maResources.m_3DBatchColorID); glBindBuffer(GL_ARRAY_BUFFER, m_BatchColorBuf); - glVertexAttribPointer(maResources.m_3DBatchColorID , 4, GL_FLOAT, GL_FALSE, sizeof(glm::vec4), 0); + glVertexAttribPointer(maResources.m_3DBatchColorID , 4, GL_FLOAT, GL_FALSE, sizeof(glm::vec4), nullptr); glVertexAttribDivisor(maResources.m_3DBatchColorID, 1); if (m_Extrude3DInfo.rounded) { diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index d3fd0e7d78e4..326d4086e9ce 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -30,13 +30,13 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; PlotterBase::PlotterBase( sal_Int32 nDimensionCount ) - : m_xLogicTarget(NULL) - , m_xFinalTarget(NULL) - , m_xShapeFactory(NULL) - , m_pShapeFactory(NULL) + : m_xLogicTarget(nullptr) + , m_xFinalTarget(nullptr) + , m_xShapeFactory(nullptr) + , m_pShapeFactory(nullptr) , m_aCID() , m_nDimension(nDimensionCount) - , m_pPosHelper(NULL) + , m_pPosHelper(nullptr) { } @@ -84,7 +84,7 @@ uno::Reference< drawing::XShapes > PlotterBase::createGroupShape( , const OUString& rName ) { if(!m_xShapeFactory.is()) - return NULL; + return nullptr; if(m_nDimension==2) { diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index 78903ea018b0..d4fd1cfa7110 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::chart2; PlottingPositionHelper::PlottingPositionHelper() : m_aScales() , m_aMatrixScreenToScene() - , m_xTransformationLogicToScene(NULL) + , m_xTransformationLogicToScene(nullptr) , m_bSwapXAndY( false ) , m_nXResolution( 1000 ) , m_nYResolution( 1000 ) @@ -59,7 +59,7 @@ PlottingPositionHelper::PlottingPositionHelper() PlottingPositionHelper::PlottingPositionHelper( const PlottingPositionHelper& rSource ) : m_aScales( rSource.m_aScales ) , m_aMatrixScreenToScene( rSource.m_aMatrixScreenToScene ) - , m_xTransformationLogicToScene( NULL ) //should be recalculated + , m_xTransformationLogicToScene( nullptr ) //should be recalculated , m_bSwapXAndY( rSource.m_bSwapXAndY ) , m_nXResolution( rSource.m_nXResolution ) , m_nYResolution( rSource.m_nYResolution ) @@ -95,14 +95,14 @@ PlottingPositionHelper* PlottingPositionHelper::createSecondaryPosHelper( const void PlottingPositionHelper::setTransformationSceneToScreen( const drawing::HomogenMatrix& rMatrix) { m_aMatrixScreenToScene = HomogenMatrixToB3DHomMatrix(rMatrix); - m_xTransformationLogicToScene = NULL; + m_xTransformationLogicToScene = nullptr; } void PlottingPositionHelper::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) { m_aScales = rScales; m_bSwapXAndY = bSwapXAndYAxis; - m_xTransformationLogicToScene = NULL; + m_xTransformationLogicToScene = nullptr; } uno::Reference< XTransformation > PlottingPositionHelper::getTransformationScaledLogicToScene() const @@ -212,7 +212,7 @@ awt::Point PlottingPositionHelper::transformSceneToScreenPosition( const drawing tPropertyNameMap aDummyPropertyNameMap; uno::Reference< drawing::XShape > xShape3DAnchor = pShapeFactory->createCube( xSceneTarget , rScenePosition3D,drawing::Direction3D(1,1,1) - , 0, 0, aDummyPropertyNameMap); + , 0, nullptr, aDummyPropertyNameMap); //get 2D position from xShape3DAnchor aScreenPoint = xShape3DAnchor->getPosition(); xSceneTarget->remove(xShape3DAnchor); @@ -371,8 +371,8 @@ void PolarPlottingPositionHelper::setScales( const std::vector< ExplicitScaleDat double fScaleDirectionZ = AxisOrientation_MATHEMATICAL==m_aScales[2].Orientation ? 1.0 : -1.0; double MinZ = getLogicMinZ(); double MaxZ = getLogicMaxZ(); - doLogicScaling( 0, 0, &MinZ ); - doLogicScaling( 0, 0, &MaxZ ); + doLogicScaling( nullptr, nullptr, &MinZ ); + doLogicScaling( nullptr, nullptr, &MaxZ ); double fWidthZ = MaxZ - MinZ; if( AxisOrientation_MATHEMATICAL==m_aScales[2].Orientation ) @@ -584,7 +584,7 @@ double PolarPlottingPositionHelper::transformToRadius( double fLogicValueOnRadiu double fX = m_bSwapXAndY ? fLogicValueOnRadiusAxis: getLogicMaxX(); double fY = m_bSwapXAndY ? getLogicMaxY() : fLogicValueOnRadiusAxis; if(bDoScaling) - doLogicScaling( &fX, &fY, 0 ); + doLogicScaling( &fX, &fY, nullptr ); fScaledLogicRadiusValue = m_bSwapXAndY ? fX : fY; @@ -598,10 +598,10 @@ double PolarPlottingPositionHelper::transformToRadius( double fLogicValueOnRadiu { double MinX = getLogicMinX(); double MinY = getLogicMinY(); - doLogicScaling( &MinX, &MinY, 0 ); + doLogicScaling( &MinX, &MinY, nullptr ); double MaxX = getLogicMaxX(); double MaxY = getLogicMaxY(); - doLogicScaling( &MaxX, &MaxY, 0 ); + doLogicScaling( &MaxX, &MaxY, nullptr ); double fMin = m_bSwapXAndY ? MinX : MinY; double fMax = m_bSwapXAndY ? MaxX : MaxY; diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 313c2370902a..9b588a706340 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -172,7 +172,7 @@ uno::Any* PropertyMapper::getValuePointer( tAnySequence& rPropValues if(rPropNames[nN].equals(rPropName)) return &rPropValues[nN]; } - return NULL; + return nullptr; } uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropValues diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 0457be3ac9b5..5e5ad546ef79 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -349,7 +349,7 @@ uno::Reference<drawing::XShape> , bool bRounded ) { if( !xTarget.is() ) - return 0; + return nullptr; if( bRounded ) { try @@ -382,7 +382,7 @@ uno::Reference<drawing::XShape> , bool bRounded ) { if( !xTarget.is() ) - return 0; + return nullptr; //create shape uno::Reference< drawing::XShape > xShape( @@ -453,7 +453,7 @@ uno::Reference<drawing::XShape> , const tPropertyNameMap& rPropertyNameMap ) { if( !xTarget.is() ) - return 0; + return nullptr; Reference< drawing::XShapes > xGroup( ShapeFactory::createGroup3D( xTarget, OUString() ) ); @@ -621,7 +621,7 @@ uno::Reference<drawing::XShape> , bool bCylinder ) { if( !xTarget.is() ) - return 0; + return nullptr; //create shape uno::Reference< drawing::XShape > xShape( @@ -853,7 +853,7 @@ uno::Reference< drawing::XShape > , const drawing::HomogenMatrix& rUnitCircleToScene ) { if( !xTarget.is() ) - return 0; + return nullptr; while(fUnitCircleWidthAngleDegree>360) fUnitCircleWidthAngleDegree -= 360.0; @@ -904,7 +904,7 @@ uno::Reference< drawing::XShape > , double fDepth ) { if( !xTarget.is() ) - return 0; + return nullptr; while(fUnitCircleWidthAngleDegree>360) fUnitCircleWidthAngleDegree -= 360.0; @@ -985,7 +985,7 @@ uno::Reference< drawing::XShape > , bool bFlatNormals ) { if( !xTarget.is() ) - return 0; + return nullptr; //create shape uno::Reference< drawing::XShape > xShape( @@ -1041,10 +1041,10 @@ uno::Reference< drawing::XShape > , double fDepth ) { if( !xTarget.is() ) - return 0; + return nullptr; if( !rPolyPolygon.SequenceX.getLength()) - return 0; + return nullptr; //create shape uno::Reference< drawing::XShape > xShape( @@ -1104,7 +1104,7 @@ uno::Reference< drawing::XShape > , const drawing::PolyPolygonShape3D& rPolyPolygon ) { if( !xTarget.is() ) - return 0; + return nullptr; //create shape uno::Reference< drawing::XShape > xShape( @@ -1650,7 +1650,7 @@ uno::Reference< drawing::XShape > , sal_Int32 nFillColor ) { if( !xTarget.is() ) - return 0; + return nullptr; //create shape uno::Reference< drawing::XShape > xShape( @@ -1696,7 +1696,7 @@ uno::Reference< drawing::XShape > , const uno::Reference< graphic::XGraphic >& xGraphic ) { if( !xTarget.is() || !xGraphic.is() ) - return 0; + return nullptr; // @todo: change this to a rectangle shape with a fill bitmap for // performance reasons (ask AW, said CL) @@ -1742,7 +1742,7 @@ uno::Reference< drawing::XShapes > , const OUString& aName ) { if( !xTarget.is() ) - return 0; + return nullptr; try { //create and add to target @@ -1769,7 +1769,7 @@ uno::Reference< drawing::XShapes > { ASSERT_EXCEPTION( e ); } - return 0; + return nullptr; } uno::Reference< drawing::XShapes > @@ -1777,7 +1777,7 @@ uno::Reference< drawing::XShapes > , const OUString& aName ) { if( !xTarget.is() ) - return 0; + return nullptr; try { //create shape @@ -1822,7 +1822,7 @@ uno::Reference< drawing::XShapes > { ASSERT_EXCEPTION( e ); } - return 0; + return nullptr; } uno::Reference< drawing::XShape > @@ -1831,7 +1831,7 @@ uno::Reference< drawing::XShape > , const drawing::Direction3D& rSize ) { if( !xTarget.is() ) - return 0; + return nullptr; //create shape uno::Reference< drawing::XShape > xShape( @@ -1893,10 +1893,10 @@ uno::Reference< drawing::XShape > , const VLineProperties& rLineProperties ) { if( !xTarget.is() ) - return 0; + return nullptr; if(!rPoints.SequenceX.getLength()) - return NULL; + return nullptr; //create shape uno::Reference< drawing::XShape > xShape( @@ -1954,10 +1954,10 @@ uno::Reference< drawing::XShape > , const VLineProperties* pLineProperties ) { if( !xTarget.is() ) - return 0; + return nullptr; if(!rPoints.getLength()) - return NULL; + return nullptr; //create shape uno::Reference< drawing::XShape > xShape( @@ -2034,7 +2034,7 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle( try { if(!xTarget.is()) - return 0; + return nullptr; uno::Reference< drawing::XShape > xShape( m_xShapeFactory->createInstance( "com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY ); @@ -2050,7 +2050,7 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle( { ASSERT_EXCEPTION( ex ); } - return 0; + return nullptr; } uno::Reference< drawing::XShape > ShapeFactory::createRectangle( @@ -2103,10 +2103,10 @@ uno::Reference< drawing::XShape > , const uno::Any& rATransformation ) { if( !xTarget.is() ) - return 0; + return nullptr; if(rText.isEmpty()) - return 0; + return nullptr; //create shape and add to page uno::Reference< drawing::XShape > xShape( @@ -2149,18 +2149,18 @@ uno::Reference< drawing::XShape > , const uno::Any& rATransformation ) { if( !xTarget.is() ) - return 0; + return nullptr; if( !rTextParagraphs.hasElements() ) - return 0; + return nullptr; sal_Int32 nNumberOfParagraphs = rTextParagraphs.getLength(); if( rParaPropNames.getLength() != nNumberOfParagraphs ) - return 0; + return nullptr; if( rParaPropValues.getLength() != nNumberOfParagraphs ) - return 0; + return nullptr; bool bNotEmpty = false; for( sal_Int32 nN = 0; nN < nNumberOfParagraphs; ++nN ) @@ -2172,7 +2172,7 @@ uno::Reference< drawing::XShape > } } if( !bNotEmpty ) - return 0; + return nullptr; //create shape and add to page uno::Reference< drawing::XShape > xShape( @@ -2218,7 +2218,7 @@ uno::Reference< drawing::XShape > } if( !bNotEmpty ) - return 0; + return nullptr; uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY ); if( xProp.is() ) diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index e6bb82c182ae..60b641278d46 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -315,12 +315,12 @@ void VDataSeries::doSortByXValues() void VDataSeries::releaseShapes() { - m_xGroupShape.set(0); - m_xLabelsGroupShape.set(0); - m_xErrorXBarsGroupShape.set(0); - m_xErrorYBarsGroupShape.set(0); - m_xFrontSubGroupShape.set(0); - m_xBackSubGroupShape.set(0); + m_xGroupShape.set(nullptr); + m_xLabelsGroupShape.set(nullptr); + m_xErrorXBarsGroupShape.set(nullptr); + m_xErrorYBarsGroupShape.set(nullptr); + m_xFrontSubGroupShape.set(nullptr); + m_xBackSubGroupShape.set(nullptr); m_aPolyPolygonShape3D.SequenceX.realloc(0); m_aPolyPolygonShape3D.SequenceY.realloc(0); @@ -983,7 +983,7 @@ DataPointLabel* VDataSeries::getDataPointLabelIfLabel( sal_Int32 index ) const DataPointLabel* pLabel = this->getDataPointLabel( index ); if( !pLabel || (!pLabel->ShowNumber && !pLabel->ShowNumberInPercent && !pLabel->ShowCategoryName ) ) - return 0; + return nullptr; return pLabel; } diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 41d7eebeea23..a2212ca1b602 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -35,10 +35,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; VTitle::VTitle( const uno::Reference< XTitle > & xTitle ) - : m_xTarget(NULL) - , m_xShapeFactory(NULL) + : m_xTarget(nullptr) + , m_xShapeFactory(nullptr) , m_xTitle(xTitle) - , m_xShape(NULL) + , m_xShape(nullptr) , m_aCID() , m_fRotationAngleDegree(0.0) , m_nXPos(0) |