boost->std

Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a

26 files changed, 68 insertions, 83 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>
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index e6b317fc9620..c7c9ffb0b591 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -127,7 +127,6 @@
 #include <boost/bind.hpp>
 #include <boost/mem_fn.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/noncopyable.hpp>
 
 //  page styles
 #define SC_UNO_PAGE_LEFTBORDER      "LeftBorder"
@@ -196,7 +195,7 @@ namespace reportdesign
     using namespace comphelper;
     using namespace rptui;
 
-void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,::boost::shared_ptr<rptui::OReportModel>& _rModel)
+void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,std::shared_ptr<rptui::OReportModel>& _rModel)
 {
     uno::Reference<beans::XPropertySet> xProp(_xStorage,uno::UNO_QUERY);
     sal_Int32 nOpenMode = embed::ElementModes::READ;
@@ -508,9 +507,9 @@ struct OReportDefinitionImpl
     uno::Reference< frame::XUntitledNumbers >               m_xNumberedControllers;
     uno::Reference< document::XDocumentProperties >         m_xDocumentProperties;
 
-    ::boost::shared_ptr< ::comphelper::EmbeddedObjectContainer>
+    std::shared_ptr< ::comphelper::EmbeddedObjectContainer>
                                                             m_pObjectContainer;
-    ::boost::shared_ptr<rptui::OReportModel>                m_pReportModel;
+    std::shared_ptr<rptui::OReportModel>                m_pReportModel;
     ::rtl::Reference< ::dbaui::UndoManager >                m_pUndoManager;
     OUString                                         m_sCaption;
     OUString                                         m_sCommand;
@@ -2032,14 +2031,14 @@ uno::Reference< uno::XComponentContext > OReportDefinition::getContext()
     return m_aProps->m_xContext;
 }
 
-::boost::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel() const
+std::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel() const
 {
     return m_pImpl->m_pReportModel;
 }
 
-::boost::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel(const uno::Reference< report::XReportDefinition >& _xReportDefinition)
+std::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel(const uno::Reference< report::XReportDefinition >& _xReportDefinition)
 {
-    ::boost::shared_ptr<rptui::OReportModel> pReportModel;
+    std::shared_ptr<rptui::OReportModel> pReportModel;
     uno::Reference< lang::XUnoTunnel > xUT( _xReportDefinition, uno::UNO_QUERY );
     if( xUT.is() )
         pReportModel = reinterpret_cast<OReportDefinition*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( OReportDefinition::getUnoTunnelImplementationId())))->getSdrModel();
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index c5b14435b716..3163c6f749cd 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -198,7 +198,7 @@ void OSection::init()
 {
     SolarMutexGuard g; // lock while manipulating SdrModel
     uno::Reference< report::XReportDefinition> xReport = getReportDefinition();
-    ::boost::shared_ptr<rptui::OReportModel> pModel = OReportDefinition::getSdrModel(xReport);
+    std::shared_ptr<rptui::OReportModel> pModel = OReportDefinition::getSdrModel(xReport);
     assert(pModel && "No model set at the report definition!");
     if ( pModel )
     {
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 00611a8835d9..ed997d94b63d 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -241,7 +241,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
                 static TPropertyNamePair s_aNameMap;
                 if ( s_aNameMap.empty() )
                 {
-                    ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
+                    std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter)));
@@ -254,7 +254,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
                 static TPropertyNamePair s_aNameMap;
                 if ( s_aNameMap.empty() )
                 {
-                    ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
+                    std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARCOLOR,TPropertyConverter(PROPERTY_TEXTCOLOR,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARUNDERLINECOLOR,TPropertyConverter(PROPERTY_TEXTLINECOLOR,aNoConverter)));
@@ -265,7 +265,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter)));
 
-                    ::boost::shared_ptr<AnyConverter> aParaAdjust(new ParaAdjust());
+                    std::shared_ptr<AnyConverter> aParaAdjust(new ParaAdjust());
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aParaAdjust)));
                 }
                 return s_aNameMap;
