boost->std

Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a

24 files changed, 47 insertions, 57 deletions

diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index b4e6f5d38c73..03bf69dc691d 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -47,9 +47,7 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <cassert>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index e611c6103cba..fc57dea7cef3 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -32,7 +32,7 @@
 #include <sfx2/Metadatable.hxx>
 #include <sfx2/XmlIdRegistry.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 
 using namespace ::com::sun::star;
@@ -94,9 +94,9 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2)
 
 void MetadatableTest::test()
 {
-    boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pReg(
+    std::unique_ptr< ::sfx2::IXmlIdRegistry > const pReg(
         ::sfx2::createXmlIdRegistry(false) );
-    boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pRegClip(
+    std::unique_ptr< ::sfx2::IXmlIdRegistry > const pRegClip(
         ::sfx2::createXmlIdRegistry(true) );
 
     MockMetadatable m1(*pReg);
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index f77141fd1e8f..121bc98c1db5 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -117,7 +117,7 @@
 #include <unotools/extendedsecurityoptions.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/strbuf.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 
@@ -564,7 +564,7 @@ SfxApplication::ChooseScript()
         const SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL;
         uno::Reference< frame::XFrame > xFrame( pFrame ? pFrame->GetFrameInterface() : uno::Reference< frame::XFrame >() );
 
-        boost::scoped_ptr<AbstractScriptSelectorDialog> pDlg(
+        std::unique_ptr<AbstractScriptSelectorDialog> pDlg(
             pFact->CreateScriptSelectorDialog( NULL, false, xFrame ));
 
         SAL_INFO( "sfx.appl", "done, now exec it");
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 0021c8ed0a80..1d6798d90a52 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -121,7 +121,7 @@
 
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Setup.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -364,7 +364,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 if ( pFrameItem )
                     xFrame = pFrameItem->GetFrame();
 
-                boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog(
+                std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog(
                     RID_SVXDLG_CUSTOMIZE,
                     NULL, &aSet, xFrame ));
 
@@ -534,7 +534,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
             if ( pFact )
             {
-                boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( 0, RID_DEFAULTABOUT ));
+                std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( 0, RID_DEFAULTABOUT ));
                 pDlg->Execute();
                 bDone = true;
             }
@@ -1155,7 +1155,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 
             do  // artificial loop for flow control
             {
-                boost::scoped_ptr<AbstractScriptSelectorDialog> pDlg(pFact->CreateScriptSelectorDialog(
+                std::unique_ptr<AbstractScriptSelectorDialog> pDlg(pFact->CreateScriptSelectorDialog(
                     lcl_getDialogParent( xFrame, GetTopWindow() ), false, xFrame ));
                 OSL_ENSURE( pDlg, "SfxApplication::OfaExec_Impl( SID_RUNMACRO ): no dialog!" );
                 if ( !pDlg )
@@ -1247,7 +1247,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 if ( pSet && pSet->GetItemState( pSetPool->GetWhich( SID_AUTO_CORRECT_DLG ), false, &pItem ) == SfxItemState::SET )
                     aSet.Put( *pItem );
 
-                boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL ));
+                std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL ));
                 pDlg->Execute();
             }
 
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 69eead54a5f0..28f7f0af15e4 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -68,7 +68,7 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ucb;
@@ -193,7 +193,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
     {
         // slot is a property
         const SfxType* pType = pSlot->GetType();
-        boost::scoped_ptr<SfxPoolItem> pItem(pType->CreateItem());
+        std::unique_ptr<SfxPoolItem> pItem(pType->CreateItem());
 
         if ( !pItem )
         {
@@ -311,7 +311,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
     for ( sal_uInt16 nArgs=0; nArgs<nMaxArgs; nArgs++ )
     {
         const SfxFormalArgument &rArg = bIsMediaDescriptor ? aFormalArgs[nArgs] : pSlot->GetFormalArgument( nArgs );
-        boost::scoped_ptr<SfxPoolItem> pItem(rArg.CreateItem());
+        std::unique_ptr<SfxPoolItem> pItem(rArg.CreateItem());
         if ( !pItem )
         {
 #ifdef DBG_UTIL
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 4ba7106c9678..988e28b38b23 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <vcl/toolbox.hxx>
 #include <tools/rcid.h>
 #include <unotools/moduleoptions.hxx>
@@ -377,7 +377,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinI
 {
     // load configuration
 
-    boost::scoped_ptr<SvtViewOptions> xWinOpt;
+    std::unique_ptr<SvtViewOptions> xWinOpt;
     // first see if a module specific id exists
     if (rInfo.aModule.getLength())
         xWinOpt.reset(new SvtViewOptions(E_WINDOW, rInfo.aModule + "/" + OUString::number(nId)));
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index f1634ca14274..c18accc6f11d 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -39,7 +39,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::frame;
@@ -285,7 +285,7 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::An
 
                 {
                     // attempt to protect the document against the script tampering with its Undo Context
-                    boost::scoped_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
+                    std::unique_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
                     if ( bIsDocBasic )
                         pUndoGuard.reset( new ::framework::DocumentUndoGuard( pDoc->GetModel() ) );
 
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 20c09d9b0d3c..ced9245fb4cd 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include <vcl/msgbox.hxx>
 #include <svl/lstner.hxx>
@@ -263,7 +263,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, const OUString& aEventName, cons
 
 void SfxEventConfiguration::ConfigureEvent( const OUString& aName, const SvxMacro& rMacro, SfxObjectShell *pDoc )
 {
-    boost::scoped_ptr<SvxMacro> pMacro;
+    std::unique_ptr<SvxMacro> pMacro;
     if ( rMacro.HasMacro() )
         pMacro.reset( new SvxMacro( rMacro.GetMacName(), rMacro.GetLibName(), rMacro.GetScriptType() ) );
     PropagateEvent_Impl( pDoc ? pDoc : 0, aName, pMacro.get() );
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 5a7d29ff01b5..3a0a1dd52bc4 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -64,7 +64,6 @@
 
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <unordered_map>
 
@@ -1108,7 +1107,7 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem*
     rDispatcher.Flush();
 
     // get SlotServer (Slot+ShellLevel) and Shell from cache
-    ::boost::scoped_ptr<SfxStateCache> xCache;
+    std::unique_ptr<SfxStateCache> xCache;
     if ( !pCache )
     {
         // Execution of non cached slots (Accelerators don't use Controllers)
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index d679263f5590..3bae014e1f10 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace basegfx;
 using namespace basegfx::tools;
@@ -1327,7 +1327,7 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL)
     BitmapEx aThumbnail;
     if (xIStream.is())
     {
-        boost::scoped_ptr<SvStream> pStream (
+        std::unique_ptr<SvStream> pStream (
             ::utl::UcbStreamHelper::CreateStream (xIStream));
         vcl::PNGReader aReader (*pStream);
         aThumbnail = aReader.Read ();
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 6cefb79764f0..c2605d3e617f 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -66,10 +66,9 @@
 #include <sfx2/msgpool.hxx>
 #include <sfx2/objsh.hxx>
 
-#include <boost/scoped_ptr.hpp>
-
 #include <iostream>
 #include <map>
+#include <memory>
 
 #include <sal/log.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
@@ -826,7 +825,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
                         }
 
                         eMapUnit = GetCoreMetric( pShell->GetPool(), GetId() );
-                        boost::scoped_ptr<SfxAllItemSet> xSet(new SfxAllItemSet(pShell->GetPool()));
+                        std::unique_ptr<SfxAllItemSet> xSet(new SfxAllItemSet(pShell->GetPool()));
                         TransformParameters(GetId(), lNewArgs, *xSet, pSlot);
                         if (xSet->Count())
                         {
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 078b9c821191..2bb0e711e7b0 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -73,7 +73,6 @@
 #include <vcl/builderfactory.hxx>
 
 #include <algorithm>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index c073542f6e58..eb1ba0ea2506 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -17,13 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <svl/itempool.hxx>
 #include <sfx2/itemconnect.hxx>
-
-#include <boost/shared_ptr.hpp>
 #include <list>
-#include <svl/itempool.hxx>
-
-
+#include <memory>
 
 namespace sfx {
 
@@ -292,7 +289,7 @@ public:
     bool                        FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet );
 
 private:
-    typedef boost::shared_ptr< ItemConnectionBase > ItemConnectionRef;
+    typedef std::shared_ptr< ItemConnectionBase > ItemConnectionRef;
     typedef std::list< ItemConnectionRef >          ItemConnectionList;
     typedef ItemConnectionList::iterator            ItemConnectionListIt;
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 8649a4d6ad98..251990c9b62d 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
@@ -2486,7 +2486,7 @@ IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void )
             ToolBoxItemBits::DROPDOWN == (pBox->GetItemBits(nEntry)&ToolBoxItemBits::DROPDOWN))
     {
         //create a popup menu in Writer
-        boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
+        std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
         uno::Reference< container::XNameAccess > xNameAccess(
                 frame::theUICommandDescription::get(
                     ::comphelper::getProcessComponentContext()) );
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 54e73aded93b..40c5ea0e433a 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svl/eitem.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 4b62de5ae926..fa92aeb900fd 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -121,7 +121,7 @@
 #include <officecfg/Office/Common.hxx>
 
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -199,7 +199,7 @@ public:
     mutable INetURLObject* m_pURLObj;
 
     const SfxFilter* m_pFilter;
-    boost::scoped_ptr<SfxFilter> m_pCustomFilter;
+    std::unique_ptr<SfxFilter> m_pCustomFilter;
 
     SfxMedium*       pAntiImpl;
     SvStream* m_pInStream;
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 1167db357c70..f4ad0b23df4d 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -53,7 +53,7 @@
 #include "graphhelp.hxx"
 #include "doc.hrc"
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace css;
 
@@ -184,7 +184,7 @@ bool GraphicHelper::getThumbnailFormatFromGDI_Impl(GDIMetaFile* pMetaFile, const
     if (!pMetaFile || !xStream.is())
         return false;
 
-    boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xStream));
+    std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xStream));
 
     if (pStream->GetError())
         return false;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 4a01b2ef4ca6..234888b1407b 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -87,7 +87,7 @@
 #include <svtools/sfxecode.hxx>
 #include "../appl/app.hrc"
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include <com/sun/star/frame/Desktop.hpp>
 
@@ -887,7 +887,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
         aDialogFlags = SFXWB_SAVEACOPY;
     }
 
-    boost::scoped_ptr<sfx2::FileDialogHelper> pFileDlg;
+    std::unique_ptr<sfx2::FileDialogHelper> pFileDlg;
 
     OUString aDocServiceName = GetDocServiceName();
     DBG_ASSERT( !aDocServiceName.isEmpty(), "No document service for this module set!" );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index a45c99f00686..b838f148c0e6 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -125,7 +125,7 @@
 #include <objstor.hxx>
 #include <appopen.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1567,7 +1567,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon
 
     if ( bCaughtException && bRaiseError )
     {
-        boost::scoped_ptr< VclAbstractDialog > pScriptErrDlg;
+        std::unique_ptr< VclAbstractDialog > pScriptErrDlg;
         SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
         if ( pFact )
             pScriptErrDlg.reset( pFact->CreateScriptErrorDialog( NULL, aException ) );
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 82dd1496b69e..a08c65ddbb70 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -101,7 +101,7 @@
 
 #include "guisaveas.hxx"
 #include <sfx2/templatedlg.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <cppuhelper/implbase.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index 00fa397d4ce6..e2fbfa5bfacd 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SFX2_SOURCE_DOC_OLEPROPS_HXX
 
 #include <map>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <osl/thread.h>
 #include <rtl/ustring.hxx>
 #include <sot/storage.hxx>
@@ -126,7 +126,7 @@ public:
     void                SetCodePage( sal_uInt16 nCodePage );
 
 private:
-    typedef ::boost::shared_ptr< rtl_TextEncoding > TextEncRef;
+    typedef std::shared_ptr< rtl_TextEncoding > TextEncRef;
     TextEncRef          mxTextEnc;
 };
 
@@ -226,7 +226,7 @@ private:
     sal_Int32           mnPropType;
 };
 
-typedef ::boost::shared_ptr< SfxOlePropertyBase > SfxOlePropertyRef;
+typedef std::shared_ptr< SfxOlePropertyBase > SfxOlePropertyRef;
 
 
 /** Property representing the codepage used to encode bytestrings in the entire property set. */
@@ -353,7 +353,7 @@ private:
     bool                mbSupportsDict;         /// true = section supports dictionary.
 };
 
-typedef ::boost::shared_ptr< SfxOleSection > SfxOleSectionRef;
+typedef std::shared_ptr< SfxOleSection > SfxOleSectionRef;
 
 
 
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
index c5c71aab7ece..b5746ecfc8fc 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -26,7 +26,7 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <boost/noncopyable.hpp>
 
 /** base class for sub components of an SfxBaseModel, which share their ref count and lifetime with the SfxBaseModel
@@ -154,7 +154,7 @@ namespace sfx2
         virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     private:
-        ::boost::scoped_ptr< DocumentUndoManager_Impl > m_pImpl;
+        std::unique_ptr< DocumentUndoManager_Impl > m_pImpl;
     };
 
 
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 36b46eaa3aea..f6bc338cb91e 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <sfx2/imgmgr.hxx>
 #include <sfx2/sfx.hrc>
@@ -71,7 +71,7 @@ public:
 
 namespace
 {
-    typedef std::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager_Impl> > SfxImageManagerImplMap;
+    typedef std::unordered_map< SfxModule*, std::shared_ptr<SfxImageManager_Impl> > SfxImageManagerImplMap;
 
     class theImageManagerImplMap :
         public rtl::Static<SfxImageManagerImplMap, theImageManagerImplMap> {};
@@ -246,7 +246,7 @@ SfxImageManager::~SfxImageManager()
 
 namespace
 {
-    typedef std::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager> > SfxImageManagerMap;
+    typedef std::unordered_map< SfxModule*, std::shared_ptr<SfxImageManager> > SfxImageManagerMap;
 
     class theImageManagerMap :
         public rtl::Static<SfxImageManagerMap, theImageManagerMap> {};
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index c5ad671722a9..b93221263989 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -46,7 +46,6 @@
 #include <sfx2/docfilt.hxx>
 
 #include <toolkit/awt/vclxdevice.hxx>
-#include <boost/scoped_ptr.hpp>
 
 #include "view.hrc"
 #include "helpid.hrc"