mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more auto_ptr -> scoped_ptr in chart2

Browse Source
This commit is contained in:
Markus Mohrhard 2012-03-06 02:30:55 +01:00
parent e319053190
commit db5cdd9cb2
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chart2/source/view/axes/VAxisBase.cxx
View File

@ -34,6 +34,7 @@
#include "macros.hxx" #include "macros.hxx"
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
//............................................................................. //.............................................................................
namespace chart namespace chart
@ -167,7 +168,7 @@ void VAxisBase::setExplicitScaleAndIncrement(
void VAxisBase::createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) 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 ) if( m_aScale.ShiftedCategoryPosition )
apTickFactory->getAllTicksShifted( rAllTickInfos ); apTickFactory->getAllTicksShifted( rAllTickInfos );
else else

4
chart2/source/view/axes/VCartesianGrid.cxx
View File

@ -38,7 +38,7 @@
#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp>
#include <vector> #include <vector>
#include <memory> #include <boost/scoped_ptr.hpp>
//............................................................................. //.............................................................................
namespace chart namespace chart
@ -229,7 +229,7 @@ void VCartesianGrid::createShapes()
//----------------------------------------- //-----------------------------------------
//create all scaled tickmark values //create all scaled tickmark values
std::auto_ptr< TickFactory > apTickFactory( this->createTickFactory() ); boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() );
TickFactory& aTickFactory = *apTickFactory.get(); TickFactory& aTickFactory = *apTickFactory.get();
::std::vector< ::std::vector< TickInfo > > aAllTickInfos; ::std::vector< ::std::vector< TickInfo > > aAllTickInfos;
aTickFactory.getAllTicks( aAllTickInfos ); aTickFactory.getAllTicks( aAllTickInfos );

2
chart2/source/view/axes/VCoordinateSystem.cxx
View File

@ -259,7 +259,7 @@ void VCoordinateSystem::impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex
void VCoordinateSystem::setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider /*takes ownership*/ ) void VCoordinateSystem::setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider /*takes ownership*/ )
{ {
m_apExplicitCategoriesProvider = ::std::auto_ptr< ExplicitCategoriesProvider >(pExplicitCategoriesProvider); m_apExplicitCategoriesProvider.reset(pExplicitCategoriesProvider);
} }
ExplicitCategoriesProvider* VCoordinateSystem::getExplicitCategoriesProvider() ExplicitCategoriesProvider* VCoordinateSystem::getExplicitCategoriesProvider()

4
chart2/source/view/axes/VPolarAngleAxis.cxx
View File

@ -36,7 +36,7 @@
#include "PolarLabelPositionHelper.hxx" #include "PolarLabelPositionHelper.hxx"
#include <tools/color.hxx> #include <tools/color.hxx>
#include <memory> #include <boost/scoped_ptr.hpp>
//............................................................................. //.............................................................................
namespace chart namespace chart
@ -182,7 +182,7 @@ void VPolarAngleAxis::createLabels()
{ {
//----------------------------------------- //-----------------------------------------
//get the transformed screen values for all tickmarks in aAllTickInfos //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 //create tick mark text shapes
//@todo: iterate through all tick depth wich should be labeled //@todo: iterate through all tick depth wich should be labeled

2
chart2/source/view/axes/VPolarAxis.cxx
View File

@ -33,7 +33,7 @@
#include "Tickmarks.hxx" #include "Tickmarks.hxx"
#include "ShapeFactory.hxx" #include "ShapeFactory.hxx"
#include <memory> #include <boost/scoped_ptr.hpp>
//............................................................................. //.............................................................................
namespace chart namespace chart

6
chart2/source/view/charttypes/PieChart.cxx
View File

@ -43,6 +43,8 @@
#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XChild.hpp>
#include <rtl/math.hxx> #include <rtl/math.hxx>
#include <boost/scoped_ptr.hpp>
//............................................................................. //.............................................................................
namespace chart namespace chart
{ {
@ -429,11 +431,11 @@ void PieChart::createShapes()
//--------------------------- //---------------------------
//point color: //point color:
std::auto_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(0); boost::scoped_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(NULL);
{ {
if(!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is()) if(!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is())
{ {
apOverwritePropertiesMap = std::auto_ptr< tPropertyNameValueMap >( new tPropertyNameValueMap() ); apOverwritePropertiesMap.reset( new tPropertyNameValueMap() );
(*apOverwritePropertiesMap)[C2U("FillColor")] = uno::makeAny( (*apOverwritePropertiesMap)[C2U("FillColor")] = uno::makeAny(
m_xColorScheme->getColorByIndex( nPointIndex )); m_xColorScheme->getColorByIndex( nPointIndex ));
} }

3
chart2/source/view/inc/VCoordinateSystem.hxx
View File

@ -45,6 +45,7 @@
#include<map> #include<map>
#include <vector> #include <vector>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/scoped_ptr.hpp>
//............................................................................. //.............................................................................
namespace chart namespace chart
@ -201,7 +202,7 @@ private:
tFullExplicitScaleMap m_aSecondaryExplicitScales; tFullExplicitScaleMap m_aSecondaryExplicitScales;
tFullExplicitIncrementMap m_aSecondaryExplicitIncrements; tFullExplicitIncrementMap m_aSecondaryExplicitIncrements;
::std::auto_ptr< ExplicitCategoriesProvider > m_apExplicitCategoriesProvider; boost::scoped_ptr< ExplicitCategoriesProvider > m_apExplicitCategoriesProvider;
}; };
//............................................................................. //.............................................................................