@@ -275,7 +275,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
                 static TPropertyNamePair s_aNameMap;
                 if ( s_aNameMap.empty() )
                 {
-                    ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
+                    std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARCOLOR,TPropertyConverter(PROPERTY_TEXTCOLOR,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARUNDERLINECOLOR,TPropertyConverter(PROPERTY_TEXTLINECOLOR,aNoConverter)));
@@ -285,7 +285,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLTEXTEMPHASISMARK,TPropertyConverter(PROPERTY_FONTEMPHASISMARK,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter)));
-                    ::boost::shared_ptr<AnyConverter> aParaAdjust(new ParaAdjust());
+                    std::shared_ptr<AnyConverter> aParaAdjust(new ParaAdjust());
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aParaAdjust)));
                 }
                 return s_aNameMap;
@@ -296,7 +296,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
                 static TPropertyNamePair s_aNameMap;
                 if ( s_aNameMap.empty() )
                 {
-                    ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
+                    std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
                     s_aNameMap.insert(TPropertyNamePair::value_type(OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter)));
                 }
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index bfd381c310cf..a06a99064472 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <map>
 #include <memory>
-#include <boost/shared_ptr.hpp>
 #include <xmloff/prhdlfac.hxx>
 #include <xmloff/xmlprmap.hxx>
 
@@ -94,7 +93,7 @@ private:
     rtl::Reference < XMLPropertySetMapper >           m_xTableStylesPropertySetMapper;
 
     Reference<XReportDefinition>                    m_xReportDefinition;
-    ::boost::shared_ptr<rptui::OReportModel>        m_pReportModel;
+    std::shared_ptr<rptui::OReportModel>        m_pReportModel;
 
     bool                            implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
 
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 6e94536c4ef0..6ee1da8aee58 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -27,7 +27,7 @@
 #include <formula/tokenarray.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include "Formula.hxx"
 #include "AddField.hxx"
@@ -45,7 +45,7 @@ namespace rptui
 
 FormulaDialog::FormulaDialog(vcl::Window* pParent
                              , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory
-                             , const ::boost::shared_ptr< IFunctionManager >&  _pFunctionMgr
+                             , const std::shared_ptr< IFunctionManager >&  _pFunctionMgr
                              , const OUString& _sFormula
                              , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet
                              , svl::SharedStringPool& rStrPool )
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index 56da7f6e9643..b961e5c48643 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -30,7 +30,6 @@
 #include <vcl/layout.hxx>
 #include <vcl/scrbar.hxx>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
 #include <vector>
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index e756f8c16648..3825ac3a118d 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -35,7 +35,6 @@
 #include <svl/SfxBroadcaster.hxx>
 #include "ReportDefines.hxx"
 #include <svtools/colorcfg.hxx>
-#include <boost/shared_ptr.hpp>
 #include <svx/svdedtv.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/splitwin.hxx>
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index 1455d7e6260e..1a0245267e2e 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -22,9 +22,9 @@
 
 #include <formula/formula.hxx>
 #include <formula/IControlReferenceHandler.hxx>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/report/meta/XFormulaParser.hpp>
+#include <memory>
 
 namespace com { namespace sun { namespace star { namespace lang {
     class XMultiServiceFactory;
@@ -45,7 +45,7 @@ class OAddFieldWindow;
 class FormulaDialog : public formula::FormulaModalDialog,
                       public formula::IControlReferenceHandler
 {
-    ::boost::shared_ptr< formula::IFunctionManager > m_aFunctionManager;
+    std::shared_ptr< formula::IFunctionManager > m_aFunctionManager;
     formula::FormEditData*             m_pFormulaData;
     VclPtr<OAddFieldWindow>            m_pAddField;
     ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >          m_xRowSet;
@@ -62,7 +62,7 @@ class FormulaDialog : public formula::FormulaModalDialog,
 public:
     FormulaDialog( vcl::Window* pParent
         , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory
-        , const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr
+        , const std::shared_ptr< formula::IFunctionManager >& _pFunctionMgr
         , const OUString& _sFormula
         , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet
         , svl::SharedStringPool& rStrPool );
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index 042e0a941c9c..43ce8bf69479 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -25,8 +25,8 @@
 #include <com/sun/star/report/meta/XFunctionCategory.hpp>
 #include <com/sun/star/report/meta/XFunctionDescription.hpp>
 #include <map>
+#include <memory>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 namespace rptui
 {
@@ -36,8 +36,8 @@ class FunctionDescription;
 
 class FunctionManager : public formula::IFunctionManager
 {
-    typedef std::map< OUString, ::boost::shared_ptr< FunctionDescription > > TFunctionsMap;
-    typedef std::map< OUString, ::boost::shared_ptr< FunctionCategory > > TCategoriesMap;
+    typedef std::map< OUString, std::shared_ptr< FunctionDescription > > TFunctionsMap;
+    typedef std::map< OUString, std::shared_ptr< FunctionCategory > > TCategoriesMap;
     ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionManager> m_xMgr;
     mutable TCategoriesMap  m_aCategories;
     mutable ::std::vector< TCategoriesMap::iterator > m_aCategoryIndex;
@@ -50,7 +50,7 @@ public:
     virtual void                                    fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const SAL_OVERRIDE;
     virtual sal_Unicode                             getSingleToken(const EToken _eToken) const SAL_OVERRIDE;
 
-    ::boost::shared_ptr< FunctionDescription >      get(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription) const;
+    std::shared_ptr< FunctionDescription >      get(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription) const;
 };
 
 class FunctionDescription : public formula::IFunctionDescription
@@ -79,7 +79,7 @@ public:
 
 class FunctionCategory : public formula::IFunctionCategory
 {
-    mutable ::std::vector< ::boost::shared_ptr< FunctionDescription > > m_aFunctions;
+    mutable ::std::vector< std::shared_ptr< FunctionDescription > > m_aFunctions;
     ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionCategory> m_xCategory;
     sal_uInt32 m_nFunctionCount;
     sal_uInt32 m_nNumber;
diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx
index 1d558da01329..42862241fa01 100644
--- a/reportdesign/source/ui/inc/MarkedSection.hxx
+++ b/reportdesign/source/ui/inc/MarkedSection.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX
 
-#include <boost/shared_ptr.hpp>
-
 namespace rptui
 {
     class OSectionWindow;
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index b53f1b32bb85..508bed217faa 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -55,8 +55,8 @@
 #include <sfx2/zoomitem.hxx>
 
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 #include <functional>
+#include <memory>
 
 class TransferableClipboardListener;
 class VclWindowEvent;
@@ -109,7 +109,7 @@ namespace rptui
         mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >    m_xColumns;
         ::com::sun::star::awt::Size                                                             m_aVisualAreaSize;
 
-        ::boost::shared_ptr<rptui::OReportModel>
+        std::shared_ptr<rptui::OReportModel>
                                 m_aReportModel;
         OUString         m_sName;                /// name for the report definition
         OUString         m_sLastActivePage;      /// last active property browser page
@@ -440,7 +440,7 @@ namespace rptui
         *
         * \return
         */
-        ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_aReportModel;}
+        std::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_aReportModel;}
 
         inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >  getContext() const { return m_xContext; }
         inline sal_Int16   getZoomValue() const     { return m_nZoomValue; }
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index 8253c11d7bdc..b60680822433 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -28,7 +28,6 @@
 #include "dlgedfunc.hxx"
 #include <svtools/transfer.hxx>
 #include <rtl/ref.hxx>
-#include <boost/shared_ptr.hpp>
 #include <memory>
 
 namespace rptui
@@ -47,7 +46,7 @@ namespace rptui
         OSectionView*                       m_pView;
         VclPtr<OSectionWindow>              m_pParent;
         ::std::unique_ptr<DlgEdFunc>        m_pFunc;
-        ::boost::shared_ptr<OReportModel>   m_pModel;
+        std::shared_ptr<OReportModel>   m_pModel;
         ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>                           m_pMulti;
         ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>                           m_pReportListener;
         ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >              m_xSection;
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index 7c974bd0ad58..fd9eaabff3eb 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -27,7 +27,6 @@
 #include <sfx2/zoomitem.hxx>
 
 #include <vector>
-#include <boost/shared_ptr.hpp>
 #include <comphelper/propmultiplex.hxx>
 
 #include "MarkedSection.hxx"
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 373c7a3dd40b..54a88b051e0a 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -27,7 +27,6 @@
 #include <svx/svdedtv.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <rtl/ref.hxx>
-#include <boost/shared_ptr.hpp>
 #include <vcl/dockwin.hxx>
 #include "MarkedSection.hxx"
 #include "ReportWindow.hxx"
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 70a693ad81f2..5e232a14358a 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -34,7 +34,6 @@
 
 #include <list>
 #include <map>
-#include <boost/shared_ptr.hpp>
 
 namespace comphelper
 {
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index ce18a3e2f780..6f7fb265b0cb 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -147,7 +147,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface
         m_xReportComponent.set( xNameCont->getByName("ReportComponent"), uno::UNO_QUERY );
         if ( m_xDataProvider.is() )
         {
-            ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
+            std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
             TPropertyNamePair aPropertyMediation;
             aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_MASTERFIELDS, TPropertyConverter(PROPERTY_MASTERFIELDS,aNoConverter) ) );
             aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_DETAILFIELDS, TPropertyConverter(PROPERTY_DETAILFIELDS,aNoConverter) ) );
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx
index 925fa01102fa..d14ee0aa43ba 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -62,7 +62,7 @@ const formula::IFunctionCategory* FunctionManager::getCategory(sal_uInt32 _nPos)
     if ( _nPos >= m_aCategoryIndex.size() )
     {
         uno::Reference< report::meta::XFunctionCategory> xCategory = m_xMgr->getCategory(_nPos);
-        ::boost::shared_ptr< FunctionCategory > pCategory(new FunctionCategory(this,_nPos + 1,xCategory));
+        std::shared_ptr< FunctionCategory > pCategory(new FunctionCategory(this,_nPos + 1,xCategory));
         m_aCategoryIndex.push_back( m_aCategories.insert(TCategoriesMap::value_type(xCategory->getName(),pCategory)).first );
     }
     return m_aCategoryIndex[_nPos]->second.get();
@@ -72,9 +72,9 @@ void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula
 {
 }
 
-::boost::shared_ptr< FunctionDescription > FunctionManager::get(const uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription) const
+std::shared_ptr< FunctionDescription > FunctionManager::get(const uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription) const
 {
-    ::boost::shared_ptr< FunctionDescription > pDesc;
+    std::shared_ptr< FunctionDescription > pDesc;
     if ( _xFunctionDescription.is() )
     {
         const OUString sFunctionName = _xFunctionDescription->getName();
@@ -86,10 +86,10 @@ void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula
             TCategoriesMap::iterator aCategoryFind = m_aCategories.find(sCategoryName);
             if ( aCategoryFind == m_aCategories.end() )
             {
-                aCategoryFind = m_aCategories.insert(TCategoriesMap::value_type(sCategoryName,::boost::shared_ptr< FunctionCategory > (new FunctionCategory(this,xCategory->getNumber() + 1,xCategory)))).first;
+                aCategoryFind = m_aCategories.insert(TCategoriesMap::value_type(sCategoryName,std::shared_ptr< FunctionCategory > (new FunctionCategory(this,xCategory->getNumber() + 1,xCategory)))).first;
                 m_aCategoryIndex.push_back( aCategoryFind );
             }
-            aFunctionFind = m_aFunctions.insert(TFunctionsMap::value_type(sFunctionName,::boost::shared_ptr<FunctionDescription>(new FunctionDescription(aCategoryFind->second.get(),_xFunctionDescription)))).first;
+            aFunctionFind = m_aFunctions.insert(TFunctionsMap::value_type(sFunctionName,std::shared_ptr<FunctionDescription>(new FunctionDescription(aCategoryFind->second.get(),_xFunctionDescription)))).first;
         }
         pDesc = aFunctionFind->second;
     }
@@ -114,7 +114,7 @@ const formula::IFunctionDescription* FunctionCategory::getFunction(sal_uInt32 _n
     if ( _nPos >= m_aFunctions.size() && _nPos < m_nFunctionCount )
     {
         uno::Reference< report::meta::XFunctionDescription> xFunctionDescription = m_xCategory->getFunction(_nPos);
-        ::boost::shared_ptr< FunctionDescription > pFunction = m_pFunctionManager->get(xFunctionDescription);
+        std::shared_ptr< FunctionDescription > pFunction = m_pFunctionManager->get(xFunctionDescription);
         m_aFunctions.push_back( pFunction );
     }
     return m_aFunctions[_nPos].get();
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 29b806314114..b6fc5c32dd9e 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -743,7 +743,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
     if ( !_xShape.is() || !_rxParentWindow.is() )
         return false;
 
-    ::boost::shared_ptr<rptui::OReportModel> pModel  = ::reportdesign::OReportDefinition::getSdrModel(_xShape->getSection()->getReportDefinition());
+    std::shared_ptr<rptui::OReportModel> pModel  = ::reportdesign::OReportDefinition::getSdrModel(_xShape->getSection()->getReportDefinition());
 
     vcl::Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
 
@@ -1020,7 +1020,7 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
         uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext("org.libreoffice.report.pentaho.SOFunctionManager",_xContext),uno::UNO_QUERY);
         if ( xMgr.is() )
         {
-            ::boost::shared_ptr< formula::IFunctionManager > pFormulaManager(new FunctionManager(xMgr) );
+            std::shared_ptr< formula::IFunctionManager > pFormulaManager(new FunctionManager(xMgr) );
             ReportFormula aFormula( _in_out_rFormula );
 
             LanguageTag aLangTag(LANGUAGE_SYSTEM);
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index 800669bbcd9f..05ccf2f84856 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -158,29 +158,29 @@ namespace rptui
         uno::Reference<awt::XControl> xControl;
         OReportController *pController = const_cast<OReportController *>(&m_rReportController);
 
-        ::boost::shared_ptr<OReportModel> pModel = pController->getSdrModel();
+        std::shared_ptr<OReportModel> pModel = pController->getSdrModel();
 
-            uno::Reference<report::XSection> xSection(_xFixedText->getSection());
-            if ( xSection.is() )
+        uno::Reference<report::XSection> xSection(_xFixedText->getSection());
+        if ( xSection.is() )
+        {
+            OReportPage *pPage = pModel->getPage(xSection);
+            const size_t nIndex = pPage->getIndexOf(_xFixedText.get());
+            if (nIndex < pPage->GetObjCount() )
             {
-                OReportPage *pPage = pModel->getPage(xSection);
-                const size_t nIndex = pPage->getIndexOf(_xFixedText.get());
-                if (nIndex < pPage->GetObjCount() )
+                SdrObject *pObject = pPage->GetObj(nIndex);
+                OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObject);
+                if ( pUnoObj ) // this doesn't need to be done for shapes
                 {
-                    SdrObject *pObject = pPage->GetObj(nIndex);
-                    OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObject);
-                    if ( pUnoObj ) // this doesn't need to be done for shapes
+                    OSectionWindow* pSectionWindow = pController->getSectionWindow(xSection);
+                    if (pSectionWindow != 0)
                     {
-                        OSectionWindow* pSectionWindow = pController->getSectionWindow(xSection);
-                        if (pSectionWindow != 0)
-                        {
-                            OReportSection& aOutputDevice = pSectionWindow->getReportSection(); // OutputDevice
-                            OSectionView& aSdrView = aOutputDevice.getSectionView(); // SdrView
-                            xControl = pUnoObj->GetUnoControl(aSdrView, aOutputDevice);
-                        }
+                        OReportSection& aOutputDevice = pSectionWindow->getReportSection(); // OutputDevice
+                        OSectionView& aSdrView = aOutputDevice.getSectionView(); // SdrView
+                        xControl = pUnoObj->GetUnoControl(aSdrView, aOutputDevice);
                     }
                 }
             }
+        }
         return xControl;
     }
 
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index 9203b9ede2d3..16ba46e9d97f 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -159,7 +159,7 @@ namespace rptui
     {
         uno::Reference<awt::XVclWindowPeer> xVclWindowPeer;
 
-        ::boost::shared_ptr<OReportModel> pModel = m_rReportController.getSdrModel();
+        std::shared_ptr<OReportModel> pModel = m_rReportController.getSdrModel();
 
         uno::Reference<report::XSection> xSection(_xComponent->getSection());
         if ( xSection.is() )
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index f706f88351ce..b72523f890d9 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -143,7 +143,7 @@
 #include <boost/mem_fn.hpp>
 #include <boost/bind.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include <cppuhelper/exc_hlp.hxx>
 #include <unotools/confignode.hxx>
@@ -3021,7 +3021,7 @@ uno::Reference< sdbc::XRowSet > OReportController::getRowSet()
         xRowSetProp->setPropertyValue( PROPERTY_ACTIVECONNECTION, uno::makeAny( getConnection() ) );
         xRowSetProp->setPropertyValue( PROPERTY_APPLYFILTER, uno::makeAny( sal_True ) );
 
-        ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
+        std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
         TPropertyNamePair aPropertyMediation;
         aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_COMMAND, TPropertyConverter(PROPERTY_COMMAND,aNoConverter) ) );
         aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_COMMANDTYPE, TPropertyConverter(PROPERTY_COMMANDTYPE,aNoConverter) ) );
