8 files changed, 36 insertions, 4 deletions
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index efb87de74026..7257a6432605 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -230,6 +230,8 @@ static void removeShapesAtWrongRhythm( TickIter& rIter
     }
 }
 
+namespace {
+
 /**
  * If the labels are staggered and bInnerLine is true we iterate through
  * only those labels that are closer to the diagram.
@@ -255,6 +257,8 @@ private: //member
     bool m_bInnerLine;
 };
 
+}
+
 LabelIterator::LabelIterator( TickInfoArrayType& rTickInfoVector
             , const AxisLabelStaggering eAxisLabelStaggering
             , bool bInnerLine )
@@ -448,6 +452,8 @@ static void getAxisLabelProperties(
         rPropValues, rPropNames, rAxisProp.maLabelAlignment.meAlignment);
 }
 
+namespace {
+
 /**
  * Iterate through only 3 ticks including the one that has the longest text
  * length.  When the first tick has the longest text, it iterates through
@@ -468,6 +474,8 @@ private:
     size_t m_nCurrentIndex;
 };
 
+}
+
 MaxLabelTickIter::MaxLabelTickIter(
     TickInfoArrayType& rTickInfoVector, size_t nLongestLabelIndex ) :
     m_rTickInfoVector(rTickInfoVector), m_nCurrentIndex(0)
@@ -1152,6 +1160,9 @@ VCartesianAxis::ScreenPosAndLogicPos VCartesianAxis::getScreenPosAndLogicPos( do
 }
 
 typedef std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList;
+
+namespace {
+
 struct lcl_LessXPos
 {
     bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
@@ -1168,6 +1179,8 @@ struct lcl_GreaterYPos
     }
 };
 
+}
+
 void VCartesianAxis::get2DAxisMainLine(
     B2DVector& rStart, B2DVector& rEnd, AxisLabelAlignment& rAlignment, double fCrossesOtherAxis ) const
 {
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index f8cfe828d0ae..61050a12500f 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -34,6 +34,8 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 
+namespace {
+
 class TextualDataProvider : public ::cppu::WeakImplHelper<
         css::chart2::data::XTextualDataSequence
         >
@@ -54,6 +56,8 @@ private: //member
     uno::Sequence< OUString > m_aTextSequence;
 };
 
+}
+
 VCartesianCoordinateSystem::VCartesianCoordinateSystem( const Reference< XCoordinateSystem >& xCooSys )
     : VCoordinateSystem(xCooSys)
 {
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 45df4131faff..36a143df4545 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -39,6 +39,8 @@ using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
+namespace {
+
 struct GridLinePoints
 {
     Sequence< double > P0;
@@ -54,6 +56,8 @@ struct GridLinePoints
     sal_Int32 m_nDimensionIndex;
 };
 
+}
+
 GridLinePoints::GridLinePoints( const PlottingPositionHelper* pPosHelper, sal_Int32 nDimensionIndex
                 , CuboidPlanePosition eLeftWallPos
                 , CuboidPlanePosition eBackWallPos
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index e9c54add6c0f..ca2218087a43 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -581,8 +581,6 @@ void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >&  rZSlots
     rZSlots = std::move(aRet);
 }
 
-}//anonymous namespace
-
 //better performance for big data
 struct FormerPoint
 {
@@ -601,6 +599,8 @@ struct FormerPoint
     double m_fZ;
 };
 
+}//anonymous namespace
+
 void AreaChart::createShapes()
 {
     if( m_aZSlots.empty() ) //no series
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 47c137b32ab4..e50fbe36ff74 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -385,6 +385,8 @@ void BarChart::addSeries( std::unique_ptr<VDataSeries> pSeries, sal_Int32 zSlot,
     VSeriesPlotter::addSeries( std::move(pSeries), zSlot, xSlot, ySlot );
 }
 
+namespace {
+
 //better performance for big data
 struct FormerBarPoint
 {
@@ -405,6 +407,8 @@ struct FormerBarPoint
     double m_fZ;
 };
 
+}
+
 void BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
 {
     //adapt m_aOverlapSequence and m_aGapwidthSequence for the groupBarsPerAxis feature
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 1a0123f0c094..ef2a75934dfb 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -136,6 +136,8 @@ drawing::Direction3D BubbleChart::getPreferredDiagramAspectRatio() const
     return drawing::Direction3D(-1,-1,-1);
 }
 
+namespace {
+
 //better performance for big data
 struct FormerPoint
 {
@@ -154,6 +156,8 @@ struct FormerPoint
     double m_fZ;
 };
 
+}
+
 void BubbleChart::createShapes()
 {
     if( m_aZSlots.empty() ) //no series
diff --git a/chart2/source/view/charttypes/ConfigAccess.cxx b/chart2/source/view/charttypes/ConfigAccess.cxx
index 2e6e507408b4..964e58ce43f7 100644
--- a/chart2/source/view/charttypes/ConfigAccess.cxx
+++ b/chart2/source/view/charttypes/ConfigAccess.cxx
@@ -28,6 +28,8 @@ namespace chart
 {
 using namespace ::com::sun::star;
 
+namespace
+{
 class ChartConfigItem : public ::utl::ConfigItem
 {
 private:
@@ -39,6 +41,7 @@ public:
     bool getUseErrorRectangle();
     virtual void Notify(const uno::Sequence<OUString>& aPropertyNames) override;
 };
+}
 
 ChartConfigItem::ChartConfigItem()
     : ConfigItem("Office.Chart/ErrorProperties")
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 823004d2091a..2f99bece1cfc 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -293,8 +293,6 @@ void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >&  rZSlots
     rZSlots = std::move(aRet);
 }
 
-}//anonymous namespace
-
 //better performance for big data
 struct FormerPoint
 {
@@ -313,6 +311,8 @@ struct FormerPoint
     double m_fZ;
 };
 
+}//anonymous namespace
+
 void NetChart::createShapes()
 {
     if( m_aZSlots.empty() ) //no series