From eaf2c278888ebca0ac99055ee34df6f011da3596 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 17 Sep 2015 09:21:43 +0100 Subject: boost->std Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a --- reportdesign/inc/ReportDefinition.hxx | 10 +++++----- reportdesign/inc/RptDef.hxx | 4 ++-- reportdesign/inc/conditionalexpression.hxx | 6 ++---- reportdesign/inc/pch/precompiled_rptui.hxx | 2 -- 4 files changed, 9 insertions(+), 13 deletions(-) (limited to 'reportdesign/inc') diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index d5b8532141c0..9e1b619d1061 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -45,7 +45,7 @@ #include #include -#include +#include namespace rptui @@ -87,8 +87,8 @@ namespace reportdesign ,public ::comphelper::IEmbeddedHelper { private: - ::boost::shared_ptr m_aProps; - ::boost::shared_ptr m_pImpl; + std::shared_ptr m_aProps; + std::shared_ptr m_pImpl; private: OReportDefinition(const OReportDefinition&) SAL_DELETED_FUNCTION; @@ -193,9 +193,9 @@ namespace reportdesign * * \return */ - ::boost::shared_ptr getSdrModel() const; + std::shared_ptr getSdrModel() const; - static ::boost::shared_ptr getSdrModel(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition); + static std::shared_ptr getSdrModel(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition); private: DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 348a8cfb14ac..9e310e6a65ec 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include namespace com { namespace sun { namespace star { namespace report { @@ -93,7 +93,7 @@ public: @param _xComponent the report component */ REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); -typedef ::std::pair< OUString, ::boost::shared_ptr > TPropertyConverter; +typedef ::std::pair< OUString, std::shared_ptr > TPropertyConverter; typedef std::map TPropertyNamePair; /** returns the property name map for the given property id @param _nObjectId the object id diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index 04270c70d108..6ffaad730e83 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -23,10 +23,8 @@ #include "dllapi.h" #include -#include - #include - +#include namespace rptui { @@ -87,7 +85,7 @@ namespace rptui eLessOrEqual = 7 }; - typedef ::boost::shared_ptr< ConditionalExpression > PConditionalExpression; + typedef std::shared_ptr< ConditionalExpression > PConditionalExpression; typedef ::std::map< ComparisonOperation, PConditionalExpression > ConditionalExpressions; diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index d917616b0f11..71533bc41962 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -18,8 +18,6 @@ #include #include #include -#include -#include #include #include #include -- cgit