@@ -3796,7 +3796,7 @@ void OReportController::switchReportSection(const sal_Int16 _nId)
         const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() );
         const bool bSwitchOn = !m_xReportDefinition->getReportHeaderOn();
 
-        ::boost::scoped_ptr< UndoContext > pUndoContext;
+        std::unique_ptr< UndoContext > pUndoContext;
         if ( SID_REPORTHEADERFOOTER == _nId )
         {
             const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER));
@@ -3845,7 +3845,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId)
         const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() );
         const bool bSwitchOn = !m_xReportDefinition->getPageHeaderOn();
 
-        ::boost::scoped_ptr< UndoContext > pUndoContext;
+        std::unique_ptr< UndoContext > pUndoContext;
         if ( SID_PAGEHEADERFOOTER == _nId )
         {
             const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER));
@@ -4374,7 +4374,7 @@ SfxUndoManager& OReportController::getUndoManager() const
     DBG_TESTSOLARMUTEX();
         // this is expected to be called during UI actions, so the SM is assumed to be locked
 
-    ::boost::shared_ptr< OReportModel > pReportModel( getSdrModel() );
+    std::shared_ptr< OReportModel > pReportModel( getSdrModel() );
     ENSURE_OR_THROW( !!pReportModel, "no access to our model" );
 
     SfxUndoManager* pUndoManager( pReportModel->GetSdrUndoManager() );
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 3ef67d927395..cd907eb04144 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -42,7 +42,6 @@
 
 #include "helpids.hrc"
 #include "dlgedfac.hxx"
-#include <boost/shared_ptr.hpp>
 #include <toolkit/helper/vclunohelper.hxx>