some more auto_ptr -> scoped_ptr in chart2

7 files changed, 14 insertions, 10 deletions

diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index a444be3ad951..9f20430f128c 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -34,6 +34,7 @@
 #include "macros.hxx"
 
 #include <memory>
+#include <boost/scoped_ptr.hpp>
 
 //.............................................................................
 namespace chart
@@ -167,7 +168,7 @@ void VAxisBase::setExplicitScaleAndIncrement(
 
 void VAxisBase::createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos )
 {
-    std::auto_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+    boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() );
     if( m_aScale.ShiftedCategoryPosition )
         apTickFactory->getAllTicksShifted( rAllTickInfos );
     else
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 166ea938e7de..362459dd85cd 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 
 #include <vector>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 
 //.............................................................................
 namespace chart
@@ -229,7 +229,7 @@ void VCartesianGrid::createShapes()
 
     //-----------------------------------------
     //create all scaled tickmark values
-    std::auto_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+    boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() );
     TickFactory& aTickFactory = *apTickFactory.get();
     ::std::vector< ::std::vector< TickInfo > > aAllTickInfos;
     aTickFactory.getAllTicks( aAllTickInfos );
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index de7cc0d8729d..1af1bb5c6225 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -259,7 +259,7 @@ void VCoordinateSystem::impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex
 
 void VCoordinateSystem::setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider /*takes ownership*/ )
 {
-    m_apExplicitCategoriesProvider = ::std::auto_ptr< ExplicitCategoriesProvider >(pExplicitCategoriesProvider);
+    m_apExplicitCategoriesProvider.reset(pExplicitCategoriesProvider);
 }
 
 ExplicitCategoriesProvider* VCoordinateSystem::getExplicitCategoriesProvider()
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index f58009e8cb4a..11f73cd265e2 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -36,7 +36,7 @@
 #include "PolarLabelPositionHelper.hxx"
 #include <tools/color.hxx>
 
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 
 //.............................................................................
 namespace chart
@@ -182,7 +182,7 @@ void VPolarAngleAxis::createLabels()
     {
         //-----------------------------------------
         //get the transformed screen values for all tickmarks in aAllTickInfos
-        std::auto_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+        boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() );
 
         //create tick mark text shapes
         //@todo: iterate through all tick depth wich should be labeled
diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx
index a5c5baa80a04..f08eb4174581 100644
--- a/chart2/source/view/axes/VPolarAxis.cxx
+++ b/chart2/source/view/axes/VPolarAxis.cxx
@@ -33,7 +33,7 @@
 #include "Tickmarks.hxx"
 #include "ShapeFactory.hxx"
 
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 6c4bb183a516..5e7e1676267c 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -43,6 +43,8 @@
 #include <com/sun/star/container/XChild.hpp>
 #include <rtl/math.hxx>
 
+#include <boost/scoped_ptr.hpp>
+
 //.............................................................................
 namespace chart
 {
@@ -429,11 +431,11 @@ void PieChart::createShapes()
 
                 //---------------------------
                 //point color:
-                std::auto_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(0);
+                boost::scoped_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(NULL);
                 {
                     if(!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is())
                     {
-                        apOverwritePropertiesMap = std::auto_ptr< tPropertyNameValueMap >( new tPropertyNameValueMap() );
+                        apOverwritePropertiesMap.reset( new tPropertyNameValueMap() );
                         (*apOverwritePropertiesMap)[C2U("FillColor")] = uno::makeAny(
                             m_xColorScheme->getColorByIndex( nPointIndex ));
                     }
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index 4efe6288873f..f8acd4a18d0a 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -45,6 +45,7 @@
 #include<map>
 #include <vector>
 #include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 
 //.............................................................................
 namespace chart
@@ -201,7 +202,7 @@ private:
     tFullExplicitScaleMap       m_aSecondaryExplicitScales;
     tFullExplicitIncrementMap   m_aSecondaryExplicitIncrements;
 
-    ::std::auto_ptr< ExplicitCategoriesProvider > m_apExplicitCategoriesProvider;
+    boost::scoped_ptr< ExplicitCategoriesProvider > m_apExplicitCategoriesProvider;
 };
 
 //.............................................................................