Kaydet (Commit) 7df0cb37 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

boost::checked_deleter will do.

Change-Id: I952d9dfcffd85aaae49fc1f1eba9ba070900f672
üst a630bfb5
...@@ -67,12 +67,6 @@ private: ...@@ -67,12 +67,6 @@ private:
bool & m_rOutResult; bool & m_rOutResult;
}; };
struct DeleteItemConverterPtr : public ::std::unary_function< ItemConverter *, void >
{
void operator() ( ItemConverter * pConv )
{ delete pConv; }
};
}} }}
#endif #endif
......
...@@ -109,7 +109,7 @@ AxisItemConverter::~AxisItemConverter() ...@@ -109,7 +109,7 @@ AxisItemConverter::~AxisItemConverter()
delete m_pExplicitScale; delete m_pExplicitScale;
delete m_pExplicitIncrement; delete m_pExplicitIncrement;
::std::for_each( m_aConverters.begin(), m_aConverters.end(), DeleteItemConverterPtr() ); ::std::for_each(m_aConverters.begin(), m_aConverters.end(), boost::checked_deleter<ItemConverter>());
} }
void AxisItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const void AxisItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
......
...@@ -239,8 +239,7 @@ DataPointItemConverter::DataPointItemConverter( ...@@ -239,8 +239,7 @@ DataPointItemConverter::DataPointItemConverter(
DataPointItemConverter::~DataPointItemConverter() DataPointItemConverter::~DataPointItemConverter()
{ {
::std::for_each( m_aConverters.begin(), m_aConverters.end(), ::std::for_each(m_aConverters.begin(), m_aConverters.end(), boost::checked_deleter<ItemConverter>());
DeleteItemConverterPtr() );
} }
void DataPointItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const void DataPointItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
#include <boost/checked_delete.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace chart namespace chart
...@@ -59,8 +61,7 @@ LegendItemConverter::LegendItemConverter( ...@@ -59,8 +61,7 @@ LegendItemConverter::LegendItemConverter(
LegendItemConverter::~LegendItemConverter() LegendItemConverter::~LegendItemConverter()
{ {
::std::for_each( m_aConverters.begin(), m_aConverters.end(), ::std::for_each( m_aConverters.begin(), m_aConverters.end(), boost::checked_deleter<ItemConverter>());
DeleteItemConverterPtr() );
} }
void LegendItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const void LegendItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "ItemPropertyMap.hxx" #include "ItemPropertyMap.hxx"
#include <algorithm> #include <algorithm>
#include <boost/checked_delete.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
...@@ -32,8 +33,7 @@ MultipleItemConverter::MultipleItemConverter( SfxItemPool& rItemPool ) ...@@ -32,8 +33,7 @@ MultipleItemConverter::MultipleItemConverter( SfxItemPool& rItemPool )
} }
MultipleItemConverter::~MultipleItemConverter() MultipleItemConverter::~MultipleItemConverter()
{ {
::std::for_each( m_aConverters.begin(), m_aConverters.end(), ::std::for_each( m_aConverters.begin(), m_aConverters.end(), boost::checked_deleter<ItemConverter>());
DeleteItemConverterPtr() );
} }
void MultipleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const void MultipleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
#include <boost/checked_delete.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace namespace
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
#include <boost/checked_delete.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace chart { namespace wrapper { namespace chart { namespace wrapper {
...@@ -67,8 +69,7 @@ RegressionEquationItemConverter::RegressionEquationItemConverter( ...@@ -67,8 +69,7 @@ RegressionEquationItemConverter::RegressionEquationItemConverter(
RegressionEquationItemConverter::~RegressionEquationItemConverter() RegressionEquationItemConverter::~RegressionEquationItemConverter()
{ {
::std::for_each( m_aConverters.begin(), m_aConverters.end(), ::std::for_each(m_aConverters.begin(), m_aConverters.end(), boost::checked_deleter<ItemConverter>());
DeleteItemConverterPtr() );
} }
void RegressionEquationItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const void RegressionEquationItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
#include <boost/checked_delete.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace chart { namespace wrapper { namespace chart { namespace wrapper {
...@@ -125,8 +127,7 @@ TitleItemConverter::TitleItemConverter( ...@@ -125,8 +127,7 @@ TitleItemConverter::TitleItemConverter(
TitleItemConverter::~TitleItemConverter() TitleItemConverter::~TitleItemConverter()
{ {
::std::for_each( m_aConverters.begin(), m_aConverters.end(), ::std::for_each(m_aConverters.begin(), m_aConverters.end(), boost::checked_deleter<ItemConverter>());
DeleteItemConverterPtr() );
} }
void TitleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const void TitleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment