[Libreoffice-commits] core.git: chart2/inc chart2/qa chart2/source connectivity/inc connectivity/source
Caolán McNamara
caolanm at redhat.com
Mon Sep 14 12:33:09 PDT 2015
chart2/inc/ChartModel.hxx | 4
chart2/inc/ChartView.hxx | 11 -
chart2/inc/pch/precompiled_chartcontroller.hxx | 2
chart2/inc/pch/precompiled_chartcore.hxx | 2
chart2/qa/extras/chart2export.cxx | 4
chart2/qa/extras/charttest.hxx | 9 -
chart2/source/controller/accessibility/AccessibleChartElement.hxx | 1
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/AreaWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/AxisWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx | 8 -
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 30 ++--
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 10 -
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx | 8 -
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 50 ++++----
chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/GridWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/LegendWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/TitleWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx | 24 +--
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx | 8 -
chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx | 12 -
chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx | 6
chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx | 6
chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx | 4
chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx | 6
chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx | 10 -
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx | 10 -
chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx | 8 -
chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx | 8 -
chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx | 4
chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx | 8 -
chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx | 6
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 10 -
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx | 4
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 62 +++++-----
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx | 6
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 16 +-
chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx | 4
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 22 +--
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx | 6
chart2/source/controller/dialogs/DataBrowser.cxx | 12 -
chart2/source/controller/dialogs/DataBrowser.hxx | 9 -
chart2/source/controller/dialogs/DataBrowserModel.hxx | 5
chart2/source/controller/dialogs/DialogModel.cxx | 2
chart2/source/controller/dialogs/DialogModel.hxx | 8 -
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx | 6
chart2/source/controller/inc/AccessibleBase.hxx | 6
chart2/source/controller/inc/AccessibleChartView.hxx | 4
chart2/source/controller/inc/ChartController.hxx | 11 -
chart2/source/controller/inc/ChartDocumentWrapper.hxx | 4
chart2/source/controller/inc/ErrorBarItemConverter.hxx | 4
chart2/source/controller/inc/RegressionCurveItemConverter.hxx | 4
chart2/source/controller/inc/TimerTriggeredControllerLock.hxx | 4
chart2/source/controller/inc/TitleDialogData.hxx | 4
chart2/source/controller/inc/dlg_CreationWizard.hxx | 4
chart2/source/controller/inc/dlg_DataEditor.hxx | 1
chart2/source/controller/inc/dlg_InsertDataLabel.hxx | 4
chart2/source/controller/inc/dlg_InsertErrorBars.hxx | 2
chart2/source/controller/inc/dlg_InsertLegend.hxx | 4
chart2/source/controller/inc/dlg_InsertTitle.hxx | 4
chart2/source/controller/inc/res_ErrorBar.hxx | 2
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | 2
chart2/source/controller/main/ChartController_Insert.cxx | 4
chart2/source/controller/main/ChartController_Position.cxx | 4
chart2/source/controller/main/ChartController_Properties.cxx | 19 +--
chart2/source/controller/main/ChartController_TextEdit.cxx | 4
chart2/source/controller/main/ChartController_Tools.cxx | 8 -
chart2/source/controller/main/ElementSelector.hxx | 2
chart2/source/controller/main/ShapeController.cxx | 16 +-
chart2/source/controller/main/UndoActions.cxx | 6
chart2/source/controller/main/UndoActions.hxx | 8 -
chart2/source/controller/main/UndoGuard.hxx | 4
chart2/source/controller/sidebar/ChartAreaPanel.hxx | 1
chart2/source/controller/sidebar/ChartLinePanel.hxx | 1
chart2/source/inc/OPropertySet.hxx | 4
chart2/source/inc/chartview/DrawModelWrapper.hxx | 2
chart2/source/inc/chartview/ExplicitValueProvider.hxx | 6
chart2/source/model/main/ChartModel_Persistence.cxx | 2
chart2/source/model/main/UndoManager.hxx | 4
chart2/source/view/axes/VAxisBase.cxx | 4
chart2/source/view/axes/VCartesianAxis.cxx | 18 +-
chart2/source/view/axes/VCartesianCoordinateSystem.cxx | 2
chart2/source/view/axes/VCartesianGrid.cxx | 4
chart2/source/view/axes/VCoordinateSystem.cxx | 2
chart2/source/view/axes/VPolarAngleAxis.cxx | 4
chart2/source/view/axes/VPolarAxis.cxx | 2
chart2/source/view/axes/VPolarCoordinateSystem.cxx | 2
chart2/source/view/axes/VPolarRadiusAxis.hxx | 4
chart2/source/view/charttypes/NetChart.hxx | 2
chart2/source/view/charttypes/PieChart.cxx | 4
chart2/source/view/inc/GL3DBarChart.hxx | 4
chart2/source/view/inc/VCoordinateSystem.hxx | 7 -
chart2/source/view/inc/VDataSeries.hxx | 20 +--
chart2/source/view/inc/VSeriesPlotter.hxx | 2
chart2/source/view/main/ChartView.cxx | 28 ++--
chart2/source/view/main/VDataSeries.cxx | 46 +++----
connectivity/inc/pch/precompiled_dbtools.hxx | 2
connectivity/inc/pch/precompiled_odbc.hxx | 1
connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx | 1
connectivity/source/commontools/RowFunctionParser.cxx | 2
connectivity/source/commontools/predicateinput.cxx | 7 -
connectivity/source/drivers/firebird/Connection.hxx | 4
connectivity/source/drivers/hsqldb/HDriver.cxx | 4
connectivity/source/drivers/hsqldb/HStorageAccess.cxx | 18 +-
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 1
connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx | 6
connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx | 4
connectivity/source/drivers/jdbc/JConnection.cxx | 4
connectivity/source/drivers/jdbc/Object.cxx | 6
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 4
connectivity/source/drivers/jdbc/ResultSet.cxx | 4
connectivity/source/drivers/mork/MResultSet.cxx | 2
connectivity/source/drivers/mork/MResultSet.hxx | 4
connectivity/source/drivers/mork/MStatement.hxx | 4
connectivity/source/drivers/mozab/MConnection.cxx | 2
connectivity/source/drivers/mozab/MConnection.hxx | 2
connectivity/source/drivers/mozab/MResultSet.cxx | 2
connectivity/source/drivers/mozab/MResultSet.hxx | 4
connectivity/source/drivers/mozab/MStatement.hxx | 4
connectivity/source/drivers/odbc/OPreparedStatement.cxx | 4
connectivity/source/drivers/postgresql/pq_connection.cxx | 4
connectivity/source/inc/RowFunctionParser.hxx | 7 -
connectivity/source/inc/hsqldb/HStorageMap.hxx | 4
connectivity/source/inc/java/lang/Object.hxx | 6
connectivity/source/parse/sqlnode.cxx | 4
140 files changed, 461 insertions(+), 491 deletions(-)
New commits:
commit 33cddeea1352688af9a42b53024e32a4536d5860
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 14 14:43:18 2015 +0100
boost->std
Change-Id: Iff14f69c200217c5d868978e8ffc06962b99ac09
Reviewed-on: https://gerrit.libreoffice.org/18568
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 4dab666..0eaf08a 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -63,7 +63,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <svtools/grfmgr.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class SvNumberFormatter;
class OpenGLWindow;
@@ -154,7 +154,7 @@ private:
m_xOwnNumberFormatsSupplier;
::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >
m_xNumberFormatsSupplier;
- boost::scoped_ptr< SvNumberFormatter > m_apSvNumberFormatter; // #i113784# avoid memory leak
+ std::unique_ptr< SvNumberFormatter > m_apSvNumberFormatter; // #i113784# avoid memory leak
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager >
m_xChartTypeManager;
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 1ac31ec..9589ee0 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -40,8 +40,7 @@
#include <com/sun/star/qa/XDumper.hpp>
#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/ptr_container/ptr_vector.hpp>
+#include <memory>
#include <vcl/timer.hxx>
@@ -141,7 +140,7 @@ public:
virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes() SAL_OVERRIDE;
- ::boost::shared_ptr< DrawModelWrapper > getDrawModelWrapper() SAL_OVERRIDE;
+ std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() SAL_OVERRIDE;
// ___XTransferable___
virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
@@ -257,7 +256,7 @@ private: //member
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xTransGradientTable;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xMarkerTable;
- ::boost::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper;
+ std::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper;
std::vector< VCoordinateSystem* > m_aVCooSysList;
@@ -283,10 +282,10 @@ private: //member
::com::sun::star::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes;
- boost::shared_ptr<GL3DPlotterBase> m_pGL3DPlotter;
+ std::shared_ptr<GL3DPlotterBase> m_pGL3DPlotter;
TimeBasedInfo maTimeBased;
osl::Mutex maTimeMutex;
- boost::scoped_ptr<GL2DRenderer> mp2DRenderer;
+ std::unique_ptr<GL2DRenderer> mp2DRenderer;
};
}
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 2805e0b..4e2834d 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -23,8 +23,6 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <boost/checked_delete.hpp>
#include <boost/ref.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx
index 5bf7c8a..fde1f3c 100644
--- a/chart2/inc/pch/precompiled_chartcore.hxx
+++ b/chart2/inc/pch/precompiled_chartcore.hxx
@@ -35,8 +35,6 @@
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <cmath>
#include <com/sun/star/awt/CharSet.hpp>
#include <com/sun/star/awt/FontFamily.hpp>
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 7004e97..575e230 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -214,13 +214,13 @@ OUString findChartFile(const OUString& rDir, uno::Reference< container::XNameAcc
xmlDocPtr Chart2ExportTest::parseExport(const OUString& rDir, const OUString& rFilterFormat)
{
- boost::shared_ptr<utl::TempFile> pTempFile = reload(rFilterFormat);
+ std::shared_ptr<utl::TempFile> pTempFile = reload(rFilterFormat);
// Read the XML stream we're interested in.
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), pTempFile->GetURL());
uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName(findChartFile(rDir, xNameAccess)), uno::UNO_QUERY);
CPPUNIT_ASSERT(xInputStream.is());
- boost::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+ std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
return parseXmlStream(pStream.get());
}
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 6e7be74..0cf5ccd 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -57,12 +57,11 @@
#include <unonames.hxx>
#include <iostream>
+#include <memory>
#include <libxml/xmlwriter.h>
#include <libxml/xpath.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
using namespace css;
using namespace css::uno;
@@ -72,7 +71,7 @@ class ChartTest : public test::BootstrapFixture, public unotest::MacrosTest
public:
ChartTest():mbSkipValidation(false) {}
void load( const OUString& rDir, const OUString& rFileName );
- boost::shared_ptr<utl::TempFile> reload( const OUString& rFileName );
+ std::shared_ptr<utl::TempFile> reload( const OUString& rFileName );
uno::Sequence < OUString > getImpressChartColumnDescriptions( const char* pDir, const char* pName );
OUString getFileExtension( const OUString& rFileName );
@@ -118,13 +117,13 @@ void ChartTest::load( const OUString& aDir, const OUString& aName )
CPPUNIT_ASSERT(mxComponent.is());
}
-boost::shared_ptr<utl::TempFile> ChartTest::reload(const OUString& rFilterName)
+std::shared_ptr<utl::TempFile> ChartTest::reload(const OUString& rFilterName)
{
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
auto aArgs(::comphelper::InitPropertySequence({
{ "FilterName", makeAny(rFilterName) }
}));
- boost::shared_ptr<utl::TempFile> pTempFile = boost::make_shared<utl::TempFile>();
+ std::shared_ptr<utl::TempFile> pTempFile = std::make_shared<utl::TempFile>();
pTempFile->EnableKillingFile();
xStorable->storeToURL(pTempFile->GetURL(), aArgs);
mxComponent->dispose();
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index 9353b2d..f999054 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 ceddbaf..9bed1d6 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 0b67f07..0acb0ce 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 ee32f16..6abfbf4 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 df22654..81928c3 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 8c687ad..a6d11e5 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 c074d57..31d2fc2 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 d356bea..14c1e3d 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 2b6c2da..83b9a1f 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 a6c921b..5bf919d 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 0f4216e..cea85aa 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 072384a..c40d896 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 e6ea629..5e994e2 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 55f3298..f669d56 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 f553810..97e0d92 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 28abcb1..2f84bc8 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 023eed1..70c7566 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 d1b4110..7abe79a 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 172c807..ae6d0bd 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 8910bcf..06d43f9 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 99c3ca3..bbcec11 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 3c509fc..d355418 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 a3061a2..7be9d4e 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 14af063..a4cf7dc 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 f78d625..1012a9a 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 1351ccd..1c04139 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 1b13ca9..1f0a283 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 d4dd964..a4e988c 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 24dfe03..ca58460 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 7671151..39ced85e 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 bd79828..6ab5bce 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 3493bc7..106fbdc 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 cfee937..e514d4c 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 7939a91..1406a79 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 8c86559..a4fe2d0e 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 56b7789..60b4bd6 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 2e4d2e2..a4e9f97 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 11260f3..987963f 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 e899617..3b113e7 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 e60741d..6438e28 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 717fa93..20930a5 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 1698c0a..8ac4ca2 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 3294c78..64a9f2e 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 e3c0b55..a9d488c 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,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list