diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 09:21:43 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 11:00:51 +0100 |
commit | eaf2c278888ebca0ac99055ee34df6f011da3596 (patch) | |
tree | 3177ca36a5eeac09b791ded9fc55d2d82e52c9cd /reportdesign/inc | |
parent | 498cb0b3a372ce1ec0e66640eb0badddff3f2e90 (diff) |
boost->std
Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a
Diffstat (limited to 'reportdesign/inc')
-rw-r--r-- | reportdesign/inc/ReportDefinition.hxx | 10 | ||||
-rw-r--r-- | reportdesign/inc/RptDef.hxx | 4 | ||||
-rw-r--r-- | reportdesign/inc/conditionalexpression.hxx | 6 | ||||
-rw-r--r-- | reportdesign/inc/pch/precompiled_rptui.hxx | 2 |
4 files changed, 9 insertions, 13 deletions
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 <cppuhelper/propertysetmixin.hxx> #include <svx/unomod.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> namespace rptui @@ -87,8 +87,8 @@ namespace reportdesign ,public ::comphelper::IEmbeddedHelper { private: - ::boost::shared_ptr<OReportComponentProperties> m_aProps; - ::boost::shared_ptr<OReportDefinitionImpl> m_pImpl; + std::shared_ptr<OReportComponentProperties> m_aProps; + std::shared_ptr<OReportDefinitionImpl> m_pImpl; private: OReportDefinition(const OReportDefinition&) SAL_DELETED_FUNCTION; @@ -193,9 +193,9 @@ namespace reportdesign * * \return */ - ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const; + std::shared_ptr<rptui::OReportModel> getSdrModel() const; - static ::boost::shared_ptr<rptui::OReportModel> getSdrModel(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition); + static std::shared_ptr<rptui::OReportModel> 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 <svx/svdobj.hxx> #include <comphelper/uno3.hxx> #include <svx/fmglob.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> 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<AnyConverter> > TPropertyConverter; +typedef ::std::pair< OUString, std::shared_ptr<AnyConverter> > TPropertyConverter; typedef std::map<OUString, TPropertyConverter> 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 <rtl/ustring.hxx> -#include <boost/shared_ptr.hpp> - #include <map> - +#include <memory> 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 <boost/bind.hpp> #include <boost/mem_fn.hpp> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> |