summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-14 14:43:18 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-14 19:32:42 +0000
commit33cddeea1352688af9a42b53024e32a4536d5860 (patch)
treec113962c0dd2a936b08ce0e64721f7b4617e757b /chart2/source
parentf10691acf1be60167c042b4b4a60200b4defcd88 (diff)
boost->std
Change-Id: Iff14f69c200217c5d868978e8ffc06962b99ac09 Reviewed-on: https://gerrit.libreoffice.org/18568 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.hxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx30
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx10
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx50
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx24
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx10
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx10
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx10
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx62
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx16
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx22
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx6
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx12
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.hxx9
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.hxx5
-rw-r--r--chart2/source/controller/dialogs/DialogModel.cxx2
-rw-r--r--chart2/source/controller/dialogs/DialogModel.hxx8
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx6
-rw-r--r--chart2/source/controller/inc/AccessibleBase.hxx6
-rw-r--r--chart2/source/controller/inc/AccessibleChartView.hxx4
-rw-r--r--chart2/source/controller/inc/ChartController.hxx11
-rw-r--r--chart2/source/controller/inc/ChartDocumentWrapper.hxx4
-rw-r--r--chart2/source/controller/inc/ErrorBarItemConverter.hxx4
-rw-r--r--chart2/source/controller/inc/RegressionCurveItemConverter.hxx4
-rw-r--r--chart2/source/controller/inc/TimerTriggeredControllerLock.hxx4
-rw-r--r--chart2/source/controller/inc/TitleDialogData.hxx4
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard.hxx4
-rw-r--r--chart2/source/controller/inc/dlg_DataEditor.hxx1
-rw-r--r--chart2/source/controller/inc/dlg_InsertDataLabel.hxx4
-rw-r--r--chart2/source/controller/inc/dlg_InsertErrorBars.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_InsertLegend.hxx4
-rw-r--r--chart2/source/controller/inc/dlg_InsertTitle.hxx4
-rw-r--r--chart2/source/controller/inc/res_ErrorBar.hxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx4
-rw-r--r--chart2/source/controller/main/ChartController_Position.cxx4
-rw-r--r--chart2/source/controller/main/ChartController_Properties.cxx19
-rw-r--r--chart2/source/controller/main/ChartController_TextEdit.cxx4
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx8
-rw-r--r--chart2/source/controller/main/ElementSelector.hxx2
-rw-r--r--chart2/source/controller/main/ShapeController.cxx16
-rw-r--r--chart2/source/controller/main/UndoActions.cxx6
-rw-r--r--chart2/source/controller/main/UndoActions.hxx8
-rw-r--r--chart2/source/controller/main/UndoGuard.hxx4
-rw-r--r--chart2/source/controller/sidebar/ChartAreaPanel.hxx1
-rw-r--r--chart2/source/controller/sidebar/ChartLinePanel.hxx1
-rw-r--r--chart2/source/inc/OPropertySet.hxx4
-rw-r--r--chart2/source/inc/chartview/DrawModelWrapper.hxx2
-rw-r--r--chart2/source/inc/chartview/ExplicitValueProvider.hxx6
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx2
-rw-r--r--chart2/source/model/main/UndoManager.hxx4
-rw-r--r--chart2/source/view/axes/VAxisBase.cxx4
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx18
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx2
-rw-r--r--chart2/source/view/axes/VCartesianGrid.cxx4
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx2
-rw-r--r--chart2/source/view/axes/VPolarAngleAxis.cxx4
-rw-r--r--chart2/source/view/axes/VPolarAxis.cxx2
-rw-r--r--chart2/source/view/axes/VPolarCoordinateSystem.cxx2
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.hxx4
-rw-r--r--chart2/source/view/charttypes/NetChart.hxx2
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx4
-rw-r--r--chart2/source/view/inc/GL3DBarChart.hxx4
-rw-r--r--chart2/source/view/inc/VCoordinateSystem.hxx7
-rw-r--r--chart2/source/view/inc/VDataSeries.hxx20
-rw-r--r--chart2/source/view/inc/VSeriesPlotter.hxx2
-rw-r--r--chart2/source/view/main/ChartView.cxx28
-rw-r--r--chart2/source/view/main/VDataSeries.cxx46
105 files changed, 391 insertions, 408 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index 9353b2d2c66a..f9990543ae98 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -38,7 +38,6 @@
#include <vector>
#include <map>
-#include <boost/shared_ptr.hpp>
namespace chart
{
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index ceddbafaeca2..9bed1d66d375 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -77,7 +77,7 @@ namespace chart
namespace wrapper
{
-AreaWrapper::AreaWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
+AreaWrapper::AreaWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex )
{
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index 0b67f073e2f9..0acb0ceb22e5 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -47,7 +47,7 @@ class AreaWrapper : public ::cppu::ImplInheritanceHelper<
>
{
public:
- explicit AreaWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit AreaWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~AreaWrapper();
/// XServiceInfo declarations
@@ -93,7 +93,7 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE;
private:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
};
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index ee32f16fbd46..6abfbf48f429 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -395,7 +395,7 @@ namespace wrapper
{
AxisWrapper::AxisWrapper(
- tAxisType eType, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
+ tAxisType eType, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex ),
m_eType( eType )
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index df2265478e56..81928c3f88fb 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -33,7 +33,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -61,7 +61,7 @@ public:
SECOND_Y_AXIS
};
- AxisWrapper( tAxisType eType, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ AxisWrapper( tAxisType eType, std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~AxisWrapper();
static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis );
@@ -130,7 +130,7 @@ private: //methods
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxis();
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
tAxisType m_eType;
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 8c687ad543cb..a6d11e57f5e1 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -386,7 +386,7 @@ struct lcl_DateCategoriesOperator : public lcl_Operator
const Sequence< double >& m_rDates;
};
-ChartDataWrapper::ChartDataWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
+ChartDataWrapper::ChartDataWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex )
{
@@ -395,7 +395,7 @@ ChartDataWrapper::ChartDataWrapper( ::boost::shared_ptr< Chart2ModelContact > sp
osl_atomic_decrement( &m_refCount );
}
-ChartDataWrapper::ChartDataWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ChartDataWrapper::ChartDataWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
const Reference< XChartData >& xNewData ) :
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex )
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index c074d57900ca..31d2fc2a4f18 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -48,8 +48,8 @@ class ChartDataWrapper : public MutexContainer, public
com::sun::star::lang::XComponent >
{
public:
- explicit ChartDataWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
- ChartDataWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
+ explicit ChartDataWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ ChartDataWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact
, const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartData >& xNewData );
virtual ~ChartDataWrapper();
@@ -156,7 +156,7 @@ private: //member
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XAnyDescriptionAccess > m_xDataAccess;
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
};
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index d356bea89e82..14c1e3dc9d4f 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -276,7 +276,7 @@ namespace wrapper
class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty
{
public:
- explicit WrappedDataSourceLabelsInFirstRowProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedDataSourceLabelsInFirstRowProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedDataSourceLabelsInFirstRowProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -289,11 +289,11 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable Any m_aOuterValue;
};
-WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("DataSourceLabelsInFirstRow",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_aOuterValue()
@@ -374,7 +374,7 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Referen
class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty
{
public:
- explicit WrappedDataSourceLabelsInFirstColumnProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedDataSourceLabelsInFirstColumnProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedDataSourceLabelsInFirstColumnProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -387,11 +387,11 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable Any m_aOuterValue;
};
-WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColumnProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColumnProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("DataSourceLabelsInFirstColumn",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_aOuterValue()
@@ -472,7 +472,7 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Refe
class WrappedHasLegendProperty : public WrappedProperty
{
public:
- explicit WrappedHasLegendProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedHasLegendProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedHasLegendProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -485,10 +485,10 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
-WrappedHasLegendProperty::WrappedHasLegendProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedHasLegendProperty::WrappedHasLegendProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("HasLegend",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
{
@@ -556,7 +556,7 @@ Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPrope
class WrappedHasMainTitleProperty : public WrappedProperty
{
public:
- explicit WrappedHasMainTitleProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedHasMainTitleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedHasMainTitleProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -569,10 +569,10 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
-WrappedHasMainTitleProperty::WrappedHasMainTitleProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedHasMainTitleProperty::WrappedHasMainTitleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("HasMainTitle",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
{
@@ -629,7 +629,7 @@ Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPr
class WrappedHasSubTitleProperty : public WrappedProperty
{
public:
- explicit WrappedHasSubTitleProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedHasSubTitleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedHasSubTitleProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -642,10 +642,10 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
-WrappedHasSubTitleProperty::WrappedHasSubTitleProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedHasSubTitleProperty::WrappedHasSubTitleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("HasSubTitle",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 2b6c2da72882..83b9a1fdc277 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -261,7 +261,7 @@ struct StaticPointWrapperPropertyArray : public rtl::StaticAggregate< Sequence<
class WrappedAttachedAxisProperty : public ::chart::WrappedProperty
{
public:
- explicit WrappedAttachedAxisProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedAttachedAxisProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedAttachedAxisProperty();
virtual void setPropertyValue( const Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -274,11 +274,11 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
protected:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
WrappedAttachedAxisProperty::WrappedAttachedAxisProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("Axis",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
{
@@ -493,7 +493,7 @@ namespace wrapper
{
DataSeriesPointWrapper::DataSeriesPointWrapper(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: m_spChart2ModelContact( spChart2ModelContact )
, m_aEventListenerContainer( m_aMutex )
, m_eType( DATA_SERIES )
@@ -534,7 +534,7 @@ void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any
DataSeriesPointWrapper::DataSeriesPointWrapper( eType _eType,
sal_Int32 nSeriesIndexInNewAPI ,
sal_Int32 nPointIndex, //ignored for series
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: m_spChart2ModelContact( spChart2ModelContact )
, m_aEventListenerContainer( m_aMutex )
, m_eType( _eType )
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index a6c921b4f6ac..5bf919dd62de 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -60,12 +60,12 @@ public:
};
//this constructor needs an initialize call afterwards
- explicit DataSeriesPointWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit DataSeriesPointWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
DataSeriesPointWrapper( eType eType
, sal_Int32 nSeriesIndexInNewAPI
, sal_Int32 nPointIndex //ignored for series
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~DataSeriesPointWrapper();
@@ -125,7 +125,7 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataPointProperties();
private:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
eType m_eType;
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 0f4216e83beb..cea85aa5f024 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -631,7 +631,7 @@ namespace wrapper
{
DiagramWrapper::DiagramWrapper(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex )
{
@@ -1203,7 +1203,7 @@ void SAL_CALL DiagramWrapper::removeEventListener(
class WrappedDataRowSourceProperty : public WrappedProperty
{
public:
- explicit WrappedDataRowSourceProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedDataRowSourceProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedDataRowSourceProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -1216,11 +1216,11 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable Any m_aOuterValue;
};
-WrappedDataRowSourceProperty::WrappedDataRowSourceProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedDataRowSourceProperty::WrappedDataRowSourceProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("DataRowSource",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_aOuterValue()
@@ -1305,7 +1305,7 @@ Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XP
class WrappedStackingProperty : public WrappedProperty
{
public:
- WrappedStackingProperty( StackMode eStackMode, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ WrappedStackingProperty( StackMode eStackMode, std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedStackingProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -1321,12 +1321,12 @@ protected: //methods
bool detectInnerValue( StackMode& eInnerStackMode ) const;
private: //member
-::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
const StackMode m_eStackMode;
mutable Any m_aOuterValue;
};
-WrappedStackingProperty::WrappedStackingProperty( StackMode eStackMode, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedStackingProperty::WrappedStackingProperty( StackMode eStackMode, std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty(OUString(),OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_eStackMode( eStackMode )
@@ -1417,7 +1417,7 @@ Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XProper
class WrappedDim3DProperty : public WrappedProperty
{
public:
- explicit WrappedDim3DProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedDim3DProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedDim3DProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -1430,11 +1430,11 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable Any m_aOuterValue;
};
-WrappedDim3DProperty::WrappedDim3DProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedDim3DProperty::WrappedDim3DProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("Dim3D",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_aOuterValue()
@@ -1488,7 +1488,7 @@ Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyS
class WrappedVerticalProperty : public WrappedProperty
{
public:
- explicit WrappedVerticalProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedVerticalProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedVerticalProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -1501,11 +1501,11 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable Any m_aOuterValue;
};
-WrappedVerticalProperty::WrappedVerticalProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedVerticalProperty::WrappedVerticalProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("Vertical",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_aOuterValue()
@@ -1564,7 +1564,7 @@ Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XProper
class WrappedNumberOfLinesProperty : public WrappedProperty
{
public:
- explicit WrappedNumberOfLinesProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedNumberOfLinesProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedNumberOfLinesProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -1580,11 +1580,11 @@ protected: //methods
bool detectInnerValue( uno::Any& rInnerValue ) const;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable Any m_aOuterValue;
};
-WrappedNumberOfLinesProperty::WrappedNumberOfLinesProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedNumberOfLinesProperty::WrappedNumberOfLinesProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("NumberOfLines",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_aOuterValue( this->getPropertyDefault(0) )
@@ -1718,7 +1718,7 @@ Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XP
class WrappedAttributedDataPointsProperty : public WrappedProperty
{
public:
- explicit WrappedAttributedDataPointsProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedAttributedDataPointsProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedAttributedDataPointsProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -1731,11 +1731,11 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable Any m_aOuterValue;
};
-WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("AttributedDataPoints",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_aOuterValue()
@@ -1832,7 +1832,7 @@ Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< be
class WrappedSolidTypeProperty : public WrappedProperty
{
public:
- explicit WrappedSolidTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedSolidTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedSolidTypeProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -1845,11 +1845,11 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable Any m_aOuterValue;
};
-WrappedSolidTypeProperty::WrappedSolidTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedSolidTypeProperty::WrappedSolidTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty( "SolidType", OUString() )
, m_spChart2ModelContact( spChart2ModelContact )
, m_aOuterValue()
@@ -1977,7 +1977,7 @@ Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XP
class WrappedIncludeHiddenCellsProperty : public WrappedProperty
{
public:
- explicit WrappedIncludeHiddenCellsProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedIncludeHiddenCellsProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedIncludeHiddenCellsProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -1986,10 +1986,10 @@ public:
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
-WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("IncludeHiddenCells","IncludeHiddenCells")
, m_spChart2ModelContact( spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index 072384a2f4c2..c40d8963d598 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -44,7 +44,7 @@
#include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp>
#include <com/sun/star/chart/X3DDefaultSetter.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -71,7 +71,7 @@ class DiagramWrapper : public cppu::ImplInheritanceHelper<
>
{
public:
- explicit DiagramWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit DiagramWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~DiagramWrapper();
/// XServiceInfo declarations
@@ -240,7 +240,7 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE;
private:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index e6ea629bbc4e..5e994e29798c 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -80,7 +80,7 @@ namespace wrapper
{
GridWrapper::GridWrapper(
- tGridType eType, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
+ tGridType eType, std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex ),
m_eType( eType )
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
index 55f3298d177a..f669d5605fbf 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -55,7 +55,7 @@ public:
Z_MINOR_GRID
};
- GridWrapper( tGridType eType, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ GridWrapper( tGridType eType, std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~GridWrapper();
static void getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool& rbSubGrid );
@@ -88,7 +88,7 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE;
private:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
tGridType m_eType;
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index f55381012c95..97e0d92091c7 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -275,7 +275,7 @@ namespace chart
namespace wrapper
{
-LegendWrapper::LegendWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
+LegendWrapper::LegendWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex )
{
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index 28abcb1ca48a..2f84bc8b0327 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/chart2/XLegend.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -50,7 +50,7 @@ class LegendWrapper : public ::cppu::ImplInheritanceHelper<
, public ReferenceSizePropertyProvider
{
public:
- explicit LegendWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit LegendWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~LegendWrapper();
/// XServiceInfo declarations
@@ -101,7 +101,7 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE;
private:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
};
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 023eed13ed15..70c7566a0f7c 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -124,7 +124,7 @@ namespace chart
namespace wrapper
{
-MinMaxLineWrapper::MinMaxLineWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+MinMaxLineWrapper::MinMaxLineWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: m_spChart2ModelContact( spChart2ModelContact )
, m_aEventListenerContainer( m_aMutex )
, m_aWrappedLineJointProperty( "LineJoint", uno::makeAny( drawing::LineJoint_NONE ))
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index d1b411091c17..7abe79a503be 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -55,7 +55,7 @@ class MinMaxLineWrapper : public MutexContainer
>
{
public:
- explicit MinMaxLineWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit MinMaxLineWrapper( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~MinMaxLineWrapper();
/// XServiceInfo declarations
@@ -114,7 +114,7 @@ private: //methods
static ::cppu::IPropertyArrayHelper& getInfoHelper();
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
WrappedIgnoreProperty m_aWrappedLineJointProperty;
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 172c807a73d5..ae6d0bd7cf73 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -200,7 +200,7 @@ namespace wrapper
{
TitleWrapper::TitleWrapper( ::chart::TitleHelper::eTitleType eTitleType,
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex ),
m_eTitleType(eTitleType)
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index 8910bcf99d1e..06d43f975934 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/chart2/XTitle.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -49,7 +49,7 @@ class TitleWrapper : public ::cppu::ImplInheritanceHelper<
{
public:
TitleWrapper( ::chart::TitleHelper::eTitleType eTitleType,
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~TitleWrapper();
/// XServiceInfo declarations
@@ -122,7 +122,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > getTitleObject();
private:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
::chart::TitleHelper::eTitleType m_eTitleType;
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 99c3ca3f1e47..bbcec11c7672 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -127,7 +127,7 @@ namespace wrapper
{
UpDownBarWrapper::UpDownBarWrapper(
- bool bUp, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ bool bUp, std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: m_spChart2ModelContact( spChart2ModelContact )
, m_aEventListenerContainer( m_aMutex )
, m_aPropertySetName( bUp ? OUString( "WhiteDay" ) : OUString( "BlackDay" ))
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index 3c509fc59601..d355418d745a 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -33,7 +33,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -54,7 +54,7 @@ class UpDownBarWrapper : public MutexContainer
>
{
public:
- UpDownBarWrapper( bool bUp, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ UpDownBarWrapper( bool bUp, std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~UpDownBarWrapper();
/// XServiceInfo declarations
@@ -113,7 +113,7 @@ private: //methods
static ::cppu::IPropertyArrayHelper& getInfoHelper();
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
OUString m_aPropertySetName;
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index a3061a2d20f8..7be9d4eeffc5 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -82,7 +82,7 @@ namespace wrapper
{
WallFloorWrapper::WallFloorWrapper( bool bWall,
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact ) :
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex ),
m_bWall( bWall )
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
index 14af06365718..a4cf7dc71023 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -44,7 +44,7 @@ class WallFloorWrapper : public ::cppu::ImplInheritanceHelper<
>
{
public:
- WallFloorWrapper( bool bWall, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ WallFloorWrapper( bool bWall, std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WallFloorWrapper();
/// XServiceInfo declarations
@@ -75,7 +75,7 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE;
private:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
bool m_bWall;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index f78d625b080a..1012a9ac2f8d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -37,7 +37,7 @@ class WrappedAxisAndGridExistenceProperty : public WrappedProperty
{
public:
WrappedAxisAndGridExistenceProperty( bool bAxis, bool bMain, sal_Int32 nDimensionIndex
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedAxisAndGridExistenceProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -50,14 +50,14 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
bool m_bAxis;
bool m_bMain;
sal_Int32 m_nDimensionIndex;
};
void WrappedAxisAndGridExistenceProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
rList.push_back( new WrappedAxisAndGridExistenceProperty( true, true, 0, spChart2ModelContact ) );//x axis
rList.push_back( new WrappedAxisAndGridExistenceProperty( true, false, 0, spChart2ModelContact ) );//x secondary axis
@@ -75,7 +75,7 @@ void WrappedAxisAndGridExistenceProperties::addWrappedProperties( std::vector< W
}
WrappedAxisAndGridExistenceProperty::WrappedAxisAndGridExistenceProperty( bool bAxis, bool bMain, sal_Int32 nDimensionIndex
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty(OUString(),OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_bAxis( bAxis )
@@ -204,7 +204,7 @@ class WrappedAxisTitleExistenceProperty : public WrappedProperty
{
public:
WrappedAxisTitleExistenceProperty( sal_Int32 nTitleIndex
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedAxisTitleExistenceProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -217,12 +217,12 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
TitleHelper::eTitleType m_eTitleType;
};
void WrappedAxisTitleExistenceProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
rList.push_back( new WrappedAxisTitleExistenceProperty( 0, spChart2ModelContact ) );//x axis title
rList.push_back( new WrappedAxisTitleExistenceProperty( 1, spChart2ModelContact ) );//y axis title
@@ -232,7 +232,7 @@ void WrappedAxisTitleExistenceProperties::addWrappedProperties( std::vector< Wra
}
WrappedAxisTitleExistenceProperty::WrappedAxisTitleExistenceProperty( sal_Int32 nTitleIndex
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty(OUString(),OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_eTitleType( TitleHelper::Y_AXIS_TITLE )
@@ -318,7 +318,7 @@ class WrappedAxisLabelExistenceProperty : public WrappedProperty
{
public:
WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedAxisLabelExistenceProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -331,13 +331,13 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
bool m_bMain;
sal_Int32 m_nDimensionIndex;
};
void WrappedAxisLabelExistenceProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
rList.push_back( new WrappedAxisLabelExistenceProperty( true, 0, spChart2ModelContact ) );//x axis
rList.push_back( new WrappedAxisLabelExistenceProperty( true, 1, spChart2ModelContact ) );//y axis
@@ -347,7 +347,7 @@ void WrappedAxisLabelExistenceProperties::addWrappedProperties( std::vector< Wra
}
WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty(OUString(),OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_bMain( bMain )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
index 1351ccd5c700..1c04139fbbad 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
@@ -23,7 +23,7 @@
#include "WrappedProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace chart
@@ -35,21 +35,21 @@ class WrappedAxisAndGridExistenceProperties
{
public:
static void addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
};
class WrappedAxisTitleExistenceProperties
{
public:
static void addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
};
class WrappedAxisLabelExistenceProperties
{
public:
static void addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
};
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index 1b13ca95e690..1f0a28341ad2 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -44,7 +44,7 @@ public:
virtual sal_Int32 getValueFromSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const SAL_OVERRIDE;
- explicit WrappedDataCaptionProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedDataCaptionProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedDataCaptionProperty();
};
@@ -90,7 +90,7 @@ chart2::DataPointLabel lcl_CaptionToLabel( sal_Int32 nCaption )
}
void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
{
//if !spChart2ModelContact.get() is then the created properties do belong to a single series or single datapoint
@@ -101,7 +101,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
}//anonymous namespace
-void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rOutProperties )
+void WrappedDataCaptionProperties::addProperties( std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "DataCaption",
@@ -112,19 +112,19 @@ void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rO
}
void WrappedDataCaptionProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
lcl_addWrappedProperties( rList, spChart2ModelContact, DATA_SERIES );
}
void WrappedDataCaptionProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM );
}
WrappedDataCaptionProperty::WrappedDataCaptionProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< sal_Int32 >( "DataCaption"
, uno::makeAny( sal_Int32(0) ), spChart2ModelContact, ePropertyType )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
index d4dd9641933e..a4e988cfc1ba 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
@@ -22,7 +22,7 @@
#include "WrappedProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace chart
@@ -35,9 +35,9 @@ class WrappedDataCaptionProperties
public:
static void addProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
};
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
index 24dfe0355a0e..ca584604302e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
@@ -31,7 +31,7 @@ enum
class WrappedGL3DProperty : public WrappedProperty
{
uno::Any maDefault;
- boost::shared_ptr<Chart2ModelContact> mpModelContact;
+ std::shared_ptr<Chart2ModelContact> mpModelContact;
private:
uno::Reference<chart2::XChartType> getChartType() const
@@ -52,7 +52,7 @@ private:
}
public:
- WrappedGL3DProperty( const OUString& rInName, const OUString& rOutName, const uno::Any& rDefault, const boost::shared_ptr<Chart2ModelContact>& pContact ) :
+ WrappedGL3DProperty( const OUString& rInName, const OUString& rOutName, const uno::Any& rDefault, const std::shared_ptr<Chart2ModelContact>& pContact ) :
WrappedProperty(rInName, rOutName), maDefault(rDefault), mpModelContact(pContact) {}
virtual ~WrappedGL3DProperty() {}
@@ -137,7 +137,7 @@ void WrappedGL3DProperties::addProperties( std::vector<css::beans::Property> & r
}
void WrappedGL3DProperties::addWrappedProperties(
- std::vector<WrappedProperty*>& rList, const boost::shared_ptr<Chart2ModelContact>& pChart2ModelContact )
+ std::vector<WrappedProperty*>& rList, const std::shared_ptr<Chart2ModelContact>& pChart2ModelContact )
{
rList.push_back(
new WrappedGL3DProperty(
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx
index 7671151bdff6..39ced85e215c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx
@@ -10,8 +10,8 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDGL3DPROPERTIES_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDGL3DPROPERTIES_HXX
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/beans/Property.hpp>
@@ -28,7 +28,7 @@ class WrappedGL3DProperties
public:
static void addProperties( std::vector<css::beans::Property> & rOutProps );
static void addWrappedProperties(
- std::vector<WrappedProperty*>& rList, const boost::shared_ptr<Chart2ModelContact>& pChart2ModelContact );
+ std::vector<WrappedProperty*>& rList, const std::shared_ptr<Chart2ModelContact>& pChart2ModelContact );
};
}}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index bd79828d029c..6ab5bce1136f 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -38,7 +38,7 @@ WrappedBarPositionProperty_Base::WrappedBarPositionProperty_Base(
const OUString& rOuterName
, const OUString& rInnerSequencePropertyName
, sal_Int32 nDefaultValue
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedDefaultProperty( rOuterName, OUString(), uno::makeAny( nDefaultValue ) )
, m_nDimensionIndex(0)
, m_nAxisIndex(0)
@@ -153,7 +153,7 @@ Any WrappedBarPositionProperty_Base::getPropertyValue( const Reference< beans::X
}
WrappedGapwidthProperty::WrappedGapwidthProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedBarPositionProperty_Base( "GapWidth", "GapwidthSequence", DEFAULT_GAPWIDTH, spChart2ModelContact )
{
}
@@ -162,7 +162,7 @@ WrappedGapwidthProperty::~WrappedGapwidthProperty()
}
WrappedBarOverlapProperty::WrappedBarOverlapProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedBarPositionProperty_Base( "Overlap", "OverlapSequence", DEFAULT_OVERLAP, spChart2ModelContact )
{
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
index 3493bc74cd9a..106fbdc9c630 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
@@ -22,7 +22,7 @@
#include "WrappedDefaultProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -36,7 +36,7 @@ public:
const OUString& rOuterName
, const OUString& rInnerSequencePropertyName
, sal_Int32 nDefaultValue
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedBarPositionProperty_Base();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -50,7 +50,7 @@ public:
protected:
sal_Int32 m_nDimensionIndex;
sal_Int32 m_nAxisIndex;
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
sal_Int32 m_nDefaultValue;
OUString m_InnerSequencePropertyName;
@@ -61,14 +61,14 @@ protected:
class WrappedGapwidthProperty : public WrappedBarPositionProperty_Base
{
public:
- explicit WrappedGapwidthProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedGapwidthProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedGapwidthProperty();
};
class WrappedBarOverlapProperty : public WrappedBarPositionProperty_Base
{
public:
- explicit WrappedBarOverlapProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedBarOverlapProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedBarOverlapProperty();
};
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index cfee9372cf23..e514d4cd7f6a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -31,7 +31,7 @@ namespace chart
namespace wrapper
{
-WrappedNumberFormatProperty::WrappedNumberFormatProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedNumberFormatProperty::WrappedNumberFormatProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedDirectStateProperty( CHART_UNONAME_NUMFMT, CHART_UNONAME_NUMFMT )
, m_spChart2ModelContact(spChart2ModelContact)
{
@@ -83,7 +83,7 @@ Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPr
return uno::makeAny( sal_Int32( 0 ) );
}
-WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty( const boost::shared_ptr<Chart2ModelContact>& pChart2ModelContact ) :
+WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty( const std::shared_ptr<Chart2ModelContact>& pChart2ModelContact ) :
WrappedDirectStateProperty(CHART_UNONAME_LINK_TO_SRC_NUMFMT, CHART_UNONAME_LINK_TO_SRC_NUMFMT),
m_pChart2ModelContact(pChart2ModelContact)
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
index 7939a913abfc..1406a79c70dd 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
@@ -22,7 +22,7 @@
#include "WrappedDirectStateProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -34,7 +34,7 @@ class WrappedLinkNumberFormatProperty;
class WrappedNumberFormatProperty : public WrappedDirectStateProperty
{
public:
- explicit WrappedNumberFormatProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedNumberFormatProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedNumberFormatProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -48,13 +48,13 @@ public:
friend class WrappedLinkNumberFormatProperty;
private:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
class WrappedLinkNumberFormatProperty : public WrappedDirectStateProperty
{
public:
- explicit WrappedLinkNumberFormatProperty( const boost::shared_ptr<Chart2ModelContact>& pChart2ModelContact );
+ explicit WrappedLinkNumberFormatProperty( const std::shared_ptr<Chart2ModelContact>& pChart2ModelContact );
virtual ~WrappedLinkNumberFormatProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -67,7 +67,7 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private:
- boost::shared_ptr<Chart2ModelContact> m_pChart2ModelContact;
+ std::shared_ptr<Chart2ModelContact> m_pChart2ModelContact;
};
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 8c86559b31b6..a4fe2d0eae92 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -38,7 +38,7 @@ namespace wrapper
{
WrappedScaleProperty::WrappedScaleProperty( tScaleProperty eScaleProperty
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty(OUString(),OUString())
, m_spChart2ModelContact( spChart2ModelContact )
, m_eScaleProperty( eScaleProperty )
@@ -104,7 +104,7 @@ WrappedScaleProperty::~WrappedScaleProperty()
}
void WrappedScaleProperty::addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
rList.push_back( new WrappedScaleProperty( SCALE_PROP_MAX, spChart2ModelContact ) );
rList.push_back( new WrappedScaleProperty( SCALE_PROP_MIN, spChart2ModelContact ) );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
index 56b7789ea075..60b4bd64bec7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
@@ -22,7 +22,7 @@
#include "WrappedProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace chart
@@ -54,10 +54,10 @@ public:
};
public:
- WrappedScaleProperty( tScaleProperty eScaleProperty, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ WrappedScaleProperty( tScaleProperty eScaleProperty, std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedScaleProperty();
- static void addWrappedProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ static void addWrappedProperties( std::vector< WrappedProperty* >& rList, std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
@@ -72,7 +72,7 @@ protected: //methods
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
tScaleProperty m_eScaleProperty;
mutable ::com::sun::star::uno::Any m_aOuterValue;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 2e4d2e26b85c..a4e9f9733a59 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -37,7 +37,7 @@ namespace wrapper
class WrappedScaleTextProperty : public WrappedProperty
{
public:
- explicit WrappedScaleTextProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedScaleTextProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedScaleTextProperty();
virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
@@ -48,10 +48,10 @@ public:
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE;
private:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
-WrappedScaleTextProperty::WrappedScaleTextProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedScaleTextProperty::WrappedScaleTextProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: ::chart::WrappedProperty( "ScaleText" , OUString() )
, m_spChart2ModelContact( spChart2ModelContact )
{
@@ -137,7 +137,7 @@ void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOut
}
void WrappedScaleTextProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
rList.push_back( new WrappedScaleTextProperty( spChart2ModelContact ) );
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
index 11260f397300..987963faab55 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
@@ -23,7 +23,7 @@
#include "WrappedProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace chart
@@ -36,7 +36,7 @@ class WrappedScaleTextProperties
public:
static void addProperties( ::std::vector< ::com::sun::star::beans::Property >& rOutProperties );
static void addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
};
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index e899617838fe..3b113e7bbc32 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -34,13 +34,13 @@ namespace wrapper
{
void WrappedSceneProperty::addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
rList.push_back( new WrappedD3DTransformMatrixProperty( spChart2ModelContact ) );
}
WrappedD3DTransformMatrixProperty::WrappedD3DTransformMatrixProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty("D3DTransformMatrix","D3DTransformMatrix")
, m_spChart2ModelContact( spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
index e60741db2f36..6438e28bb507 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
@@ -22,7 +22,7 @@
#include "WrappedProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace chart
@@ -34,14 +34,14 @@ class WrappedSceneProperty
{
public:
static void addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
};
class WrappedD3DTransformMatrixProperty : public WrappedProperty
{
public:
explicit WrappedD3DTransformMatrixProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedD3DTransformMatrixProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -54,7 +54,7 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
index 717fa93e2cf2..20930a5bc16e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
@@ -25,7 +25,7 @@
#include "DiagramHelper.hxx"
#include <com/sun/star/chart2/XDataSeries.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace chart
@@ -49,7 +49,7 @@ public:
virtual void setValueToSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet, const PROPERTYTYPE & aNewValue ) const =0;
explicit WrappedSeriesOrDiagramProperty( const OUString& rName, const ::com::sun::star::uno::Any& rDefaulValue
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
: WrappedProperty(rName,OUString())
, m_spChart2ModelContact(spChart2ModelContact)
@@ -166,7 +166,7 @@ public:
}
protected:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable ::com::sun::star::uno::Any m_aOuterValue;
::com::sun::star::uno::Any m_aDefaultValue;
tSeriesOrDiagramPropertyType m_ePropertyType;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 1698c0ac7240..8ac4ca24c669 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -45,7 +45,7 @@ class WrappedSplineProperty : public WrappedProperty
public:
explicit WrappedSplineProperty( const OUString& rOuterName, const OUString& rInnerName
, const ::com::sun::star::uno::Any& rDefaulValue
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty(rOuterName,OUString())
, m_spChart2ModelContact(spChart2ModelContact)
, m_aOuterValue(rDefaulValue)
@@ -152,7 +152,7 @@ public:
}
protected:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable ::com::sun::star::uno::Any m_aOuterValue;
::com::sun::star::uno::Any m_aDefaultValue;
// this inner name is not set as inner name at the base class
@@ -162,7 +162,7 @@ protected:
class WrappedSplineTypeProperty : public WrappedSplineProperty< sal_Int32 >
{
public:
- explicit WrappedSplineTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedSplineTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedSplineTypeProperty();
virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const SAL_OVERRIDE;
@@ -207,7 +207,7 @@ void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutPro
}
void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
rList.push_back( new WrappedSplineTypeProperty( spChart2ModelContact ) );
rList.push_back(
@@ -220,7 +220,7 @@ void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty
uno::makeAny(sal_Int32(20)), spChart2ModelContact));
}
-WrappedSplineTypeProperty::WrappedSplineTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedSplineTypeProperty::WrappedSplineTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedSplineProperty<sal_Int32>(CHART_UNONAME_SPLINE_TYPE, CHART_UNONAME_CURVE_STYLE, uno::makeAny(sal_Int32(0)), spChart2ModelContact )
{
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
index 3294c78f5725..64a9f2ea8970 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
@@ -22,7 +22,7 @@
#include "WrappedProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace chart
@@ -35,7 +35,7 @@ class WrappedSplineProperties
public:
static void addProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
static void addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
};
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index e3c0b553e363..a9d488cfb878 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -121,7 +121,7 @@ sal_Int32 lcl_getErrorBarStyle( const uno::Reference< beans::XPropertySet >& xEr
}
uno::Reference< chart2::data::XDataProvider > lcl_getDataProviderFromContact(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
uno::Reference< chart2::data::XDataProvider > xResult;
if( spChart2ModelContact.get())
@@ -136,7 +136,7 @@ uno::Reference< chart2::data::XDataProvider > lcl_getDataProviderFromContact(
void lcl_ConvertRangeFromXML(
OUString & rInOutRange,
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
if( !rInOutRange.isEmpty())
{
@@ -152,7 +152,7 @@ void lcl_ConvertRangeFromXML(
void lcl_ConvertRangeToXML(
OUString & rInOutRange,
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
if( !rInOutRange.isEmpty())
{
@@ -173,7 +173,7 @@ class WrappedStatisticProperty : public WrappedSeriesOrDiagramProperty< PROPERTY
{
public:
explicit WrappedStatisticProperty( const OUString& rName, const Any& rDefaulValue
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
+ , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< PROPERTYTYPE >(rName,rDefaulValue,spChart2ModelContact,ePropertyType)
{}
@@ -208,7 +208,7 @@ public:
virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const SAL_OVERRIDE;
- explicit WrappedConstantErrorLowProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedConstantErrorLowProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedConstantErrorLowProperty();
@@ -217,7 +217,7 @@ private:
};
WrappedConstantErrorLowProperty::WrappedConstantErrorLowProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "ConstantErrorLow"
, uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType )
@@ -262,7 +262,7 @@ public:
virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const SAL_OVERRIDE;
- explicit WrappedConstantErrorHighProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedConstantErrorHighProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedConstantErrorHighProperty();
@@ -271,7 +271,7 @@ private:
};
WrappedConstantErrorHighProperty::WrappedConstantErrorHighProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "ConstantErrorHigh"
, uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType )
@@ -316,13 +316,13 @@ public:
virtual sal_Bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Bool& aNewValue ) const SAL_OVERRIDE;
- explicit WrappedMeanValueProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedMeanValueProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedMeanValueProperty();
};
WrappedMeanValueProperty::WrappedMeanValueProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< sal_Bool >( "MeanValue", uno::makeAny( sal_False ), spChart2ModelContact, ePropertyType )
{
@@ -360,13 +360,13 @@ public:
virtual ::com::sun::star::chart::ChartErrorCategory getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartErrorCategory& aNewValue ) const SAL_OVERRIDE;
- explicit WrappedErrorCategoryProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedErrorCategoryProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedErrorCategoryProperty();
};
WrappedErrorCategoryProperty::WrappedErrorCategoryProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorCategory >( "ErrorCategory"
, uno::makeAny( ::com::sun::star::chart::ChartErrorCategory_NONE ), spChart2ModelContact, ePropertyType )
@@ -458,7 +458,7 @@ public:
virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const SAL_OVERRIDE;
- explicit WrappedPercentageErrorProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedPercentageErrorProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedPercentageErrorProperty();
@@ -467,7 +467,7 @@ private:
};
WrappedPercentageErrorProperty::WrappedPercentageErrorProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "PercentageError"
, uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType )
@@ -512,7 +512,7 @@ public:
virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const SAL_OVERRIDE;
- explicit WrappedErrorMarginProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedErrorMarginProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedErrorMarginProperty();
@@ -521,7 +521,7 @@ private:
};
WrappedErrorMarginProperty::WrappedErrorMarginProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "ErrorMargin"
, uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType )
@@ -566,13 +566,13 @@ public:
virtual ::com::sun::star::chart::ChartErrorIndicatorType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartErrorIndicatorType& aNewValue ) const SAL_OVERRIDE;
- explicit WrappedErrorIndicatorProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedErrorIndicatorProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedErrorIndicatorProperty();
};
WrappedErrorIndicatorProperty::WrappedErrorIndicatorProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorIndicatorType >( "ErrorIndicator"
, uno::makeAny( ::com::sun::star::chart::ChartErrorIndicatorType_NONE ), spChart2ModelContact, ePropertyType )
@@ -639,13 +639,13 @@ public:
virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& nNewValue ) const SAL_OVERRIDE;
- explicit WrappedErrorBarStyleProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact1,
+ explicit WrappedErrorBarStyleProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact1,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedErrorBarStyleProperty();
};
WrappedErrorBarStyleProperty::WrappedErrorBarStyleProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< sal_Int32 >( "ErrorBarStyle"
, uno::makeAny( ::com::sun::star::chart::ErrorBarStyle::NONE ), spChart2ModelContact, ePropertyType )
@@ -685,7 +685,7 @@ public:
virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewValue ) const SAL_OVERRIDE;
- explicit WrappedErrorBarRangePositiveProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedErrorBarRangePositiveProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedErrorBarRangePositiveProperty();
@@ -694,7 +694,7 @@ private:
};
WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< OUString >( "ErrorBarRangePositive"
, uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType )
@@ -752,7 +752,7 @@ public:
virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewValue ) const SAL_OVERRIDE;
- explicit WrappedErrorBarRangeNegativeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedErrorBarRangeNegativeProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedErrorBarRangeNegativeProperty();
@@ -761,7 +761,7 @@ private:
};
WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< OUString >( "ErrorBarRangeNegative"
, uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType )
@@ -819,13 +819,13 @@ public:
virtual ::com::sun::star::chart::ChartRegressionCurveType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartRegressionCurveType & aNewValue ) const SAL_OVERRIDE;
- explicit WrappedRegressionCurvesProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedRegressionCurvesProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedRegressionCurvesProperty();
};
WrappedRegressionCurvesProperty::WrappedRegressionCurvesProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< ::com::sun::star::chart::ChartRegressionCurveType >( "RegressionCurves"
, lcl_getRegressionDefault(), spChart2ModelContact, ePropertyType )
@@ -883,7 +883,7 @@ public:
};
explicit WrappedStatisticPropertySetProperty(
- PropertySetType ePropertySetType, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ PropertySetType ePropertySetType, ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedStatisticPropertySetProperty();
@@ -893,7 +893,7 @@ private:
WrappedStatisticPropertySetProperty::WrappedStatisticPropertySetProperty(
PropertySetType ePropertySetType
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
+ , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< Reference< beans::XPropertySet > >(
(ePropertySetType == PROPERTY_SET_TYPE_REGRESSION)
@@ -965,7 +965,7 @@ enum
series
*/
void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
+ , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
{
rList.push_back( new WrappedConstantErrorLowProperty( spChart2ModelContact, ePropertyType ) );
@@ -1082,13 +1082,13 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut
}
void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
lcl_addWrappedProperties( rList, spChart2ModelContact, DATA_SERIES );
}
void WrappedStatisticProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM );
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
index 121e7aa05de1..be99b2ce5ba6 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
@@ -22,7 +22,7 @@
#include "WrappedProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace chart
@@ -35,9 +35,9 @@ class WrappedStatisticProperties
public:
static void addProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
};
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 703b2d7b8ad3..d5787ec7b9f1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -42,7 +42,7 @@ class WrappedStockProperty : public WrappedProperty
public:
explicit WrappedStockProperty( const OUString& rOuterName
, const ::com::sun::star::uno::Any& rDefaulValue
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedStockProperty();
void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -54,14 +54,14 @@ public:
virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0;
protected:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable ::com::sun::star::uno::Any m_aOuterValue;
::com::sun::star::uno::Any m_aDefaultValue;
};
WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName
, const ::com::sun::star::uno::Any& rDefaulValue
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty(rOuterName,OUString())
, m_spChart2ModelContact(spChart2ModelContact)
, m_aOuterValue()
@@ -118,7 +118,7 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& r
class WrappedVolumeProperty : public WrappedStockProperty
{
public:
- explicit WrappedVolumeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedVolumeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedVolumeProperty();
::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -127,7 +127,7 @@ public:
uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const SAL_OVERRIDE;
};
-WrappedVolumeProperty::WrappedVolumeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedVolumeProperty::WrappedVolumeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedStockProperty( "Volume", uno::makeAny(sal_False) , spChart2ModelContact )
{
}
@@ -189,7 +189,7 @@ uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTempla
class WrappedUpDownProperty : public WrappedStockProperty
{
public:
- explicit WrappedUpDownProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ explicit WrappedUpDownProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedUpDownProperty();
::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -197,7 +197,7 @@ public:
uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const SAL_OVERRIDE;
};
-WrappedUpDownProperty::WrappedUpDownProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+WrappedUpDownProperty::WrappedUpDownProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedStockProperty( "UpDown", uno::makeAny(sal_False) , spChart2ModelContact )
{
}
@@ -280,7 +280,7 @@ void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProp
}
void WrappedStockProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
rList.push_back( new WrappedVolumeProperty( spChart2ModelContact ) );
rList.push_back( new WrappedUpDownProperty( spChart2ModelContact ) );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
index d7c2e7d5c2a2..775f6189976e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
@@ -22,7 +22,7 @@
#include "WrappedProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace chart
@@ -35,7 +35,7 @@ class WrappedStockProperties
public:
static void addProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
static void addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
};
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 83d134d446c4..0df43ed6c9e3 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -70,7 +70,7 @@ public:
virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
throw (beans::UnknownPropertyException, uno::RuntimeException) SAL_OVERRIDE;
- explicit WrappedSymbolTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedSymbolTypeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedSymbolTypeProperty();
};
@@ -81,7 +81,7 @@ public:
virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewGraphicURL ) const SAL_OVERRIDE;
- explicit WrappedSymbolBitmapURLProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedSymbolBitmapURLProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedSymbolBitmapURLProperty();
};
@@ -94,7 +94,7 @@ public:
virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
throw (beans::UnknownPropertyException, uno::RuntimeException) SAL_OVERRIDE;
- explicit WrappedSymbolSizeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedSymbolSizeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedSymbolSizeProperty();
};
@@ -107,7 +107,7 @@ public:
virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
throw (beans::UnknownPropertyException, uno::RuntimeException) SAL_OVERRIDE;
- explicit WrappedSymbolAndLinesProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedSymbolAndLinesProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
virtual ~WrappedSymbolAndLinesProperty();
};
@@ -169,7 +169,7 @@ void lcl_setSymbolTypeToSymbol( sal_Int32 nSymbolType, chart2::Symbol& rSymbol )
}
void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
{
rList.push_back( new WrappedSymbolTypeProperty( spChart2ModelContact, ePropertyType ) );
@@ -212,19 +212,19 @@ void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutPro
}
void WrappedSymbolProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
lcl_addWrappedProperties( rList, spChart2ModelContact, DATA_SERIES );
}
void WrappedSymbolProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM );
}
WrappedSymbolTypeProperty::WrappedSymbolTypeProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< sal_Int32 >( "SymbolType"
, uno::makeAny( ::com::sun::star::chart::ChartSymbolType::NONE )
@@ -310,7 +310,7 @@ beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Referenc
}
WrappedSymbolBitmapURLProperty::WrappedSymbolBitmapURLProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< OUString >( "SymbolBitmapURL"
, uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType )
@@ -438,7 +438,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol )
}//end anonymous namespace
WrappedSymbolSizeProperty::WrappedSymbolSizeProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< awt::Size >( "SymbolSize"
, uno::makeAny( awt::Size(250,250) ), spChart2ModelContact, ePropertyType )
@@ -500,7 +500,7 @@ beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Referenc
}
WrappedSymbolAndLinesProperty::WrappedSymbolAndLinesProperty(
- ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< sal_Bool >( "Lines"
, uno::makeAny( sal_True ), spChart2ModelContact, ePropertyType )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
index ab21038601da..181c67d2d59f 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
@@ -22,7 +22,7 @@
#include "WrappedProperty.hxx"
#include "Chart2ModelContact.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace chart
@@ -35,9 +35,9 @@ class WrappedSymbolProperties
public:
static void addProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact );
};
} //namespace wrapper
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 1c9d0ad4ac6f..f7eaf5ded901 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -401,9 +401,9 @@ Image SeriesHeader::GetChartTypeImage(
return aResult;
}
-struct applyChangesFunctor : public ::std::unary_function< ::boost::shared_ptr< SeriesHeader >, void >
+struct applyChangesFunctor : public ::std::unary_function< std::shared_ptr< SeriesHeader >, void >
{
- void operator() ( ::boost::shared_ptr< SeriesHeader > spHeader )
+ void operator() ( std::shared_ptr< SeriesHeader > spHeader )
{
spHeader->applyChanges();
}
@@ -420,7 +420,7 @@ namespace
with focus is set at pIndex if pOutIndex is not 0.
*/
bool lcl_SeriesHeaderHasFocus(
- const ::std::vector< ::boost::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader,
+ const ::std::vector< std::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader,
sal_Int32 * pOutIndex = 0 )
{
sal_Int32 nIndex = 0;
@@ -437,7 +437,7 @@ bool lcl_SeriesHeaderHasFocus(
}
sal_Int32 lcl_getColumnInDataOrHeader(
- sal_uInt16 nCol, const ::std::vector< ::boost::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader )
+ sal_uInt16 nCol, const ::std::vector< std::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader )
{
sal_Int32 nColIdx = 0;
bool bHeaderHasFocus( lcl_SeriesHeaderHasFocus( rSeriesHeader, &nColIdx ));
@@ -597,7 +597,7 @@ void DataBrowser::RenewTable()
for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
aIt != aHeaders.end(); ++aIt )
{
- ::boost::shared_ptr< impl::SeriesHeader > spHeader( new impl::SeriesHeader( pWin, pColorWin ));
+ std::shared_ptr< impl::SeriesHeader > spHeader( new impl::SeriesHeader( pWin, pColorWin ));
Reference< beans::XPropertySet > xSeriesProp( aIt->m_xDataSeries, uno::UNO_QUERY );
sal_Int32 nColor = 0;
// @todo: Set "DraftColor", i.e. interpolated colors for gradients, bitmaps, etc.
@@ -1231,7 +1231,7 @@ void DataBrowser::RenewSeriesHeaders()
for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
aIt != aHeaders.end(); ++aIt )
{
- ::boost::shared_ptr< impl::SeriesHeader > spHeader( new impl::SeriesHeader( pWin, pColorWin ));
+ std::shared_ptr< impl::SeriesHeader > spHeader( new impl::SeriesHeader( pWin, pColorWin ));
Reference< beans::XPropertySet > xSeriesProp( aIt->m_xDataSeries, uno::UNO_QUERY );
sal_Int32 nColor = 0;
if( xSeriesProp.is() &&
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 514b6973523b..ad0081612fbd 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -25,9 +25,8 @@
#include <svtools/fmtfield.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
namespace com { namespace sun { namespace star {
namespace chart2 {
@@ -149,12 +148,12 @@ public:
private:
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > m_xChartDoc;
- boost::scoped_ptr< DataBrowserModel > m_apDataBrowserModel;
+ std::unique_ptr< DataBrowserModel > m_apDataBrowserModel;
- typedef ::std::vector< ::boost::shared_ptr< impl::SeriesHeader > > tSeriesHeaderContainer;
+ typedef ::std::vector< std::shared_ptr< impl::SeriesHeader > > tSeriesHeaderContainer;
tSeriesHeaderContainer m_aSeriesHeaders;
- ::boost::shared_ptr< NumberFormatterWrapper > m_spNumberFormatterWrapper;
+ std::shared_ptr< NumberFormatterWrapper > m_spNumberFormatterWrapper;
/// the row that is currently painted
long m_nSeekRow;
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index ce1b5e14f98d..d17adf37e285 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -22,10 +22,9 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <memory>
#include <vector>
-#include <boost/scoped_ptr.hpp>
-
namespace com { namespace sun { namespace star { namespace chart2 {
class XDataSeries;
class XChartType;
@@ -158,7 +157,7 @@ private:
::com::sun::star::chart2::XChartDocument > m_xChartDocument;
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > m_xContext;
- boost::scoped_ptr< DialogModel > m_apDialogModel;
+ std::unique_ptr< DialogModel > m_apDialogModel;
struct tDataColumn;
struct implColumnLess;
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 2a2d799fac22..4f356b9841c1 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -396,7 +396,7 @@ void DialogModel::setTemplate(
m_xTemplate = xTemplate;
}
-::boost::shared_ptr< RangeSelectionHelper >
+::std::shared_ptr< RangeSelectionHelper >
DialogModel::getRangeSelectionHelper() const
{
if( ! m_spRangeSelectionHelper.get())
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index 9baa8038b46c..773d257ff5e5 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -26,9 +26,9 @@
#include "ChartModel.hxx"
-#include <vector>
#include <map>
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <vector>
namespace com { namespace sun { namespace star { namespace chart2 {
class XDataSeriesContainer;
@@ -81,7 +81,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartTypeTemplate > & xTemplate );
- ::boost::shared_ptr< RangeSelectionHelper >
+ std::shared_ptr< RangeSelectionHelper >
getRangeSelectionHelper() const;
::com::sun::star::uno::Reference<
@@ -177,7 +177,7 @@ private:
::com::sun::star::uno::XComponentContext >
m_xContext;
- mutable ::boost::shared_ptr< RangeSelectionHelper >
+ mutable std::shared_ptr< RangeSelectionHelper >
m_spRangeSelectionHelper;
TimerTriggeredControllerLock m_aTimerTriggeredControllerLock;
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index 949e57924179..af603275c699 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -28,7 +28,7 @@
#include <vcl/fixed.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "res_LegendPosition.hxx"
#include "res_Titles.hxx"
@@ -57,8 +57,8 @@ protected:
DECL_LINK_TYPED( ChangeCheckBoxHdl, CheckBox&, void );
protected:
- boost::scoped_ptr< TitleResources > m_xTitleResources;
- boost::scoped_ptr< LegendPositionResources > m_xLegendPositionResources;
+ std::unique_ptr< TitleResources > m_xTitleResources;
+ std::unique_ptr< LegendPositionResources > m_xLegendPositionResources;
VclPtr<CheckBox> m_pCB_Grid_X;
VclPtr<CheckBox> m_pCB_Grid_Y;
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index 8034aa769a9b..eae2f7105c55 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -36,9 +36,9 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <unotools/accessiblestatesethelper.hxx>
-#include <vector>
#include <map>
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <vector>
#include "MutexContainer.hxx"
@@ -70,7 +70,7 @@ struct AccessibleElementInfo
::com::sun::star::uno::WeakReference<
::com::sun::star::awt::XWindow > m_xWindow;
- ::boost::shared_ptr< ObjectHierarchy > m_spObjectHierarchy;
+ std::shared_ptr< ObjectHierarchy > m_spObjectHierarchy;
AccessibleBase * m_pParent;
SdrView* m_pSdrView;
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index 049347f3297b..940c6092d853 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <com/sun/star/awt/XWindow.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace accessibility
{
@@ -128,7 +128,7 @@ private: // members
::com::sun::star::uno::WeakReference<
::com::sun::star::accessibility::XAccessible > m_xParent;
- ::boost::shared_ptr< ObjectHierarchy > m_spObjectHierarchy;
+ std::shared_ptr< ObjectHierarchy > m_spObjectHierarchy;
AccessibleUniqueId m_aCurrentSelectionOID;
SdrView* m_pSdrView;
::accessibility::IAccessibleViewForwarder* m_pViewForwarder;
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index cca42182e702..826deee540cd 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -52,7 +52,6 @@
#include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp>
#include <memory>
-#include <boost/shared_ptr.hpp>
#include <set>
class SdrModel;
@@ -514,7 +513,7 @@ private:
VclPtr<ChartWindow> m_pChartWindow;
css::uno::Reference<css::awt::XWindow> m_xViewWindow;
css::uno::Reference<css::uno::XInterface> m_xChartView;
- ::boost::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper;
+ std::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper;
DrawViewWrapper* m_pDrawViewWrapper;
Selection m_aSelection;
@@ -527,15 +526,15 @@ private:
bool m_bConnectingToView;
::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager;
- ::std::unique_ptr< UndoGuard > m_pTextActionUndoGuard;
+ std::unique_ptr< UndoGuard > m_pTextActionUndoGuard;
/// needed for dispatching URLs in FeatureStateEvents
mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer;
- ::std::unique_ptr< ::svt::AcceleratorExecute > m_apAccelExecute;
+ std::unique_ptr< ::svt::AcceleratorExecute > m_apAccelExecute;
CommandDispatchContainer m_aDispatchContainer;
- ::std::unique_ptr< DropTargetHelper > m_apDropTargetHelper;
+ std::unique_ptr< DropTargetHelper > m_apDropTargetHelper;
::com::sun::star::uno::Reference<
::com::sun::star::frame::XLayoutManagerEventBroadcaster > m_xLayoutManagerEventBroadcaster;
@@ -654,7 +653,7 @@ private:
const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY );
bool impl_DragDataPoint( const OUString & rCID, double fOffset );
- static ::std::set< OUString > impl_getAvailableCommands();
+ static std::set< OUString > impl_getAvailableCommands();
/** Creates a helper accesibility class that must be initialized via XInitialization. For
parameters see
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index 60467da74edc..691171b5ace2 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -33,7 +33,7 @@
#include <unotools/eventlisteneradapter.hxx>
#include <comphelper/uno3.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -203,7 +203,7 @@ private: //methods
void impl_resetAddIn();
private: //member
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator;
diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
index a9ad61ade11f..c7ef55effe87 100644
--- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx
+++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
@@ -27,8 +27,8 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
class SdrModel;
@@ -64,7 +64,7 @@ protected:
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
private:
- ::boost::shared_ptr< ItemConverter > m_spGraphicConverter;
+ std::shared_ptr< ItemConverter > m_spGraphicConverter;
::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > m_xModel;
};
diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
index 4abfa57f4efb..f851eec4db7f 100644
--- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
@@ -24,8 +24,8 @@
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
class SdrModel;
@@ -61,7 +61,7 @@ protected:
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
private:
- ::boost::shared_ptr< ItemConverter > m_spGraphicConverter;
+ std::shared_ptr< ItemConverter > m_spGraphicConverter;
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XRegressionCurveContainer > m_xCurveContainer;
};
diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
index c3250375791d..2eeebf0fa707 100644
--- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
+++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
@@ -23,7 +23,7 @@
#include <vcl/timer.hxx>
#include <com/sun/star/frame/XModel.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -40,7 +40,7 @@ public:
private:
::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > m_xModel;
- boost::scoped_ptr< ControllerLockGuardUNO > m_apControllerLockGuard;
+ std::unique_ptr< ControllerLockGuardUNO > m_apControllerLockGuard;
AutoTimer m_aTimer;
DECL_LINK_TYPED( TimerTimeout, Timer*, void );
diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx
index 22e156a10154..cc17758c3215 100644
--- a/chart2/source/controller/inc/TitleDialogData.hxx
+++ b/chart2/source/controller/inc/TitleDialogData.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -36,7 +36,7 @@ struct TitleDialogData
::com::sun::star::uno::Sequence< sal_Bool > aPossibilityList;
::com::sun::star::uno::Sequence< sal_Bool > aExistenceList;
::com::sun::star::uno::Sequence< OUString > aTextList;
- boost::scoped_ptr< ReferenceSizeProvider > apReferenceSizeProvider;
+ std::unique_ptr< ReferenceSizeProvider > apReferenceSizeProvider;
TitleDialogData(ReferenceSizeProvider* pReferenzeSizeProvider = NULL);
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index 18fd8de97e22..0c383f5a1a10 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -74,7 +74,7 @@ private:
bool m_bIsClosable;
sal_Int32 m_nOnePageOnlyIndex;//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap
ChartTypeTemplateProvider* m_pTemplateProvider;
- boost::scoped_ptr<DialogModel> m_pDialogModel;
+ std::unique_ptr<DialogModel> m_pDialogModel;
WizardState m_nFirstState;
WizardState m_nLastState;
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index ac8d322fb049..eb49d9238edd 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATAEDITOR_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATAEDITOR_HXX
-#include <boost/scoped_ptr.hpp>
#include <svl/lstner.hxx>
#include <svtools/stdctrl.hxx>
#include <vcl/toolbox.hxx>
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index fd269c525d13..4d0d4b173d37 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -22,7 +22,7 @@
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <svl/itemset.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "../dialogs/res_DataLabel.hxx"
class SvNumberFormatter;
@@ -36,7 +36,7 @@ private:
// OKButton m_aBtnOK;
// CancelButton m_aBtnCancel;
// HelpButton m_aBtnHelp;
- boost::scoped_ptr < DataLabelResources > m_apDataLabelResources;
+ std::unique_ptr < DataLabelResources > m_apDataLabelResources;
const SfxItemSet& m_rInAttrs;
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index ae45a16941f5..7721c8d7bcc3 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -52,7 +52,7 @@ public:
private:
const SfxItemSet & rInAttrs;
- boost::scoped_ptr< ErrorBarResources > m_apErrorBarResources;
+ std::unique_ptr< ErrorBarResources > m_apErrorBarResources;
};
} //namespace chart
diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx
index acfc45344e68..ab5a024410de 100644
--- a/chart2/source/controller/inc/dlg_InsertLegend.hxx
+++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx
@@ -22,7 +22,7 @@
#include <vcl/dialog.hxx>
#include <sfx2/basedlgs.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -34,7 +34,7 @@ namespace chart
class SchLegendDlg : public ModalDialog
{
private:
- boost::scoped_ptr < LegendPositionResources > m_xLegendPositionResources;
+ std::unique_ptr < LegendPositionResources > m_xLegendPositionResources;
public:
SchLegendDlg( vcl::Window* pParent, const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx
index 510b35563676..258fd220b9da 100644
--- a/chart2/source/controller/inc/dlg_InsertTitle.hxx
+++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx
@@ -22,14 +22,14 @@
#include "res_Titles.hxx"
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace chart
{
class SchTitleDlg : public ModalDialog
{
private:
- boost::scoped_ptr< TitleResources > m_xTitleResources;
+ std::unique_ptr< TitleResources > m_xTitleResources;
public:
SchTitleDlg( vcl::Window* pParent, const TitleDialogData& rInput );
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index efbfc8a11506..76a36f2e2175 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -117,7 +117,7 @@ private:
double m_fMinusValue;
VclPtr<Dialog> m_pParentDialog;
- boost::scoped_ptr< RangeSelectionHelper > m_apRangeSelectionHelper;
+ std::unique_ptr< RangeSelectionHelper > m_apRangeSelectionHelper;
VclPtr<Edit> m_pCurrentRangeChoosingField;
bool m_bHasInternalDataProvider;
bool m_bEnableDataTableDialog;
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 934e961fa204..af676b1823fe 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -32,8 +32,6 @@
#include "chartview/ExplicitValueProvider.hxx"
#include "DiagramHelper.hxx"
-#include <boost/scoped_ptr.hpp>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 8fe6db0bc39a..5fe25b433d8c 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -117,7 +117,7 @@ void ChartController::executeDispatch_InsertAxes()
InsertAxisOrGridDialogData aDialogOutput;
aDlg->getResult( aDialogOutput );
- boost::scoped_ptr< ReferenceSizeProvider > mpRefSizeProvider(
+ std::unique_ptr< ReferenceSizeProvider > mpRefSizeProvider(
impl_createReferenceSizeProvider());
bool bChanged = AxisHelper::changeVisibilityOfAxes( xDiagram
, aDialogInput.aExistenceList, aDialogOutput.aExistenceList, m_xCC
@@ -734,7 +734,7 @@ void ChartController::executeDispatch_InsertAxisTitle()
else
eTitleType = TitleHelper::Z_AXIS_TITLE;
- boost::scoped_ptr< ReferenceSizeProvider > apRefSizeProvider( impl_createReferenceSizeProvider());
+ std::unique_ptr< ReferenceSizeProvider > apRefSizeProvider( impl_createReferenceSizeProvider());
xTitle = TitleHelper::createTitle( eTitleType, ObjectNameProvider::getTitleNameByType(eTitleType), getModel(), m_xCC, apRefSizeProvider.get() );
aUndoGuard.commit();
}
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 298f2d65d0c1..dc33d0becc1d 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -40,7 +40,7 @@
#include <svx/dialogs.hrc>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -140,7 +140,7 @@ void ChartController::executeDispatch_PositionAndSize()
SolarMutexGuard aGuard;
SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE( pFact, "No dialog factory" );
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSchTransformTabDialog(
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSchTransformTabDialog(
m_pChartWindow, &aItemSet, pSdrView, RID_SCH_TransformTabDLG_SVXPAGE_ANGLE, bResizePossible ));
OSL_ENSURE( pDlg, "Couldn't create SchTransformTabDialog" );
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 4cc7a171d031..c1b2f16f5d65 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -54,7 +54,6 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
@@ -104,7 +103,7 @@ wrapper::ItemConverter* createItemConverter(
break;
case OBJECTTYPE_TITLE:
{
- boost::scoped_ptr<awt::Size> pRefSize;
+ std::unique_ptr<awt::Size> pRefSize;
if (pRefSizeProvider)
pRefSize.reset(new awt::Size(pRefSizeProvider->getPageSize()));
@@ -116,7 +115,7 @@ wrapper::ItemConverter* createItemConverter(
break;
case OBJECTTYPE_LEGEND:
{
- boost::scoped_ptr<awt::Size> pRefSize;
+ std::unique_ptr<awt::Size> pRefSize;
if (pRefSizeProvider)
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
@@ -139,7 +138,7 @@ wrapper::ItemConverter* createItemConverter(
break;
case OBJECTTYPE_AXIS:
{
- boost::scoped_ptr<awt::Size> pRefSize;
+ std::unique_ptr<awt::Size> pRefSize;
if (pRefSizeProvider)
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
@@ -170,7 +169,7 @@ wrapper::ItemConverter* createItemConverter(
case OBJECTTYPE_DATA_LABELS:
case OBJECTTYPE_DATA_LABEL:
{
- boost::scoped_ptr<awt::Size> pRefSize;
+ std::unique_ptr<awt::Size> pRefSize;
if (pRefSizeProvider)
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
@@ -199,7 +198,7 @@ wrapper::ItemConverter* createItemConverter(
case OBJECTTYPE_DATA_SERIES:
case OBJECTTYPE_DATA_POINT:
{
- boost::scoped_ptr<awt::Size> pRefSize;
+ std::unique_ptr<awt::Size> pRefSize;
if (pRefSizeProvider)
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
@@ -276,7 +275,7 @@ wrapper::ItemConverter* createItemConverter(
break;
case OBJECTTYPE_DATA_CURVE_EQUATION:
{
- boost::scoped_ptr<awt::Size> pRefSize;
+ std::unique_ptr<awt::Size> pRefSize;
if (pRefSizeProvider)
pRefSize.reset(new awt::Size(pRefSizeProvider->getPageSize()));
@@ -310,7 +309,7 @@ wrapper::ItemConverter* createItemConverter(
break;
case OBJECTTYPE_AXIS:
{
- boost::scoped_ptr<awt::Size> pRefSize;
+ std::unique_ptr<awt::Size> pRefSize;
if (pRefSizeProvider)
pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
@@ -737,9 +736,9 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard(
//convert properties to ItemSet
- boost::scoped_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider());
+ std::unique_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider());
- boost::scoped_ptr<wrapper::ItemConverter> pItemConverter(
+ std::unique_ptr<wrapper::ItemConverter> pItemConverter(
createItemConverter( rObjectCID, getModel(), m_xCC,
m_pDrawModelWrapper->getSdrModel(),
ExplicitValueProvider::getExplicitValueProvider(m_xChartView),
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 5fe2635fc021..cfa9f04db714 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -41,7 +41,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <svl/stritem.hxx>
#include <editeng/fontitem.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -169,7 +169,7 @@ void ChartController::executeDispatch_InsertSpecialCharacter()
vcl::Font aCurFont = m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont();
aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) );
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( m_pChartWindow, aSet, getFrame(), RID_SVXDLG_CHARMAP ));
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( m_pChartWindow, aSet, getFrame(), RID_SVXDLG_CHARMAP ));
OSL_ENSURE( pDlg, "Couldn't create SvxCharacterMap dialog" );
if( pDlg->Execute() == RET_OK )
{
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 839fd5d55282..2156dabb99f2 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -70,7 +70,7 @@
#include <svx/unoapi.hxx>
#include <svx/unopage.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -162,7 +162,7 @@ ReferenceSizeProvider* ChartController::impl_createReferenceSizeProvider()
void ChartController::impl_adaptDataSeriesAutoResize()
{
- boost::scoped_ptr<ReferenceSizeProvider> pRefSizeProvider(impl_createReferenceSizeProvider());
+ std::unique_ptr<ReferenceSizeProvider> pRefSizeProvider(impl_createReferenceSizeProvider());
if (pRefSizeProvider)
pRefSizeProvider->setValuesAtAllDataSeries();
}
@@ -238,7 +238,7 @@ void ChartController::executeDispatch_ScaleText()
m_xUndoManager );
ControllerLockGuardUNO aCtlLockGuard( getModel() );
- boost::scoped_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider());
+ std::unique_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider());
OSL_ASSERT( pRefSizeProv.get());
if (pRefSizeProv)
pRefSizeProv->toggleAutoResizeState();
@@ -267,7 +267,7 @@ void ChartController::executeDispatch_Paste()
{
xStm->Seek( 0 );
Reference< io::XInputStream > xInputStream( new utl::OInputStreamWrapper( *xStm ) );
- ::boost::scoped_ptr< SdrModel > spModel( new SdrModel() );
+ std::unique_ptr< SdrModel > spModel( new SdrModel() );
if ( SvxDrawingLayerImport( spModel.get(), xInputStream ) )
{
impl_PasteShapes( spModel.get() );
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index 6a6478186348..f2772775039b 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -27,8 +27,6 @@
#include <vcl/lstbox.hxx>
#include <cppuhelper/weakref.hxx>
-#include <boost/scoped_ptr.hpp>
-
namespace chart
{
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 77fff3fe3456..6897a29650f4 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -42,7 +42,7 @@
#include <svx/svxdlg.hxx>
#include <editeng/widwitem.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
@@ -267,7 +267,7 @@ void ShapeController::executeDispatch_FormatLine()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- boost::scoped_ptr< SfxAbstractTabDialog > pDlg(
+ std::unique_ptr< SfxAbstractTabDialog > pDlg(
pFact->CreateSvxLineTabDialog( pParent, &aAttr, &pDrawModelWrapper->getSdrModel(),
pSelectedObj, bHasMarked ) );
if ( pDlg->Execute() == RET_OK )
@@ -306,7 +306,7 @@ void ShapeController::executeDispatch_FormatArea()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- ::boost::scoped_ptr< AbstractSvxAreaTabDialog > pDlg(
+ std::unique_ptr< AbstractSvxAreaTabDialog > pDlg(
pFact->CreateSvxAreaTabDialog( pParent, &aAttr, &pDrawModelWrapper->getSdrModel(), true ) );
if ( pDlg.get() )
{
@@ -348,7 +348,7 @@ void ShapeController::executeDispatch_TextAttributes()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- ::boost::scoped_ptr< SfxAbstractTabDialog > pDlg(
+ std::unique_ptr< SfxAbstractTabDialog > pDlg(
pFact->CreateTextTabDialog( pParent, &aAttr, pDrawViewWrapper ) );
if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
{
@@ -387,7 +387,7 @@ void ShapeController::executeDispatch_TransformDialog()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- ::boost::scoped_ptr< SfxAbstractTabDialog > pDlg(
+ std::unique_ptr< SfxAbstractTabDialog > pDlg(
pFact->CreateCaptionDialog( pParent, pDrawViewWrapper ) );
if ( pDlg.get() )
{
@@ -411,7 +411,7 @@ void ShapeController::executeDispatch_TransformDialog()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- ::boost::scoped_ptr< SfxAbstractTabDialog > pDlg(
+ std::unique_ptr< SfxAbstractTabDialog > pDlg(
pFact->CreateSvxTransformTabDialog( pParent, &aGeoAttr, pDrawViewWrapper ) );
if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
{
@@ -440,7 +440,7 @@ void ShapeController::executeDispatch_ObjectTitleDescription()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- ::boost::scoped_ptr< AbstractSvxObjectTitleDescDialog > pDlg(
+ std::unique_ptr< AbstractSvxObjectTitleDescDialog > pDlg(
pFact->CreateSvxObjectTitleDescDialog( NULL, aTitle, aDescription ) );
if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
{
@@ -470,7 +470,7 @@ void ShapeController::executeDispatch_RenameObject()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- ::boost::scoped_ptr< AbstractSvxObjectNameDialog > pDlg(
+ std::unique_ptr< AbstractSvxObjectNameDialog > pDlg(
pFact->CreateSvxObjectNameDialog( NULL, aName ) );
pDlg->SetCheckNameHdl( LINK( this, ShapeController, CheckNameHdl ) );
if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx
index b09c070b0229..da1aad4d3847 100644
--- a/chart2/source/controller/main/UndoActions.cxx
+++ b/chart2/source/controller/main/UndoActions.cxx
@@ -31,8 +31,8 @@
#include <tools/diagnose_ex.h>
#include <svx/svdundo.hxx>
-#include <boost/shared_ptr.hpp>
#include <algorithm>
+#include <memory>
using namespace ::com::sun::star;
@@ -59,7 +59,7 @@ namespace impl
using ::com::sun::star::chart2::XChartDocument;
using ::com::sun::star::document::UndoFailedException;
-UndoElement::UndoElement( const OUString& i_actionString, const Reference< XModel >& i_documentModel, const ::boost::shared_ptr< ChartModelClone >& i_modelClone )
+UndoElement::UndoElement( const OUString& i_actionString, const Reference< XModel >& i_documentModel, const std::shared_ptr< ChartModelClone >& i_modelClone )
:UndoElement_MBase()
,UndoElement_TBase( m_aMutex )
,m_sActionString( i_actionString )
@@ -88,7 +88,7 @@ OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException, std::exceptio
void UndoElement::impl_toggleModelState()
{
// get a snapshot of the current state of our model
- ::boost::shared_ptr< ChartModelClone > pNewClone( new ChartModelClone( m_xDocumentModel, m_pModelClone->getFacet() ) );
+ std::shared_ptr< ChartModelClone > pNewClone( new ChartModelClone( m_xDocumentModel, m_pModelClone->getFacet() ) );
// apply the previous snapshot to our model
m_pModelClone->applyToModel( m_xDocumentModel );
// remember the new snapshot, for the next toggle
diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx
index 972ffe3ca0fd..e1e80c8a3f5e 100644
--- a/chart2/source/controller/main/UndoActions.hxx
+++ b/chart2/source/controller/main/UndoActions.hxx
@@ -30,11 +30,11 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <utility>
+#include <memory>
#include <deque>
+#include <utility>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
class SdrUndoAction;
@@ -65,7 +65,7 @@ public:
*/
UndoElement( const OUString & i_actionString,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_documentModel,
- const ::boost::shared_ptr< ChartModelClone >& i_modelClone
+ const std::shared_ptr< ChartModelClone >& i_modelClone
);
// XUndoAction
@@ -85,7 +85,7 @@ private:
private:
OUString m_sActionString;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocumentModel;
- ::boost::shared_ptr< ChartModelClone > m_pModelClone;
+ std::shared_ptr< ChartModelClone > m_pModelClone;
};
typedef ::cppu::BaseMutex ShapeUndoElement_MBase;
diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx
index cd57908f9528..0b41f9832a27 100644
--- a/chart2/source/controller/main/UndoGuard.hxx
+++ b/chart2/source/controller/main/UndoGuard.hxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -57,7 +57,7 @@ private:
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel;
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager;
- ::boost::shared_ptr< ChartModelClone > m_pDocumentSnapshot;
+ std::shared_ptr< ChartModelClone > m_pDocumentSnapshot;
OUString m_aUndoString;
bool m_bActionPosted;
};
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.hxx b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
index aa66339d975c..37a4997ad8df 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
@@ -24,7 +24,6 @@
#include <svx/sidebar/PanelLayout.hxx>
#include <svl/intitem.hxx>
#include <com/sun/star/ui/XUIElement.hpp>
-#include <boost/scoped_ptr.hpp>
#include <svx/sidebar/AreaPropertyPanelBase.hxx>
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.hxx b/chart2/source/controller/sidebar/ChartLinePanel.hxx
index 3c7e4749c1d3..da8edc1929e3 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.hxx
@@ -24,7 +24,6 @@
#include <svx/sidebar/PanelLayout.hxx>
#include <svl/intitem.hxx>
#include <com/sun/star/ui/XUIElement.hpp>
-#include <boost/scoped_ptr.hpp>
#include <svx/sidebar/LinePropertyPanelBase.hxx>
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 89458e6de618..92f79e4eb4cb 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -33,7 +33,7 @@
#include <osl/mutex.hxx>
#include "charttoolsdllapi.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace property
{
@@ -224,7 +224,7 @@ private:
::osl::Mutex & m_rMutex;
/// pImpl idiom implementation
- boost::scoped_ptr< impl::ImplOPropertySet > m_pImplProperties;
+ std::unique_ptr< impl::ImplOPropertySet > m_pImplProperties;
bool m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault;
};
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 6409e4368909..99fa5e76b162 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -28,8 +28,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include "chartviewdllapi.hxx"
-#include <boost/scoped_ptr.hpp>
-
namespace chart
{
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 934f22fcc481..3e10044f416e 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -21,7 +21,6 @@
#include "ExplicitScaleValues.hxx"
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/chart2/XAxis.hpp>
#include <com/sun/star/chart2/XCoordinateSystem.hpp>
#include <com/sun/star/chart2/XDataSeries.hpp>
@@ -31,9 +30,10 @@
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include "chartviewdllapi.hxx"
-
#include "ChartModel.hxx"
+#include <memory>
+
namespace chart
{
@@ -64,7 +64,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
getShapeForCID( const OUString& rObjectCID )=0;
- virtual ::boost::shared_ptr< DrawModelWrapper > getDrawModelWrapper() = 0;
+ virtual std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() = 0;
static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
static ExplicitValueProvider* getExplicitValueProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xChartView );
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index ce6d69c4ca39..c9e247b23571 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -626,7 +626,7 @@ void ChartModel::impl_loadGraphics(
if( xElementStream.is() )
{
- boost::scoped_ptr< SvStream > apIStm(
+ std::unique_ptr< SvStream > apIStm(
::utl::UcbStreamHelper::CreateStream(
xElementStream, true ) );
diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx
index f6d663dd7235..281648ecf4dd 100644
--- a/chart2/source/model/main/UndoManager.hxx
+++ b/chart2/source/model/main/UndoManager.hxx
@@ -26,7 +26,7 @@
#include <cppuhelper/implbase2.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -85,7 +85,7 @@ namespace chart
virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- ::boost::scoped_ptr< impl::UndoManager_Impl > m_pImpl;
+ std::unique_ptr< impl::UndoManager_Impl > m_pImpl;
};
} // namespace chart
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index f34cb4382932..55c26123df79 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -23,7 +23,7 @@
#include "Tickmarks.hxx"
#include "macros.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -153,7 +153,7 @@ void VAxisBase::setExplicitScaleAndIncrement(
void VAxisBase::createAllTickInfos( TickInfoArraysType& rAllTickInfos )
{
- boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+ std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() );
if( m_aScale.ShiftedCategoryPosition )
apTickFactory->getAllTicksShifted( rAllTickInfos );
else
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index ba2c452afacd..b7ddd0f1bce9 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -47,7 +47,7 @@
#include <basegfx/numeric/ftools.hxx>
#include <algorithm>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
@@ -1541,7 +1541,7 @@ void VCartesianAxis::doStaggeringOfLabels( const AxisLabelProperties& rAxisLabel
B2DVector aCummulatedLabelsDistance(0,0);
for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
{
- boost::scoped_ptr<TickIter> apTickIter(createLabelTickIterator(nTextLevel));
+ std::unique_ptr<TickIter> apTickIter(createLabelTickIterator(nTextLevel));
if (apTickIter)
{
double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
@@ -1579,7 +1579,7 @@ void VCartesianAxis::createLabels()
if (!m_aAxisProperties.m_bDisplayLabels)
return;
- boost::scoped_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1596,7 +1596,7 @@ void VCartesianAxis::createLabels()
sal_Int32 nScreenDistanceBetweenTicks = -1;
for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
{
- boost::scoped_ptr< TickIter > apTickIter(createLabelTickIterator( nTextLevel ));
+ std::unique_ptr< TickIter > apTickIter(createLabelTickIterator( nTextLevel ));
if(apTickIter)
{
if(nTextLevel==0)
@@ -1633,7 +1633,7 @@ void VCartesianAxis::createMaximumLabels()
if (!m_aAxisProperties.m_bDisplayLabels)
return;
- boost::scoped_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1653,7 +1653,7 @@ void VCartesianAxis::createMaximumLabels()
sal_Int32 nTextLevelCount = getTextLevelCount();
for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
{
- boost::scoped_ptr< TickIter > apTickIter(createMaximumLabelTickIterator( nTextLevel ));
+ std::unique_ptr< TickIter > apTickIter(createMaximumLabelTickIterator( nTextLevel ));
if(apTickIter)
{
while( !createTextShapes( m_xTextTarget, *apTickIter.get(), aAxisLabelProperties, pTickFactory2D, -1 ) )
@@ -1670,7 +1670,7 @@ void VCartesianAxis::updatePositions()
if (!m_aAxisProperties.m_bDisplayLabels)
return;
- boost::scoped_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1771,7 +1771,7 @@ void VCartesianAxis::createShapes()
if( !prepareShapeCreation() )
return;
- boost::scoped_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1793,7 +1793,7 @@ void VCartesianAxis::createShapes()
sal_Int32 nTextLevelCount = getTextLevelCount();
for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
{
- boost::scoped_ptr< TickIter > apTickIter(createLabelTickIterator( nTextLevel ));
+ std::unique_ptr< TickIter > apTickIter(createLabelTickIterator( nTextLevel ));
if( apTickIter )
{
double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 1f39e4fb21ca..3408d28674cd 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -152,7 +152,7 @@ void VCartesianCoordinateSystem::createVAxisList(
if(aAxisProperties.m_bDisplayLabels)
aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis(xAxis, xChartDoc);
- ::boost::shared_ptr< VAxisBase > apVAxis( new VCartesianAxis(aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
+ std::shared_ptr< VAxisBase > apVAxis( new VCartesianAxis(aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
m_aAxisMap[aFullAxisIndex] = apVAxis;
apVAxis->set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos );
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 2c46562d9843..63ba46e94f5b 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -28,8 +28,8 @@
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
+#include <memory>
#include <vector>
-#include <boost/scoped_ptr.hpp>
namespace chart
{
@@ -210,7 +210,7 @@ void VCartesianGrid::createShapes()
fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList );
//create all scaled tickmark values
- boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+ std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() );
TickFactory& aTickFactory = *apTickFactory.get();
TickInfoArraysType aAllTickInfos;
aTickFactory.getAllTicks( aAllTickInfos );
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 9d7ebf2994b9..3388f6d7518c 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -80,7 +80,7 @@ VCoordinateSystem::VCoordinateSystem( const Reference< XCoordinateSystem >& xCoo
, m_aMergedMinMaxSupplier()
, m_aExplicitScales(3)
, m_aExplicitIncrements(3)
- , m_apExplicitCategoriesProvider(NULL)
+ , m_apExplicitCategoriesProvider(nullptr)
{
if( !m_xCooSysModel.is() || m_xCooSysModel->getDimension()<3 )
{
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index d72086895dc2..47293c498638 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -27,7 +27,7 @@
#include "PolarLabelPositionHelper.hxx"
#include <tools/color.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -167,7 +167,7 @@ void VPolarAngleAxis::createLabels()
if( m_aAxisProperties.m_bDisplayLabels )
{
//get the transformed screen values for all tickmarks in aAllTickInfos
- boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+ std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() );
//create tick mark text shapes
//@todo: iterate through all tick depth which should be labeled
diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx
index 1e342b08d82f..73634058c38a 100644
--- a/chart2/source/view/axes/VPolarAxis.cxx
+++ b/chart2/source/view/axes/VPolarAxis.cxx
@@ -24,8 +24,6 @@
#include "Tickmarks.hxx"
#include "ShapeFactory.hxx"
-#include <boost/scoped_ptr.hpp>
-
namespace chart
{
using namespace ::com::sun::star;
diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index 6e34ab242aa3..f0e20c47d898 100644
--- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -90,7 +90,7 @@ void VPolarCoordinateSystem::createVAxisList(
if(aAxisProperties.m_bDisplayLabels)
aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis(xAxis, xChartDoc);
- ::boost::shared_ptr< VAxisBase > apVAxis( VPolarAxis::createAxis( aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
+ std::shared_ptr< VAxisBase > apVAxis( VPolarAxis::createAxis( aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
m_aAxisMap[aFullAxisIndex] = apVAxis;
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx
index 81aec8928a04..d02d06fcad6f 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.hxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_CHART2_SOURCE_VIEW_AXES_VPOLARRADIUSAXIS_HXX
#include "VPolarAxis.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace chart
{
@@ -73,7 +73,7 @@ protected: //methods
virtual bool prepareShapeCreation() SAL_OVERRIDE;
private: //member
- boost::scoped_ptr<VCartesianAxis> m_apAxisWithLabels;
+ std::unique_ptr<VCartesianAxis> m_apAxisWithLabels;
};
} //namespace chart
diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx
index 943a10917ff7..520ec9a4163b 100644
--- a/chart2/source/view/charttypes/NetChart.hxx
+++ b/chart2/source/view/charttypes/NetChart.hxx
@@ -64,7 +64,7 @@ private: //methods
, PlottingPositionHelper* pPosHelper );
private: //member
- boost::scoped_ptr<PlottingPositionHelper> m_pMainPosHelper;
+ std::unique_ptr<PlottingPositionHelper> m_pMainPosHelper;
bool m_bArea;//false -> line or symbol only
bool m_bLine;
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 73f103007dd2..dc9b5b23daf7 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/container/XChild.hpp>
#include <rtl/math.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
@@ -652,7 +652,7 @@ void PieChart::createShapes()
aParam.mfUnitCircleOuterRadius = m_pPosHelper->transformToRadius( fLogicOuterRadius );
///point color:
- boost::scoped_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(NULL);
+ std::unique_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(nullptr);
if (!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is())
{
apOverwritePropertiesMap.reset( new tPropertyNameValueMap() );
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx
index f4ae57360611..b608aa330966 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -122,13 +122,13 @@ private:
css::uno::Reference<css::chart2::XChartType> mxChartType;
boost::ptr_vector<opengl3D::Renderable3DObject> maShapes;
- boost::scoped_ptr<opengl3D::OpenGL3DRenderer> mpRenderer;
+ std::unique_ptr<opengl3D::OpenGL3DRenderer> mpRenderer;
VclPtr<OpenGLWindow> mpWindow;
opengl3D::Camera* mpCamera;
bool mbValidContext;
- boost::scoped_ptr<opengl3D::TextCache> mpTextCache;
+ std::unique_ptr<opengl3D::TextCache> mpTextCache;
glm::vec3 maCameraPosition;
glm::vec3 maCameraDirection;
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index ea64683a7e28..8fdefd8541f3 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -33,9 +33,8 @@
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <map>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
namespace chart
{
@@ -195,7 +194,7 @@ protected: //member
::com::sun::star::uno::Sequence< OUString > m_aSeriesNamesForZAxis;
- typedef std::map< tFullAxisIndex, ::boost::shared_ptr< VAxisBase > > tVAxisMap;
+ typedef std::map< tFullAxisIndex, std::shared_ptr< VAxisBase > > tVAxisMap;
tVAxisMap m_aAxisMap;
@@ -209,7 +208,7 @@ private:
tFullExplicitScaleMap m_aSecondaryExplicitScales;
tFullExplicitIncrementMap m_aSecondaryExplicitIncrements;
- boost::scoped_ptr< ExplicitCategoriesProvider > m_apExplicitCategoriesProvider;
+ std::unique_ptr< ExplicitCategoriesProvider > m_apExplicitCategoriesProvider;
};
} //namespace chart
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index 1cc5ee46fa87..61ebfac60c76 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -33,9 +33,9 @@
#include <com/sun/star/drawing/XShapes.hpp>
#include <cppuhelper/weakref.hxx>
+#include <memory>
#include <vector>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_map.hpp>
namespace chart
@@ -231,18 +231,18 @@ private: //member
sal_Int32 m_nGlobalSeriesIndex;
//some cached values for data labels as they are very expensive
- mutable boost::scoped_ptr<css::chart2::DataPointLabel>
+ mutable std::unique_ptr<css::chart2::DataPointLabel>
m_apLabel_Series;
- mutable boost::scoped_ptr<tNameSequence> m_apLabelPropNames_Series;
- mutable boost::scoped_ptr<tAnySequence> m_apLabelPropValues_Series;
- mutable boost::scoped_ptr<css::chart2::Symbol> m_apSymbolProperties_Series;
+ mutable std::unique_ptr<tNameSequence> m_apLabelPropNames_Series;
+ mutable std::unique_ptr<tAnySequence> m_apLabelPropValues_Series;
+ mutable std::unique_ptr<css::chart2::Symbol> m_apSymbolProperties_Series;
- mutable boost::scoped_ptr<css::chart2::DataPointLabel>
+ mutable std::unique_ptr<css::chart2::DataPointLabel>
m_apLabel_AttributedPoint;
- mutable boost::scoped_ptr<tNameSequence> m_apLabelPropNames_AttributedPoint;
- mutable boost::scoped_ptr<tAnySequence> m_apLabelPropValues_AttributedPoint;
- mutable boost::scoped_ptr<css::chart2::Symbol> m_apSymbolProperties_AttributedPoint;
- mutable boost::scoped_ptr<css::chart2::Symbol>
+ mutable std::unique_ptr<tNameSequence> m_apLabelPropNames_AttributedPoint;
+ mutable std::unique_ptr<tAnySequence> m_apLabelPropValues_AttributedPoint;
+ mutable std::unique_ptr<css::chart2::Symbol> m_apSymbolProperties_AttributedPoint;
+ mutable std::unique_ptr<css::chart2::Symbol>
m_apSymbolProperties_InvisibleSymbolForSelection;
mutable sal_Int32 m_nCurrentAttributedPoint;
css::awt::Size m_aReferenceSize;
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 96f0e76b6464..2edc39092275 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -433,7 +433,7 @@ protected:
long m_nTimeResolution;
Date m_aNullDate;
- boost::scoped_ptr< NumberFormatterWrapper > m_apNumberFormatterWrapper;
+ std::unique_ptr< NumberFormatterWrapper > m_apNumberFormatterWrapper;
AxesNumberFormats m_aAxesNumberFormats;//direct numberformats on axes, if empty ask the data series instead
::com::sun::star::uno::Reference<
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 2877ba560ade..0c386af114f3 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -116,7 +116,7 @@
#include <osl/conditn.hxx>
#include <osl/time.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/ptr_container/ptr_vector.hpp>
namespace chart {
@@ -1042,14 +1042,14 @@ struct CreateShapeParam2D
{
css::awt::Rectangle maRemainingSpace;
- boost::shared_ptr<SeriesPlotterContainer> mpSeriesPlotterContainer;
+ std::shared_ptr<SeriesPlotterContainer> mpSeriesPlotterContainer;
- boost::shared_ptr<VTitle> mpVTitleX;
- boost::shared_ptr<VTitle> mpVTitleY;
- boost::shared_ptr<VTitle> mpVTitleZ;
+ std::shared_ptr<VTitle> mpVTitleX;
+ std::shared_ptr<VTitle> mpVTitleY;
+ std::shared_ptr<VTitle> mpVTitleZ;
- boost::shared_ptr<VTitle> mpVTitleSecondX;
- boost::shared_ptr<VTitle> mpVTitleSecondY;
+ std::shared_ptr<VTitle> mpVTitleSecondX;
+ std::shared_ptr<VTitle> mpVTitleSecondY;
css::uno::Reference<css::drawing::XShape> mxMarkHandles;
css::uno::Reference<css::drawing::XShape> mxPlotAreaWithAxes;
@@ -1209,7 +1209,7 @@ void ChartView::init()
if( !m_pDrawModelWrapper.get() )
{
SolarMutexGuard aSolarGuard;
- m_pDrawModelWrapper = ::boost::shared_ptr< DrawModelWrapper >( new DrawModelWrapper( m_xCC ) );
+ m_pDrawModelWrapper = std::shared_ptr< DrawModelWrapper >( new DrawModelWrapper( m_xCC ) );
m_xShapeFactory = m_pDrawModelWrapper->getShapeFactory();
m_xDrawPage = m_pDrawModelWrapper->getMainDrawPage();
StartListening( m_pDrawModelWrapper->getSdrModel() );
@@ -1443,7 +1443,7 @@ bool lcl_IsPieOrDonut( const uno::Reference< XDiagram >& xDiagram )
return DiagramHelper::isPieOrDonutChart( xDiagram );
}
-void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawModelWrapper, ChartModel& rModel)
+void lcl_setDefaultWritingMode( std::shared_ptr< DrawModelWrapper > pDrawModelWrapper, ChartModel& rModel)
{
//get writing mode from parent document:
if( SvtLanguageOptions().IsCTLFontEnabled() )
@@ -1568,7 +1568,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod
}
}
-sal_Int16 lcl_getDefaultWritingModeFromPool( const boost::shared_ptr<DrawModelWrapper>& pDrawModelWrapper )
+sal_Int16 lcl_getDefaultWritingModeFromPool( const std::shared_ptr<DrawModelWrapper>& pDrawModelWrapper )
{
sal_Int16 nWritingMode = text::WritingMode2::LR_TB;
if(!pDrawModelWrapper)
@@ -1998,7 +1998,7 @@ awt::Rectangle ChartView::getRectangleOfObject( const OUString& rObjectCID, bool
return aRet;
}
-::boost::shared_ptr< DrawModelWrapper > ChartView::getDrawModelWrapper()
+std::shared_ptr< DrawModelWrapper > ChartView::getDrawModelWrapper()
{
return m_pDrawModelWrapper;
}
@@ -2372,7 +2372,7 @@ void changePositionOfAxisTitle( VTitle* pVTitle, TitleAlignment eAlignment
pVTitle->changePosition( aNewPosition );
}
-boost::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
+std::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
, const uno::Reference< drawing::XShapes>& xPageShapes
, const uno::Reference< lang::XMultiServiceFactory>& xShapeFactory
, ChartModel& rModel
@@ -2381,7 +2381,7 @@ boost::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
, TitleAlignment eAlignment
, bool& rbAutoPosition )
{
- boost::shared_ptr<VTitle> apVTitle;
+ std::shared_ptr<VTitle> apVTitle;
// #i109336# Improve auto positioning in chart
double fPercentage = lcl_getPageLayoutDistancePercentage();
@@ -3415,7 +3415,7 @@ void ChartView::createShapes3D()
aDataSeries.push_back(new VDataSeries(xDataSeries));
}
- boost::scoped_ptr<ExplicitCategoriesProvider> pCatProvider(new ExplicitCategoriesProvider(xCooSys, mrChartModel));
+ std::unique_ptr<ExplicitCategoriesProvider> pCatProvider(new ExplicitCategoriesProvider(xCooSys, mrChartModel));
m_pGL3DPlotter->create3DShapes(aDataSeries, *pCatProvider);
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 8512c19cb4f5..0f3d66d14f0b 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -58,7 +58,7 @@ bool VDataSequence::is() const
}
void VDataSequence::clear()
{
- Model = NULL;
+ Model = nullptr;
Doubles.realloc(0);
}
@@ -146,12 +146,12 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
, m_fLogicMinX(0.0)
, m_fLogicMaxX(0.0)
, m_fLogicZPos(0.0)
- , m_xGroupShape(NULL)
- , m_xLabelsGroupShape(NULL)
- , m_xErrorXBarsGroupShape(NULL)
- , m_xErrorYBarsGroupShape(NULL)
- , m_xFrontSubGroupShape(NULL)
- , m_xBackSubGroupShape(NULL)
+ , m_xGroupShape(nullptr)
+ , m_xLabelsGroupShape(nullptr)
+ , m_xErrorXBarsGroupShape(nullptr)
+ , m_xErrorYBarsGroupShape(nullptr)
+ , m_xFrontSubGroupShape(nullptr)
+ , m_xBackSubGroupShape(nullptr)
, m_xDataSeries(xDataSeries)
, m_nPointCount(0)
@@ -170,20 +170,20 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
, m_nGlobalSeriesIndex(0)
- , m_apLabel_Series(NULL)
- , m_apLabelPropNames_Series(NULL)
- , m_apLabelPropValues_Series(NULL)
- , m_apSymbolProperties_Series(NULL)
+ , m_apLabel_Series(nullptr)
+ , m_apLabelPropNames_Series(nullptr)
+ , m_apLabelPropValues_Series(nullptr)
+ , m_apSymbolProperties_Series(nullptr)
- , m_apLabel_AttributedPoint(NULL)
- , m_apLabelPropNames_AttributedPoint(NULL)
- , m_apLabelPropValues_AttributedPoint(NULL)
- , m_apSymbolProperties_AttributedPoint(NULL)
- , m_apSymbolProperties_InvisibleSymbolForSelection(NULL)
+ , m_apLabel_AttributedPoint(nullptr)
+ , m_apLabelPropNames_AttributedPoint(nullptr)
+ , m_apLabelPropValues_AttributedPoint(nullptr)
+ , m_apSymbolProperties_AttributedPoint(nullptr)
+ , m_apSymbolProperties_InvisibleSymbolForSelection(nullptr)
, m_nCurrentAttributedPoint(-1)
, m_nMissingValueTreatment(::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP)
, m_bAllowPercentValueInDataLabel(false)
- , mpOldSeries(NULL)
+ , mpOldSeries(nullptr)
, mnPercent(0.0)
{
::rtl::math::setNan( & m_fXMeanValue );
@@ -803,7 +803,7 @@ Symbol* getSymbolPropertiesFromPropertySet( const uno::Reference< beans::XProper
Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
{
- Symbol* pRet=NULL;
+ Symbol* pRet=nullptr;
if( isAttributedDataPoint( index ) )
{
adaptPointCache( index );
@@ -954,7 +954,7 @@ void VDataSeries::adaptPointCache( sal_Int32 nNewPointIndex ) const
DataPointLabel* VDataSeries::getDataPointLabel( sal_Int32 index ) const
{
- DataPointLabel* pRet = NULL;
+ DataPointLabel* pRet = nullptr;
if( isAttributedDataPoint( index ) )
{
adaptPointCache( index );
@@ -991,7 +991,7 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index
, tNameSequence*& pPropNames
, tAnySequence*& pPropValues ) const
{
- pPropNames = NULL; pPropValues = NULL;
+ pPropNames = nullptr; pPropValues = nullptr;
uno::Reference< beans::XPropertySet > xTextProp;
bool bDoDynamicFontResize = false;
if( isAttributedDataPoint( index ) )
@@ -1052,7 +1052,7 @@ VDataSeries::VDataSeries()
, m_fLogicMaxX(0)
, m_fLogicZPos(0)
, m_nPointCount(0)
- , m_pValueSequenceForDataLabelNumberFormatDetection(NULL)
+ , m_pValueSequenceForDataLabelNumberFormatDetection(nullptr)
, m_fXMeanValue(0)
, m_fYMeanValue(0)
, m_eStackingDirection(chart2::StackingDirection_NO_STACKING)
@@ -1064,7 +1064,7 @@ VDataSeries::VDataSeries()
, m_nCurrentAttributedPoint(0)
, m_nMissingValueTreatment(0)
, m_bAllowPercentValueInDataLabel(false)
- , mpOldSeries(NULL)
+ , mpOldSeries(nullptr)
, mnPercent(0)
{
}
@@ -1073,7 +1073,7 @@ void VDataSeries::setOldTimeBased( VDataSeries* pOldSeries, double nPercent )
{
mnPercent = nPercent;
mpOldSeries = pOldSeries;
- mpOldSeries->mpOldSeries = NULL;
+ mpOldSeries->mpOldSeries = nullptr;
}
VDataSeries* VDataSeries::createCopyForTimeBased() const