diff options
Diffstat (limited to 'chart2/source/view/charttypes')
| -rw-r--r-- | chart2/source/view/charttypes/AreaChart.cxx | 16 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/AreaChart.hxx | 37 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/BarChart.cxx | 16 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/BarChart.hxx | 23 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/BubbleChart.cxx | 10 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/BubbleChart.hxx | 7 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/CandleStickChart.hxx | 5 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/NetChart.cxx | 18 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/NetChart.hxx | 19 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/PieChart.cxx | 8 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/PieChart.hxx | 21 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/Splines.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/Splines.hxx | 8 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 44 |
14 files changed, 111 insertions, 125 deletions
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 8618f269d062..44a26bd1ba20 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -154,8 +154,8 @@ void AreaChart::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32 xSlo if( m_bArea && pSeries ) { sal_Int32 nMissingValueTreatment = pSeries->getMissingValueTreatment(); - if( nMissingValueTreatment == ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP ) - pSeries->setMissingValueTreatment( ::com::sun::star::chart::MissingValueTreatment::USE_ZERO ); + if( nMissingValueTreatment == css::chart::MissingValueTreatment::LEAVE_GAP ) + pSeries->setMissingValueTreatment( css::chart::MissingValueTreatment::USE_ZERO ); } if( m_nDimension == 3 && !m_bCategoryXAxis ) { @@ -784,7 +784,7 @@ void AreaChart::createShapes() || ::rtl::math::isNan(fLogicY) || ::rtl::math::isInf(fLogicY) || ::rtl::math::isNan(fLogicZ) || ::rtl::math::isInf(fLogicZ) ) { - if( (*aSeriesIter)->getMissingValueTreatment() == ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP ) + if( (*aSeriesIter)->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP ) { drawing::PolyPolygonShape3D& rPolygon = (*aSeriesIter)->m_aPolyPolygonShape3D; sal_Int32& rIndex = (*aSeriesIter)->m_nPolygonIndex; @@ -945,23 +945,23 @@ void AreaChart::createShapes() switch(nLabelPlacement) { - case ::com::sun::star::chart::DataLabelPlacement::TOP: + case css::chart::DataLabelPlacement::TOP: aScenePosition3D.PositionY -= (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_TOP; break; - case ::com::sun::star::chart::DataLabelPlacement::BOTTOM: + case css::chart::DataLabelPlacement::BOTTOM: aScenePosition3D.PositionY += (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_BOTTOM; break; - case ::com::sun::star::chart::DataLabelPlacement::LEFT: + case css::chart::DataLabelPlacement::LEFT: aScenePosition3D.PositionX -= (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_LEFT; break; - case ::com::sun::star::chart::DataLabelPlacement::RIGHT: + case css::chart::DataLabelPlacement::RIGHT: aScenePosition3D.PositionX += (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_RIGHT; break; - case ::com::sun::star::chart::DataLabelPlacement::CENTER: + case css::chart::DataLabelPlacement::CENTER: eAlignment = LABEL_ALIGN_CENTER; //todo implement this different for area charts break; diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 76f9d541fcb5..80f56ec7121c 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -30,8 +30,7 @@ class AreaChart : public VSeriesPlotter { // public methods public: - AreaChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + AreaChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount , bool bCategoryXAxis, bool bNoArea=false ); @@ -40,7 +39,7 @@ public: virtual void createShapes() override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier virtual double getMaximumX() override; @@ -48,7 +47,7 @@ public: virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; virtual LegendSymbolStyle getLegendSymbolStyle() override; - virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; + virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; private: //methods //no default constructor @@ -56,16 +55,16 @@ private: //methods void impl_createSeriesShapes(); bool impl_createArea( VDataSeries* pSeries - , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly - , ::com::sun::star::drawing::PolyPolygonShape3D* pPreviousSeriesPoly + , css::drawing::PolyPolygonShape3D* pSeriesPoly + , css::drawing::PolyPolygonShape3D* pPreviousSeriesPoly , PlottingPositionHelper* pPosHelper ); bool impl_createLine( VDataSeries* pSeries - , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly + , css::drawing::PolyPolygonShape3D* pSeriesPoly , PlottingPositionHelper* pPosHelper ); - static bool create_stepped_line( ::com::sun::star::drawing::PolyPolygonShape3D aStartPoly - , ::com::sun::star::chart2::CurveStyle eCurveStyle + static bool create_stepped_line( css::drawing::PolyPolygonShape3D aStartPoly + , css::chart2::CurveStyle eCurveStyle , PlottingPositionHelper* pPosHelper - , ::com::sun::star::drawing::PolyPolygonShape3D &aPoly ); + , css::drawing::PolyPolygonShape3D &aPoly ); private: //member PlottingPositionHelper* m_pMainPosHelper; @@ -75,18 +74,14 @@ private: //member bool m_bSymbol; //Properties for splines: - ::com::sun::star::chart2::CurveStyle m_eCurveStyle; - sal_Int32 m_nCurveResolution; - sal_Int32 m_nSplineOrder; + css::chart2::CurveStyle m_eCurveStyle; + sal_Int32 m_nCurveResolution; + sal_Int32 m_nSplineOrder; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xSeriesTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xErrorBarTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xTextTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xRegressionCurveEquationTarget; + css::uno::Reference< css::drawing::XShapes > m_xSeriesTarget; + css::uno::Reference< css::drawing::XShapes > m_xErrorBarTarget; + css::uno::Reference< css::drawing::XShapes > m_xTextTarget; + css::uno::Reference< css::drawing::XShapes > m_xRegressionCurveEquationTarget; }; } //namespace chart #endif diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 10759c3dad4d..e04971368138 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -146,7 +146,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( switch(nLabelPlacement) { - case ::com::sun::star::chart::DataLabelPlacement::TOP: + case css::chart::DataLabelPlacement::TOP: { if( !pPosHelper->isSwapXAndY() ) { @@ -163,7 +163,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( } } break; - case ::com::sun::star::chart::DataLabelPlacement::BOTTOM: + case css::chart::DataLabelPlacement::BOTTOM: { if(!pPosHelper->isSwapXAndY()) { @@ -180,7 +180,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( } } break; - case ::com::sun::star::chart::DataLabelPlacement::LEFT: + case css::chart::DataLabelPlacement::LEFT: { if( pPosHelper->isSwapXAndY() ) { @@ -197,7 +197,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( } } break; - case ::com::sun::star::chart::DataLabelPlacement::RIGHT: + case css::chart::DataLabelPlacement::RIGHT: { if( pPosHelper->isSwapXAndY() ) { @@ -214,7 +214,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( } } break; - case ::com::sun::star::chart::DataLabelPlacement::OUTSIDE: + case css::chart::DataLabelPlacement::OUTSIDE: { fY = (fBaseValue < fScaledUpperYValue) ? fScaledUpperYValue : fScaledLowerYValue; if( pPosHelper->isSwapXAndY() ) @@ -225,7 +225,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( fDepth = (fBaseValue < fScaledUpperYValue) ? fabs(fScaledUpperBarDepth) : fabs(fScaledLowerBarDepth); } break; - case ::com::sun::star::chart::DataLabelPlacement::INSIDE: + case css::chart::DataLabelPlacement::INSIDE: { fY = (fBaseValue < fScaledUpperYValue) ? fScaledUpperYValue : fScaledLowerYValue; if( pPosHelper->isSwapXAndY() ) @@ -236,7 +236,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( fDepth = (fBaseValue < fScaledUpperYValue) ? fabs(fScaledUpperBarDepth) : fabs(fScaledLowerBarDepth); } break; - case ::com::sun::star::chart::DataLabelPlacement::NEAR_ORIGIN: + case css::chart::DataLabelPlacement::NEAR_ORIGIN: { fY = (fBaseValue < fScaledUpperYValue) ? fScaledLowerYValue : fScaledUpperYValue; if( pPosHelper->isSwapXAndY() ) @@ -247,7 +247,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment( fDepth = (fBaseValue < fScaledUpperYValue) ? fabs(fScaledLowerBarDepth) : fabs(fScaledUpperBarDepth); } break; - case ::com::sun::star::chart::DataLabelPlacement::CENTER: + case css::chart::DataLabelPlacement::CENTER: fY -= (fScaledUpperYValue-fScaledLowerYValue)/2.0; rAlignment = LABEL_ALIGN_CENTER; if(3==m_nDimension) diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index 7b8344f4033b..4153cdf3f09c 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -30,32 +30,29 @@ class BarChart : public VSeriesPlotter { // public methods public: - BarChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + BarChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount ); virtual ~BarChart(); virtual void createShapes() override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; private: //methods //no default constructor BarChart(); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > createDataPoint3D_Bar( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::Position3D& rPosition - , const ::com::sun::star::drawing::Direction3D& rSize + const css::uno::Reference< css::drawing::XShapes >& xTarget + , const css::drawing::Position3D& rPosition + , const css::drawing::Direction3D& rSize , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree - , const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xObjectProperties + , const css::uno::Reference< css::beans::XPropertySet >& xObjectProperties , sal_Int32 nGeometry3D ); - ::com::sun::star::awt::Point getLabelScreenPositionAndAlignment( + css::awt::Point getLabelScreenPositionAndAlignment( LabelAlignment& rAlignment, sal_Int32 nLabelPlacement , double fScaledX, double fScaledLowerYValue, double fScaledUpperYValue, double fScaledZ , double fScaledLowerBarDepth, double fScaledUpperBarDepth, double fBaseValue @@ -67,8 +64,8 @@ private: //methods private: //member BarPositionHelper* m_pMainPosHelper; - ::com::sun::star::uno::Sequence< sal_Int32 > m_aOverlapSequence; - ::com::sun::star::uno::Sequence< sal_Int32 > m_aGapwidthSequence; + css::uno::Sequence< sal_Int32 > m_aOverlapSequence; + css::uno::Sequence< sal_Int32 > m_aGapwidthSequence; }; } //namespace chart #endif diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index 2f8356044454..3470dcebfeae 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -354,23 +354,23 @@ void BubbleChart::createShapes() switch(nLabelPlacement) { - case ::com::sun::star::chart::DataLabelPlacement::TOP: + case css::chart::DataLabelPlacement::TOP: aScenePosition3D.PositionY -= (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_TOP; break; - case ::com::sun::star::chart::DataLabelPlacement::BOTTOM: + case css::chart::DataLabelPlacement::BOTTOM: aScenePosition3D.PositionY += (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_BOTTOM; break; - case ::com::sun::star::chart::DataLabelPlacement::LEFT: + case css::chart::DataLabelPlacement::LEFT: aScenePosition3D.PositionX -= (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_LEFT; break; - case ::com::sun::star::chart::DataLabelPlacement::RIGHT: + case css::chart::DataLabelPlacement::RIGHT: aScenePosition3D.PositionX += (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_RIGHT; break; - case ::com::sun::star::chart::DataLabelPlacement::CENTER: + case css::chart::DataLabelPlacement::CENTER: eAlignment = LABEL_ALIGN_CENTER; break; default: diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index 6f92cb460004..f66a6144774b 100644 --- a/chart2/source/view/charttypes/BubbleChart.hxx +++ b/chart2/source/view/charttypes/BubbleChart.hxx @@ -29,8 +29,7 @@ class BubbleChart : public VSeriesPlotter { // public methods public: - BubbleChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + BubbleChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount ); virtual ~BubbleChart(); @@ -38,7 +37,7 @@ public: virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) override; @@ -53,7 +52,7 @@ private: //methods void calculateMaximumLogicBubbleSize(); void calculateBubbleSizeScalingFactor(); - com::sun::star::drawing::Direction3D transformToScreenBubbleSize( double fLogicSize ); + css::drawing::Direction3D transformToScreenBubbleSize( double fLogicSize ); private: //member diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index fff4d88b9f2c..f85db625daa3 100644 --- a/chart2/source/view/charttypes/CandleStickChart.hxx +++ b/chart2/source/view/charttypes/CandleStickChart.hxx @@ -30,15 +30,14 @@ class CandleStickChart : public VSeriesPlotter { // public methods public: - CandleStickChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + CandleStickChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount ); virtual ~CandleStickChart(); virtual void createShapes() override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index a922b54a7b6c..72777ddd6931 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -136,7 +136,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries // do NOT connect last and first point, if one is NAN, and NAN handling is NAN_AS_GAP double fFirstY = pSeries->getYValue( 0 ); double fLastY = pSeries->getYValue( VSeriesPlotter::getPointCount() - 1 ); - if( (pSeries->getMissingValueTreatment() != ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP) + if( (pSeries->getMissingValueTreatment() != css::chart::MissingValueTreatment::LEAVE_GAP) || (::rtl::math::isFinite( fFirstY ) && ::rtl::math::isFinite( fLastY )) ) { // connect last point in last polygon with first point in first polygon @@ -467,7 +467,7 @@ void NetChart::createShapes() if( m_bArea && ( ::rtl::math::isNan(fLogicY) || ::rtl::math::isInf(fLogicY) ) ) { - if( (*aSeriesIter)->getMissingValueTreatment() == ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP ) + if( (*aSeriesIter)->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP ) { if( rSeriesList.size() == 1 || nSeriesIndex == 0 ) { @@ -489,7 +489,7 @@ void NetChart::createShapes() || ::rtl::math::isNan(fLogicY) || ::rtl::math::isInf(fLogicY) || ::rtl::math::isNan(fLogicZ) || ::rtl::math::isInf(fLogicZ) ) { - if( (*aSeriesIter)->getMissingValueTreatment() == ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP ) + if( (*aSeriesIter)->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP ) { drawing::PolyPolygonShape3D& rPolygon = (*aSeriesIter)->m_aPolyPolygonShape3D; sal_Int32& rIndex = (*aSeriesIter)->m_nPolygonIndex; @@ -628,23 +628,23 @@ void NetChart::createShapes() switch(nLabelPlacement) { - case ::com::sun::star::chart::DataLabelPlacement::TOP: + case css::chart::DataLabelPlacement::TOP: aScenePosition3D.PositionY -= (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_TOP; break; - case ::com::sun::star::chart::DataLabelPlacement::BOTTOM: + case css::chart::DataLabelPlacement::BOTTOM: aScenePosition3D.PositionY += (aSymbolSize.DirectionY/2+1); eAlignment = LABEL_ALIGN_BOTTOM; break; - case ::com::sun::star::chart::DataLabelPlacement::LEFT: + case css::chart::DataLabelPlacement::LEFT: aScenePosition3D.PositionX -= (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_LEFT; break; - case ::com::sun::star::chart::DataLabelPlacement::RIGHT: + case css::chart::DataLabelPlacement::RIGHT: aScenePosition3D.PositionX += (aSymbolSize.DirectionX/2+1); eAlignment = LABEL_ALIGN_RIGHT; break; - case ::com::sun::star::chart::DataLabelPlacement::CENTER: + case css::chart::DataLabelPlacement::CENTER: eAlignment = LABEL_ALIGN_CENTER; //todo implement this different for area charts break; @@ -657,7 +657,7 @@ void NetChart::createShapes() awt::Point aScreenPosition2D;//get the screen position for the labels sal_Int32 nOffset = 100; //todo maybe calculate this font height dependent - if( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE ) + if( nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE ) { PolarPlottingPositionHelper* pPolarPosHelper = dynamic_cast<PolarPlottingPositionHelper*>(pPosHelper); if( pPolarPosHelper ) diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx index 298c91e97211..ee98c343b8bd 100644 --- a/chart2/source/view/charttypes/NetChart.hxx +++ b/chart2/source/view/charttypes/NetChart.hxx @@ -29,8 +29,7 @@ class NetChart : public VSeriesPlotter { // public methods public: - NetChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + NetChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount , bool bNoArea , PlottingPositionHelper* pPlottingPositionHelper //takes ownership @@ -40,7 +39,7 @@ public: virtual void createShapes() override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier virtual double getMaximumX() override; @@ -48,7 +47,7 @@ public: virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; virtual LegendSymbolStyle getLegendSymbolStyle() override; - virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; + virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; private: //methods //no default constructor @@ -56,11 +55,11 @@ private: //methods void impl_createSeriesShapes(); bool impl_createArea( VDataSeries* pSeries - , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly - , ::com::sun::star::drawing::PolyPolygonShape3D* pPreviousSeriesPoly + , css::drawing::PolyPolygonShape3D* pSeriesPoly + , css::drawing::PolyPolygonShape3D* pPreviousSeriesPoly , PlottingPositionHelper* pPosHelper ); bool impl_createLine( VDataSeries* pSeries - , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly + , css::drawing::PolyPolygonShape3D* pSeriesPoly , PlottingPositionHelper* pPosHelper ); private: //member @@ -69,10 +68,8 @@ private: //member bool m_bArea;//false -> line or symbol only bool m_bLine; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xSeriesTarget; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > m_xTextTarget; + css::uno::Reference< css::drawing::XShapes > m_xSeriesTarget; + css::uno::Reference< css::drawing::XShapes > m_xTextTarget; }; } //namespace chart #endif diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 9d0458330036..3da33c908255 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -289,13 +289,13 @@ void PieChart::createTextLabelShape( ///`AVOID_OVERLAP` as if it was of `CENTER` type; //AVOID_OVERLAP is in fact "Best fit" in the UI. - bool bMovementAllowed = ( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP ); + bool bMovementAllowed = ( nLabelPlacement == css::chart::DataLabelPlacement::AVOID_OVERLAP ); if( bMovementAllowed ) // Use center for "Best fit" for now. In the future we // may want to implement a real best fit algorithm. // But center is good enough, and close to what Excel // does. - nLabelPlacement = ::com::sun::star::chart::DataLabelPlacement::CENTER; + nLabelPlacement = css::chart::DataLabelPlacement::CENTER; ///for `OUTSIDE` (`INSIDE`) label placements an offset of 150 (-150), in the ///radius direction, is added to the final screen position of the label @@ -307,9 +307,9 @@ void PieChart::createTextLabelShape( ///these are coordinates of a virtual screen and 150 is a small value; LabelAlignment eAlignment(LABEL_ALIGN_CENTER); sal_Int32 nScreenValueOffsetInRadiusDirection = 0 ; - if( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE ) + if( nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE ) nScreenValueOffsetInRadiusDirection = (3!=m_nDimension) ? 150 : 0;//todo maybe calculate this font height dependent - else if( nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::INSIDE ) + else if( nLabelPlacement == css::chart::DataLabelPlacement::INSIDE ) nScreenValueOffsetInRadiusDirection = (3!=m_nDimension) ? -150 : 0;//todo maybe calculate this font height dependent ///the scene position of the label anchor point is calculated (see notes for diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index 64acb90aeb19..b46279943f0f 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -33,20 +33,19 @@ class PieChart : public VSeriesPlotter struct ShapeParam; public: - PieChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType >& xChartTypeModel + PieChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount, bool bExcludingPositioning ); virtual ~PieChart(); /** This method creates all shapes needed for representing the pie chart. */ virtual void createShapes() override; - virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ) override; + virtual void rearrangeLabelToAvoidOverlapIfRequested( const css::awt::Size& rPageSize ) override; virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; virtual bool shouldSnapRectToUsedArea() override; //MinimumAndMaximumSupplier @@ -100,12 +99,12 @@ private: //methods * and its entries are utilized for computing the maximum offset. */ double getMaxOffset(); - bool detectLabelOverlapsAndMove(const ::com::sun::star::awt::Size& rPageSize);//returns true when there might be more to do + bool detectLabelOverlapsAndMove(const css::awt::Size& rPageSize);//returns true when there might be more to do void resetLabelPositionsToPreviousState(); struct PieLabelInfo; bool tryMoveLabels( PieLabelInfo* pFirstBorder, PieLabelInfo* pSecondBorder , PieLabelInfo* pCenter, bool bSingleCenter, bool& rbAlternativeMoveDirection - , const ::com::sun::star::awt::Size& rPageSize ); + , const css::awt::Size& rPageSize ); bool performLabelBestFitInnerPlacement(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo); static bool performLabelBestFitOuterPlacement(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo); @@ -119,20 +118,20 @@ private: //member struct PieLabelInfo { PieLabelInfo(); - bool moveAwayFrom( const PieLabelInfo* pFix, const ::com::sun::star::awt::Size& rPageSize + bool moveAwayFrom( const PieLabelInfo* pFix, const css::awt::Size& rPageSize , bool bMoveHalfWay, bool bMoveClockwise, bool bAlternativeMoveDirection ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xTextShape; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xLabelGroupShape; + css::uno::Reference< css::drawing::XShape > xTextShape; + css::uno::Reference< css::drawing::XShape > xLabelGroupShape; ::basegfx::B2IVector aFirstPosition; ::basegfx::B2IVector aOrigin; double fValue; bool bMovementAllowed; bool bMoved; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > xTextTarget; + css::uno::Reference< css::drawing::XShapes > xTextTarget; PieLabelInfo* pPrevious; PieLabelInfo* pNext; - ::com::sun::star::awt::Point aPreviousPosition; + css::awt::Point aPreviousPosition; }; ::std::vector< PieLabelInfo > m_aLabelInfoList; diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 1921fd3dae7d..3c20ed0fb159 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -664,8 +664,8 @@ void SplineCalculater::CalculateCubicSplines( // http://www.cs.mtu.edu/~shene/COURSES/cs3621/NOTES/ // [last called 2011-05-20] void SplineCalculater::CalculateBSplines( - const ::com::sun::star::drawing::PolyPolygonShape3D& rInput - , ::com::sun::star::drawing::PolyPolygonShape3D& rResult + const css::drawing::PolyPolygonShape3D& rInput + , css::drawing::PolyPolygonShape3D& rResult , sal_uInt32 nResolution , sal_uInt32 nDegree ) { diff --git a/chart2/source/view/charttypes/Splines.hxx b/chart2/source/view/charttypes/Splines.hxx index 4f57e05a02c4..3454ee09f379 100644 --- a/chart2/source/view/charttypes/Splines.hxx +++ b/chart2/source/view/charttypes/Splines.hxx @@ -32,13 +32,13 @@ class SplineCalculater { public: static void CalculateCubicSplines( - const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints - , ::com::sun::star::drawing::PolyPolygonShape3D& rResult + const css::drawing::PolyPolygonShape3D& rPoints + , css::drawing::PolyPolygonShape3D& rResult , sal_uInt32 nGranularity ); static void CalculateBSplines( - const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints - , ::com::sun::star::drawing::PolyPolygonShape3D& rResult + const css::drawing::PolyPolygonShape3D& rPoints + , css::drawing::PolyPolygonShape3D& rResult , sal_uInt32 nGranularity , sal_uInt32 nSplineDepth ); }; diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 380a84dde736..b9537e9d6f6d 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -153,7 +153,7 @@ VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeMode , m_xChartTypeModelProps( uno::Reference< beans::XPropertySet >::query( xChartTypeModel )) , m_aZSlots() , m_bCategoryXAxis(bCategoryXAxis) - , m_nTimeResolution(::com::sun::star::chart::TimeUnit::DAY) + , m_nTimeResolution(css::chart::TimeUnit::DAY) , m_aNullDate(30,12,1899) , m_xColorScheme() , m_pExplicitCategoriesProvider(nullptr) @@ -365,7 +365,7 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getErrorBarsGroupShape( VData , const uno::Reference< drawing::XShapes >& xTarget , bool bYError ) { - uno::Reference< ::com::sun::star::drawing::XShapes > &rShapeGroup = + uno::Reference< css::drawing::XShapes > &rShapeGroup = bYError ? rDataSeries.m_xErrorYBarsGroupShape : rDataSeries.m_xErrorXBarsGroupShape; uno::Reference< drawing::XShapes > xShapes( rShapeGroup ); @@ -731,15 +731,15 @@ double lcl_getErrorBarLogicLength( { switch( nErrorBarStyle ) { - case ::com::sun::star::chart::ErrorBarStyle::NONE: + case css::chart::ErrorBarStyle::NONE: break; - case ::com::sun::star::chart::ErrorBarStyle::VARIANCE: + case css::chart::ErrorBarStyle::VARIANCE: fResult = StatisticsHelper::getVariance( rData ); break; - case ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION: + case css::chart::ErrorBarStyle::STANDARD_DEVIATION: fResult = StatisticsHelper::getStandardDeviation( rData ); break; - case ::com::sun::star::chart::ErrorBarStyle::RELATIVE: + case css::chart::ErrorBarStyle::RELATIVE: { double fPercent = 0; if( xProp->getPropertyValue( bPositive @@ -755,12 +755,12 @@ double lcl_getErrorBarLogicLength( } } break; - case ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE: + case css::chart::ErrorBarStyle::ABSOLUTE: xProp->getPropertyValue( bPositive ? OUString("PositiveError") : OUString("NegativeError") ) >>= fResult; break; - case ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: + case css::chart::ErrorBarStyle::ERROR_MARGIN: { // todo: check if this is really what's called error-margin double fPercent = 0; @@ -784,10 +784,10 @@ double lcl_getErrorBarLogicLength( } } break; - case ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR: + case css::chart::ErrorBarStyle::STANDARD_ERROR: fResult = StatisticsHelper::getStandardError( rData ); break; - case ::com::sun::star::chart::ErrorBarStyle::FROM_DATA: + case css::chart::ErrorBarStyle::FROM_DATA: { uno::Reference< chart2::data::XDataSource > xErrorBarData( xProp, uno::UNO_QUERY ); if( xErrorBarData.is()) @@ -899,7 +899,7 @@ void VSeriesPlotter::createErrorBar( { bool bShowPositive = false; bool bShowNegative = false; - sal_Int32 nErrorBarStyle = ::com::sun::star::chart::ErrorBarStyle::VARIANCE; + sal_Int32 nErrorBarStyle = css::chart::ErrorBarStyle::VARIANCE; xErrorBarProperties->getPropertyValue( "ShowPositiveError") >>= bShowPositive; xErrorBarProperties->getPropertyValue( "ShowNegativeError") >>= bShowNegative; @@ -908,14 +908,14 @@ void VSeriesPlotter::createErrorBar( if(!bShowPositive && !bShowNegative) return; - if(nErrorBarStyle==::com::sun::star::chart::ErrorBarStyle::NONE) + if(nErrorBarStyle==css::chart::ErrorBarStyle::NONE) return; if (!m_pPosHelper) return; drawing::Position3D aUnscaledLogicPosition(rUnscaledLogicPosition); - if(nErrorBarStyle==::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION) + if(nErrorBarStyle==css::chart::ErrorBarStyle::STANDARD_DEVIATION) { if (bYError) aUnscaledLogicPosition.PositionY = rVDataSeries.getYMeanValue(); @@ -1348,7 +1348,7 @@ void VSeriesPlotter::setTimeResolutionOnXAxis( long TimeResolution, const Date& // MinimumAndMaximumSupplier long VSeriesPlotter::calculateTimeResolutionOnXAxis() { - long nRet = ::com::sun::star::chart::TimeUnit::YEAR; + long nRet = css::chart::TimeUnit::YEAR; if( m_pExplicitCategoriesProvider ) { const std::vector< double >& rDateCategories = m_pExplicitCategoriesProvider->getDateCategories(); @@ -1363,17 +1363,17 @@ long VSeriesPlotter::calculateTimeResolutionOnXAxis() for(;aIt!=aEnd;++aIt) { Date aCurrent(aNullDate); aCurrent+=static_cast<long>(rtl::math::approxFloor(*aIt)); - if( ::com::sun::star::chart::TimeUnit::YEAR == nRet ) + if( css::chart::TimeUnit::YEAR == nRet ) { if( DateHelper::IsInSameYear( aPrevious, aCurrent ) ) - nRet = ::com::sun::star::chart::TimeUnit::MONTH; + nRet = css::chart::TimeUnit::MONTH; } - if( ::com::sun::star::chart::TimeUnit::MONTH == nRet ) + if( css::chart::TimeUnit::MONTH == nRet ) { if( DateHelper::IsInSameMonth( aPrevious, aCurrent ) ) - nRet = ::com::sun::star::chart::TimeUnit::DAY; + nRet = css::chart::TimeUnit::DAY; } - if( ::com::sun::star::chart::TimeUnit::DAY == nRet ) + if( css::chart::TimeUnit::DAY == nRet ) break; aPrevious=aCurrent; } @@ -2092,7 +2092,7 @@ private: }; } // anonymous namespace -void VSeriesPlotter::setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ) +void VSeriesPlotter::setPageReferenceSize( const css::awt::Size & rPageRefSize ) { m_aPageReferenceSize = rPageRefSize; @@ -2123,7 +2123,7 @@ bool VSeriesPlotter::shouldSnapRectToUsedArea() std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries( const awt::Size& rEntryKeyAspectRatio - , ::com::sun::star::chart::ChartLegendExpansion eLegendExpansion + , css::chart::ChartLegendExpansion eLegendExpansion , const Reference< beans::XPropertySet >& xTextProperties , const Reference< drawing::XShapes >& xTarget , const Reference< lang::XMultiServiceFactory >& xShapeFactory @@ -2169,7 +2169,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries( // If the legend is wide and we have a stacked bar-chart the normal order // is the correct one bool bReverse = false; - if( eLegendExpansion != ::com::sun::star::chart::ChartLegendExpansion_WIDE ) + if( eLegendExpansion != css::chart::ChartLegendExpansion_WIDE ) { StackingDirection eStackingDirection( pSeries->getStackingDirection() ); bReverse = ( eStackingDirection == StackingDirection_Y_STACKING ); |