boost->std

Change-Id: Ie490bf2c6921f393bdeed96b1a8815996b701bf0
Reviewed-on: https://gerrit.libreoffice.org/18670
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

81 files changed, 177 insertions, 206 deletions

diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 0ae4276e9169..a2214ffb98f7 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -20,8 +20,6 @@
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbuno.hxx>
-#include <boost/make_shared.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 083049ce073d..d507b468bd12 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -25,7 +25,7 @@
 #include <svx/ifaceids.hxx>
 #include <vcl/vclptr.hxx>
 #include <sfx2/printer.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 94f4952919c0..e2a9fb781c0b 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -217,13 +217,13 @@ namespace
         MacroExecutionData* i_pData = static_cast<MacroExecutionData*>(p);
         ENSURE_OR_RETURN_VOID( i_pData, "wrong MacroExecutionData" );
         // take ownership of the data
-        boost::scoped_ptr< MacroExecutionData > pData( i_pData );
+        std::unique_ptr< MacroExecutionData > pData( i_pData );
 
         SAL_WARN_IF( (pData->xMethod->GetParent()->GetFlags() & SbxFlagBits::ExtSearch) == SbxFlagBits::NONE, "basctl.basicide","No EXTSEARCH!" );
 
         // in case this is a document-local macro, try to protect the document's Undo Manager from
         // flawed scripts
-        boost::scoped_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
+        std::unique_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
         if ( pData->aDocument.isDocument() )
             pUndoGuard.reset( new ::framework::DocumentUndoGuard( pData->aDocument.getDocument() ) );
 
diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx
index 642fa2d33e83..c6b464ab0e01 100644
--- a/basctl/source/basicide/documentenumeration.hxx
+++ b/basctl/source/basicide/documentenumeration.hxx
@@ -20,9 +20,8 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_DOCUMENTENUMERATION_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_DOCUMENTENUMERATION_HXX
 
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/frame/XController.hpp>
-
+#include <memory>
 #include <vector>
 
 namespace com { namespace sun { namespace star { namespace uno {
@@ -85,7 +84,7 @@ namespace basctl { namespace docs {
         ) const;
 
     private:
-        boost::scoped_ptr< DocumentEnumeration_Data > m_pData;
+        std::unique_ptr< DocumentEnumeration_Data > m_pData;
     };
 
 
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index 02b8e6667354..d1f5d157682a 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -27,7 +27,7 @@ class SvxSearchItem;
 #include <bastypes.hxx>
 #include <bastype2.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace basctl
 {
@@ -35,7 +35,7 @@ namespace basctl
 class ExtraData
 {
 private:
-    boost::scoped_ptr<SvxSearchItem> pSearchItem;
+    std::unique_ptr<SvxSearchItem> pSearchItem;
 
     LibInfos        aLibInfos;
 
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index fb29deeb2747..e9b1356c107e 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -22,8 +22,6 @@
 #include "bastypes.hxx"
 #include <vcl/settings.hxx>
 
-#include <boost/make_shared.hpp>
-
 namespace basctl
 {
 
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 7fdb066834d3..e728186d91e5 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -192,7 +192,7 @@ namespace basctl
         Reference< XModel >             m_xDocument;
         Reference< XModifiable >        m_xDocModify;
         Reference< XEmbeddedScripts >   m_xScriptAccess;
-        boost::scoped_ptr< DocumentEventNotifier > m_pDocListener;
+        std::unique_ptr< DocumentEventNotifier > m_pDocListener;
 
     public:
         Impl ();
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index c6ac3fe9b1d7..b121294dfdf3 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -39,7 +39,7 @@
 #include <tools/diagnose_ex.h>
 #include <vcl/stdtext.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace basctl
 {
@@ -247,7 +247,7 @@ Sequence< Reference< XInterface > >
     {
         SdrObject* pCurrent = _rMarkList.GetMark(i)->GetMarkedSdrObj();
 
-        boost::scoped_ptr<SdrObjListIter> pGroupIterator;
+        std::unique_ptr<SdrObjListIter> pGroupIterator;
         if (pCurrent->IsGroupObject())
         {
             pGroupIterator.reset(new SdrObjListIter(*pCurrent->GetSubList()));
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index fe8dabba58e3..c374e5d00c9c 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -32,7 +32,7 @@
 
 #include <com/sun/star/script/XLibraryContainer.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 class Printer;
 class StarBASIC;
@@ -57,8 +57,8 @@ class DialogWindow: public BaseWindow
 {
 private:
     DialogWindowLayout& rLayout;
-    boost::scoped_ptr<DlgEditor> pEditor; // never nullptr
-    boost::scoped_ptr<SfxUndoManager> pUndoMgr; // never nullptr
+    std::unique_ptr<DlgEditor> pEditor; // never nullptr
+    std::unique_ptr<SfxUndoManager> pUndoMgr; // never nullptr
     OUString            aCurPath;
 
 protected:
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index aec6543a7a4d..edad9fd90799 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -33,7 +33,7 @@
 #include <vcl/vclptr.hxx>
 #include <vcl/window.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 class ScrollBar;
 class Printer;
@@ -110,18 +110,18 @@ private:
 private:
     VclPtr<ScrollBar>          pHScroll;
     VclPtr<ScrollBar>          pVScroll;
-    boost::scoped_ptr<DlgEdModel> pDlgEdModel; // never nullptr
+    std::unique_ptr<DlgEdModel> pDlgEdModel; // never nullptr
     DlgEdPage*          pDlgEdPage;  // never nullptr
-    boost::scoped_ptr<DlgEdView> pDlgEdView; // never nullptr
+    std::unique_ptr<DlgEdView> pDlgEdView; // never nullptr
     DlgEdForm*          pDlgEdForm; // never nullptr
     css::uno::Reference< css::container::XNameContainer >     m_xUnoControlDialogModel;
     css::uno::Reference< css::awt::XControlContainer >        m_xControlContainer;
     css::uno::Sequence< css::datatransfer::DataFlavor >       m_ClipboardDataFlavors;
     css::uno::Sequence< css::datatransfer::DataFlavor >       m_ClipboardDataFlavorsResource;
     css::uno::Reference< css::util::XNumberFormatsSupplier >  m_xSupplier;
-    boost::scoped_ptr<DlgEdFactory> pObjFac; // never nullptr
+    std::unique_ptr<DlgEdFactory> pObjFac; // never nullptr
     vcl::Window&                    rWindow; // DialogWindow
-    boost::scoped_ptr<DlgEdFunc>    pFunc;
+    std::unique_ptr<DlgEdFunc>    pFunc;
     DialogWindowLayout& rLayout;
     Mode                eMode;
     sal_uInt16          eActObj;
diff --git a/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx
index fb506aa6c776..546b1fb46d4f 100644
--- a/basctl/source/inc/docsignature.hxx
+++ b/basctl/source/inc/docsignature.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_BASCTL_SOURCE_INC_DOCSIGNATURE_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <sfx2/signaturestate.hxx>
+#include <memory>
 
 
 namespace basctl
@@ -67,7 +67,7 @@ namespace basctl
 
     private:
         struct Impl;
-        boost::scoped_ptr<Impl> m_pImpl;
+        std::unique_ptr<Impl> m_pImpl;
     };
 
 
diff --git a/basegfx/inc/pch/precompiled_basegfx.hxx b/basegfx/inc/pch/precompiled_basegfx.hxx
index a65b3ff43fcd..c393169294b0 100644
--- a/basegfx/inc/pch/precompiled_basegfx.hxx
+++ b/basegfx/inc/pch/precompiled_basegfx.hxx
@@ -16,7 +16,6 @@
 
 #include <algorithm>
 #include <boost/bind.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/noncopyable.hpp>
 #include <com/sun/star/awt/Point.hpp>
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index 46b8b452e90f..d2c0a67824fd 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -25,9 +25,9 @@
 #include <basegfx/curve/b2dcubicbezier.hxx>
 #include <rtl/instance.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <boost/scoped_ptr.hpp>
-#include <vector>
 #include <algorithm>
+#include <memory>
+#include <vector>
 
 struct CoordinateData2D : public basegfx::B2DPoint
 {
@@ -468,10 +468,10 @@ class ImplBufferedData
 {
 private:
     // Possibility to hold the last subdivision
-    boost::scoped_ptr< basegfx::B2DPolygon >        mpDefaultSubdivision;
+    std::unique_ptr< basegfx::B2DPolygon >        mpDefaultSubdivision;
 
     // Possibility to hold the last B2DRange calculation
-    boost::scoped_ptr< basegfx::B2DRange >          mpB2DRange;
+    std::unique_ptr< basegfx::B2DRange >          mpB2DRange;
 
 public:
     ImplBufferedData()
@@ -567,10 +567,10 @@ private:
 
     // The control point vectors. This vectors are created on demand
     // and may be zero.
-    boost::scoped_ptr< ControlVectorArray2D >       mpControlVector;
+    std::unique_ptr< ControlVectorArray2D >       mpControlVector;
 
     // buffered data for e.g. default subdivision and range
-    boost::scoped_ptr< ImplBufferedData >           mpBufferedData;
+    std::unique_ptr< ImplBufferedData >           mpBufferedData;
 
     // flag which decides if this polygon is opened or closed
     bool                                            mbIsClosed;
diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx
index 089523cac22c..a10d0949db6a 100644
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -17,7 +17,6 @@
 #include "math.h"
 #include <boost/optional.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/bridge/oleautomation/Decimal.hpp>
 #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
 #include <com/sun/star/i18n/LocaleCalendar2.hpp>
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 5dc17c04ef41..4b0e27242400 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -18,10 +18,6 @@
  */
 
 
-#include <list>
-
-#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <vcl/svapp.hxx>
 #include <tools/stream.hxx>
 #include <svl/SfxBroadcaster.hxx>
@@ -73,6 +69,9 @@
 #include <com/sun/star/awt/XControl.hpp>
 #include <comphelper/anytostring.hxx>
 #include <ooo/vba/VbQueryClose.hpp>
+#include <list>
+#include <memory>
+#include <boost/noncopyable.hpp>
 #include "sbxmod.hxx"
 #include "parser.hxx"
 
@@ -1751,7 +1750,7 @@ void SbModule::GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache)
     ErrorHdlResetter aErrHdl;
     SbxBase::ResetError();
 
-    boost::scoped_ptr<SbiParser> pParser(new SbiParser( static_cast<StarBASIC*>(GetParent()), this ));
+    std::unique_ptr<SbiParser> pParser(new SbiParser( static_cast<StarBASIC*>(GetParent()), this ));
     pParser->SetCodeCompleting(true);
 
     while( pParser->Parse() ) {}
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 2faa00eaf65e..447a50a61335 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/reflection/XIdlMethod.hpp>
 #include <com/sun/star/uno/Exception.hpp>
 #include <basic/codecompletecache.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -588,7 +588,7 @@ void SbiParser::DefType( bool bPrivate )
 
     SbxObject *pType = new SbxObject(aSym);
 
-    boost::scoped_ptr<SbiSymDef> pElem;
+    std::unique_ptr<SbiSymDef> pElem;
     SbiDimList* pDim = NULL;
     bool bDone = false;
 
@@ -960,7 +960,7 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
                     bool bError2 = true;
                     if( bOptional && bCompatible && eTok == EQ )
                     {
-                        boost::scoped_ptr<SbiConstExpression> pDefaultExpr(new SbiConstExpression( this ));
+                        std::unique_ptr<SbiConstExpression> pDefaultExpr(new SbiConstExpression( this ));
                         SbxDataType eType2 = pDefaultExpr->GetType();
 
                         sal_uInt16 nStringId;
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 4a2f2dbbef82..f991f4ea6aa1 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -19,7 +19,7 @@
 
 #include "parser.hxx"
 #include "iosys.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 // test if there's an I/O channel
 
@@ -52,7 +52,7 @@ void SbiParser::Print()
     {
         if( !IsEoln( Peek() ) )
         {
-            boost::scoped_ptr<SbiExpression> pExpr(new SbiExpression( this ));
+            std::unique_ptr<SbiExpression> pExpr(new SbiExpression( this ));
             pExpr->Gen();
             pExpr.reset();
             Peek();
@@ -81,7 +81,7 @@ void SbiParser::Write()
 
     while( !bAbort )
     {
-        boost::scoped_ptr<SbiExpression> pExpr(new SbiExpression( this ));
+        std::unique_ptr<SbiExpression> pExpr(new SbiExpression( this ));
         pExpr->Gen();
         pExpr.reset();
         aGen.Gen( _BWRITE );
@@ -130,7 +130,7 @@ void SbiParser::Line()
 void SbiParser::LineInput()
 {
     Channel( true );
-    boost::scoped_ptr<SbiExpression> pExpr(new SbiExpression( this, SbOPERAND ));
+    std::unique_ptr<SbiExpression> pExpr(new SbiExpression( this, SbOPERAND ));
     if( !pExpr->IsVariable() )
         Error( ERRCODE_BASIC_VAR_EXPECTED );
     if( pExpr->GetType() != SbxVARIANT && pExpr->GetType() != SbxSTRING )
@@ -147,7 +147,7 @@ void SbiParser::Input()
 {
     aGen.Gen( _RESTART );
     Channel( true );
-    boost::scoped_ptr<SbiExpression> pExpr(new SbiExpression( this, SbOPERAND ));
+    std::unique_ptr<SbiExpression> pExpr(new SbiExpression( this, SbOPERAND ));
     while( !bAbort )
     {
         if( !pExpr->IsVariable() )
@@ -240,10 +240,10 @@ void SbiParser::Open()
     }
     TestToken( AS );
     // channel number
-    boost::scoped_ptr<SbiExpression> pChan(new SbiExpression( this ));
+    std::unique_ptr<SbiExpression> pChan(new SbiExpression( this ));
     if( !pChan )
         Error( ERRCODE_BASIC_SYNTAX );
-    boost::scoped_ptr<SbiExpression> pLen;
+    std::unique_ptr<SbiExpression> pLen;
     if( Peek() == SYMBOL )
     {
         Next();
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index cdc3f21ac844..a77b9e2b3318 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -19,7 +19,7 @@
 
 
 #include "parser.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 // Single-line IF and Multiline IF
 
@@ -65,7 +65,7 @@ void SbiParser::If()
             aGen.BackChain( nEndLbl );
 
             aGen.Statement();
-            boost::scoped_ptr<SbiExpression> pCond(new SbiExpression( this ));
+            std::unique_ptr<SbiExpression> pCond(new SbiExpression( this ));
             pCond->Gen();
             nEndLbl = aGen.Gen( _JUMPF, 0 );
             pCond.reset();
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 9c2298eb8e97..491fa2ca585c 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -24,8 +24,8 @@
 #include "sbobjmod.hxx"
 #include <svtools/miscopt.hxx>
 #include <stdio.h>
-#include <boost/scoped_ptr.hpp>
 #include <rtl/character.hxx>
+#include <memory>
 
 // To activate tracing enable in sbtrace.hxx
 #ifdef DBG_TRACE_BASIC
@@ -943,7 +943,7 @@ bool SbModule::Compile()
     SbModule* pOld = GetSbData()->pCompMod;
     GetSbData()->pCompMod = this;
 
-    boost::scoped_ptr<SbiParser> pParser(new SbiParser( static_cast<StarBASIC*>(GetParent()), this ));
+    std::unique_ptr<SbiParser> pParser(new SbiParser( static_cast<StarBASIC*>(GetParent()), this ));
     while( pParser->Parse() ) {}
     if( !pParser->GetErrors() )
         pParser->aGen.Save();
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 9bb1a0faf8cb..80af31b57e90 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -21,11 +21,9 @@
 #define INCLUDED_BASIC_SOURCE_RUNTIME_DLLMGR_HXX
 
 #include <sal/config.h>
-
-#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
-
 #include <basic/sberrors.hxx>
+#include <boost/noncopyable.hpp>
+#include <memory>
 
 class SbxArray;
 class SbxVariable;
@@ -45,7 +43,7 @@ public:
 private:
     struct Impl;
 
-    boost::scoped_ptr< Impl > impl_;
+    std::unique_ptr< Impl > impl_;
 };
 
 #endif
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index b925c6cd4b8f..c9e14b73efad 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -26,7 +26,7 @@
 #include "runtime.hxx"
 #include "stdobj.hxx"
 #include "rtlproto.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 class SvRTLInputBox : public ModalDialog
 {
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 2bc975bdcdc5..598b83c33dea 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -58,8 +58,6 @@
 #include <ooo/vba/XHelperInterface.hpp>
 #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
-
 #include <random>
 
 using namespace comphelper;
@@ -4500,7 +4498,7 @@ RTLFUNC(LoadPicture)
     }
 
     OUString aFileURL = getFullPath( rPar.Get(1)->GetOUString() );
-    boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aFileURL, StreamMode::READ ));
+    std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aFileURL, StreamMode::READ ));
     if( pStream )
     {
         Bitmap aBmp;
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index 6d11d61fb272..d3ab7718bf8b 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -27,7 +27,7 @@
 #include "sbxconv.hxx"
 #include "math.h"
 #include <comphelper/processfactory.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 
 double ImpGetDate( const SbxValues* p )
@@ -100,7 +100,7 @@ double ImpGetDate( const SbxValues* p )
         {
             LanguageType eLangType = Application::GetSettings().GetLanguageTag().getLanguageType();
 
-            boost::scoped_ptr<SvNumberFormatter> pFormatter(new SvNumberFormatter( comphelper::getProcessComponentContext(), eLangType ));
+            std::unique_ptr<SvNumberFormatter> pFormatter(new SvNumberFormatter( comphelper::getProcessComponentContext(), eLangType ));
 
             sal_uInt32 nIndex;
             sal_Int32 nCheckPos = 0;
@@ -268,7 +268,7 @@ start:
             Color* pColor;
 
             LanguageType eLangType = Application::GetSettings().GetLanguageTag().getLanguageType();
-            boost::scoped_ptr<SvNumberFormatter> pFormatter(new SvNumberFormatter( comphelper::getProcessComponentContext(), eLangType ));
+            std::unique_ptr<SvNumberFormatter> pFormatter(new SvNumberFormatter( comphelper::getProcessComponentContext(), eLangType ));
 
             sal_uInt32 nIndex;
             sal_Int32 nCheckPos = 0;
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 8bf3b5c6c672..9c2d29d85b67 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -65,7 +65,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <basic/sbmod.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace basic
 {
@@ -781,7 +781,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
         }
         else
         {
-            boost::scoped_ptr<INetURLObject> pLibInfoInetObj;
+            std::unique_ptr<INetURLObject> pLibInfoInetObj;
             if( meInitMode == CONTAINER_INIT_FILE )
             {
                 aFileName = aInitFileName;
@@ -838,7 +838,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
             source.sSystemId    = aFileName;
 
             // start parsing
-            boost::scoped_ptr< ::xmlscript::LibDescriptorArray> pLibArray(new ::xmlscript::LibDescriptorArray());
+            std::unique_ptr< ::xmlscript::LibDescriptorArray> pLibArray(new ::xmlscript::LibDescriptorArray());
 
             try
             {
@@ -1904,7 +1904,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
     int iArray = 0;
     pName = aNames.getConstArray();
     ::xmlscript::LibDescriptor aLibDescriptorForExtensionLibs;
-    boost::scoped_ptr< ::xmlscript::LibDescriptorArray > pLibArray(new ::xmlscript::LibDescriptorArray(nLibsToSave));
+    std::unique_ptr< ::xmlscript::LibDescriptorArray > pLibArray(new ::xmlscript::LibDescriptorArray(nLibsToSave));
     for( ; pName != pNamesEnd; ++pName )
     {
         SfxLibrary* pImplLib = getImplLib( *pName );
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 91ecc7057b3b..998c3f4959e0 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -58,7 +58,7 @@
 #include <com/sun/star/util/VetoException.hpp>
 #include <com/sun/star/script/XLibraryQueryExecutable.hpp>
 #include <cppuhelper/implbase1.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace basic
 {
@@ -947,7 +947,7 @@ bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                     {
                         throw uno::RuntimeException();
                     }
-                    boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( xCodeStream ));
+                    std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( xCodeStream ));
                     if ( !pStream || pStream->GetError() )
                     {
                         sal_Int32 nError = pStream ? pStream->GetError() : ERRCODE_IO_GENERAL;
@@ -1062,7 +1062,7 @@ bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                                                                         aCodeStreamName,
                                                                         embed::ElementModes::READ );
 
-                            boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( xCodeStream ));
+                            std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( xCodeStream ));
                             if ( !pStream || pStream->GetError() )
                             {
                                 sal_Int32 nError = pStream ? pStream->GetError() : ERRCODE_IO_GENERAL;
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 0686dddf1b0e..1a6fc47555b5 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -21,7 +21,6 @@
 
 #include <string.h>
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
 #include <basegfx/numeric/ftools.hxx>
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx
index 6b909e058a44..5159e317ba7a 100644
--- a/cppcanvas/qa/unit/test.cxx
+++ b/cppcanvas/qa/unit/test.cxx
@@ -9,7 +9,6 @@
 
 #include <sal/config.h>
 
-#include <boost/scoped_ptr.hpp>
 #include <test/bootstrapfixture.hxx>
 
 #include <osl/file.hxx>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 5fa420b42131..4eaf9b2fabb5 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -23,10 +23,8 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <boost/bind.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/ref.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <cassert>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index bc128b538aa3..82e918ad971d 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -31,7 +31,7 @@
 
 #include <com/sun/star/text/textfield/Type.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace com::sun::star;
 
@@ -466,7 +466,7 @@ void Test::testSectionAttributes()
 {
     EditEngine aEngine(mpItemPool);
 
-    boost::scoped_ptr<SfxItemSet> pSet(new SfxItemSet(aEngine.GetEmptyItemSet()));
+    std::unique_ptr<SfxItemSet> pSet(new SfxItemSet(aEngine.GetEmptyItemSet()));
     SvxWeightItem aBold(WEIGHT_BOLD, EE_CHAR_WEIGHT);
     SvxPostureItem aItalic(ITALIC_NORMAL, EE_CHAR_ITALIC);
 
@@ -481,7 +481,7 @@ void Test::testSectionAttributes()
         CPPUNIT_ASSERT_MESSAGE("There should be exactly one item.", pSet->Count() == 1);
 
         aEngine.QuickSetAttribs(*pSet, ESelection(0,3,0,9)); // 'bbbccc'
-        boost::scoped_ptr<EditTextObject> pEditText(aEngine.CreateTextObject());
+        std::unique_ptr<EditTextObject> pEditText(aEngine.CreateTextObject());
         CPPUNIT_ASSERT_MESSAGE("Failed to create text object.", pEditText.get());
         std::vector<editeng::Section> aAttrs;
         pEditText->GetAllSections(aAttrs);
@@ -531,7 +531,7 @@ void Test::testSectionAttributes()
         aEngine.QuickSetAttribs(*pSet, ESelection(2,0,2,3));
         aEngine.QuickSetAttribs(*pSet, ESelection(4,0,4,5));
 
-        boost::scoped_ptr<EditTextObject> pEditText(aEngine.CreateTextObject());
+        std::unique_ptr<EditTextObject> pEditText(aEngine.CreateTextObject());
         CPPUNIT_ASSERT_MESSAGE("Failed to create text object.", pEditText.get());
         std::vector<editeng::Section> aAttrs;
         pEditText->GetAllSections(aAttrs);
@@ -593,7 +593,7 @@ void Test::testSectionAttributes()
         aEngine.QuickDelete(ESelection(0,0,1,3));
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aEngine.GetParagraphCount());
 
-        boost::scoped_ptr<EditTextObject> pEditText(aEngine.CreateTextObject());
+        std::unique_ptr<EditTextObject> pEditText(aEngine.CreateTextObject());
         CPPUNIT_ASSERT_MESSAGE("Failed to create text object.", pEditText.get());
         std::vector<editeng::Section> aAttrs;
         pEditText->GetAllSections(aAttrs);
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 38065faf968f..f712abd8d309 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -31,12 +31,12 @@
 #include <svl/languageoptions.hxx>
 #include <tools/lineend.hxx>
 
-#include <vector>
 #include <deque>
+#include <memory>
+#include <vector>
 
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
 
 class ImpEditEngine;
 class SvxTabStop;
@@ -242,7 +242,7 @@ private:
     OUString maString;
     ContentAttribs  aContentAttribs;
     CharAttribList  aCharAttribList;
-    boost::scoped_ptr<WrongList> mpWrongList;
+    std::unique_ptr<WrongList> mpWrongList;
 
     void UnExpandPosition( sal_Int32 &rStartPos, bool bBiasStart );
 
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index dc4d677f0d40..2d59974db893 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -30,7 +30,7 @@
 
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace editeng {
 
@@ -136,7 +136,7 @@ private:
     XEditAttributesType aAttribs;
     SfxStyleFamily      eFamily;
     SfxItemSet          aParaAttribs;
-    boost::scoped_ptr<WrongList> mpWrongs;
+    std::unique_ptr<WrongList> mpWrongs;
 
                         ContentInfo( SfxItemPool& rPool );
                         ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse  );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index f158d148273b..264ad00859bb 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -63,10 +63,8 @@
 #include <sot/formats.hxx>
 
 #include <unicode/ubidi.h>
-#include <memory>
-#include <boost/scoped_ptr.hpp>
-
 #include <algorithm>
+#include <memory>
 
 using namespace ::com::sun::star;
 
@@ -2934,7 +2932,7 @@ bool ImpEditEngine::UpdateFields()
             if (rAttr.Which() == EE_FEATURE_FIELD)
             {
                 EditCharAttribField& rField = static_cast<EditCharAttribField&>(rAttr);
-                boost::scoped_ptr<EditCharAttribField> pCurrent(new EditCharAttribField(rField));
+                std::unique_ptr<EditCharAttribField> pCurrent(new EditCharAttribField(rField));
                 rField.Reset();
 
                 if ( aStatus.MarkFields() )
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 6ddafdf6b09b..62ec29ddb7aa 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -28,8 +28,6 @@
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
 
-#include <map>
-
 #include <editeng/svxenum.hxx>
 #include <editeng/splwrap.hxx>
 #include <editeng/edtdlg.hxx>
@@ -37,7 +35,9 @@
 #include <editeng/editrids.hrc>
 #include <editeng/editids.hrc>
 #include <editeng/editerr.hxx>
-#include <boost/scoped_ptr.hpp>
+
+#include <map>
+#include <memory>
 
 #define WAIT_ON() if(pWin != nullptr) { pWin->EnterWait(); }
 
@@ -309,7 +309,7 @@ void SvxSpellWrapper::SpellDocument( )
         if (xHyphWord.is())
         {
             EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
-            boost::scoped_ptr<AbstractHyphenWordDialog> pDlg(pFact->CreateHyphenWordDialog( pWin,
+            std::unique_ptr<AbstractHyphenWordDialog> pDlg(pFact->CreateHyphenWordDialog( pWin,
                             xHyphWord->getWord(),
                             LanguageTag( xHyphWord->getLocale() ).getLanguageType(),
                             xHyph, this ));
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 8ff68cac078b..c009171a62a2 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -49,7 +49,7 @@
 
 #include "editeng/unonames.hxx"
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::cppu;
 using namespace ::com::sun::star;
@@ -1937,7 +1937,7 @@ void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTe
     if (!bAbsorb)
         aSel.Start = aSel.End;
 
-    boost::scoped_ptr<SvxFieldData> pFieldData(SvxFieldData::Create(xContent));
+    std::unique_ptr<SvxFieldData> pFieldData(SvxFieldData::Create(xContent));
     if (!pFieldData)
         throw lang::IllegalArgumentException();
 
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 8021b087c5a1..2a6a7005138f 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -36,7 +36,7 @@
 #include <vcl/wmf.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/gdimetafiletools.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include "swfexporter.hxx"
 #include "swfwriter.hxx"
@@ -594,7 +594,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster
             com::sun::star::awt::Rectangle aBoundRect;
             xPropSet->getPropertyValue( "BoundRect" ) >>= aBoundRect;
 
-            boost::scoped_ptr<ShapeInfo> pShapeInfo(new ShapeInfo());
+            std::unique_ptr<ShapeInfo> pShapeInfo(new ShapeInfo());
             pShapeInfo->mnX = aBoundRect.X;
             pShapeInfo->mnY = aBoundRect.Y;
             pShapeInfo->mnWidth = aBoundRect.Width;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 489ff7d3c50f..2a5856354574 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -41,7 +41,7 @@
 #include "strings.hrc"
 
 #include <math.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star::uno;
 
@@ -343,7 +343,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
     // try to get the dialog selection
     if ( pFilterConfigItem )
     {
-        boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag() ));
+        std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag() ));
 
         if( pResMgr )
         {
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index aea0c6f58c04..5a7395fffd06 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -28,7 +28,7 @@
 #include <main.hxx>
 #include <elements.hxx>
 #include <outact.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 
@@ -717,12 +717,12 @@ ImportCGM( OUString const & rFileName, uno::Reference< frame::XModel > const & r
     {
         try
         {
-            boost::scoped_ptr<CGM> pCGM(new CGM( nMode, rXModel ));
+            std::unique_ptr<CGM> pCGM(new CGM( nMode, rXModel ));
             if ( pCGM && pCGM->IsValid() )
             {
                 if ( nMode & CGM_IMPORT_CGM )
                 {
-                    boost::scoped_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( rFileName, StreamMode::READ ));
+                    std::unique_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( rFileName, StreamMode::READ ));
                     if ( pIn )
                     {
                         pIn->SetEndian( SvStreamEndian::BIG );
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index d3033b560a79..259236480dee 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -91,7 +91,6 @@
 #include <rtl/crc.h>
 #include <rtl/strbuf.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 
@@ -1290,7 +1289,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::u
         if ( pGraphicProvider && pPicOutStrm && pShapeBoundRect && aXPropSet.is() )
         {
             ::com::sun::star::uno::Any aAny;
-            boost::scoped_ptr< ::com::sun::star::awt::Rectangle> pVisArea;
+            std::unique_ptr< ::com::sun::star::awt::Rectangle> pVisArea;
             if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString("VisibleArea" ) ) )
             {
                 pVisArea.reset(new ::com::sun::star::awt::Rectangle);
@@ -1423,7 +1422,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
     bool        bRetValue = false;
     bool        bCreateFillStyles = false;
 
-    boost::scoped_ptr<GraphicAttr> pGraphicAttr;
+    std::unique_ptr<GraphicAttr> pGraphicAttr;
     GraphicObject   aGraphicObject;
     OUString        aGraphicUrl;
     OString         aUniqueId;
@@ -1592,7 +1591,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
                       nFormat != GraphicFileFormat::WMF &&
                       nFormat != GraphicFileFormat::EMF) )
                 {
-                    boost::scoped_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream(
+                    std::unique_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream(
                         aTmp.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
                     if ( pIn )
                     {
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 679759f4022d..5c1cecdedb2c 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -123,7 +123,6 @@
 #include <rtl/strbuf.hxx>
 #include <tools/time.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 // PPT ColorScheme Slots
 #define PPT_COLSCHEME                       (0x08000000)
@@ -1846,13 +1845,13 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
 
             if ( aTmpFile.IsValid() )
             {
-                boost::scoped_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), StreamMode::TRUNC | StreamMode::WRITE ));
+                std::unique_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), StreamMode::TRUNC | StreamMode::WRITE ));
                 if ( pDest )
                     bSuccess = SdrPowerPointOLEDecompress( *pDest, rStCtrl, nLen );
             }
             if ( bSuccess )
             {
-                boost::scoped_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), StreamMode::READ ));
+                std::unique_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), StreamMode::READ ));
                 Storage* pObjStor = pDest ? new Storage( *pDest, true ) : NULL;
                 if ( pObjStor )
                 {
@@ -2099,7 +2098,7 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
             DffRecordHeader*    pExEmbed = NULL;
 
             pHd->SeekToBegOfRecord( rStCtrl );
-            boost::scoped_ptr<DffRecordManager> pExObjListManager(new DffRecordManager( rStCtrl ));
+            std::unique_ptr<DffRecordManager> pExObjListManager(new DffRecordManager( rStCtrl ));
             sal_uInt16 i, nRecType(PPT_PST_ExEmbed);
 
             for ( i = 0; i < 2; i++ )
@@ -2292,7 +2291,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
                 for ( pPortion = pPara->First(); pPortion; pPortion = pPara->Next() )
                 {
                     SfxItemSet aPortionAttribs( rOutliner.GetEmptyItemSet() );
-                    boost::scoped_ptr<SvxFieldItem> pFieldItem(pPortion->GetTextField());
+                    std::unique_ptr<SvxFieldItem> pFieldItem(pPortion->GetTextField());
                     if ( pFieldItem )
                     {
                         rOutliner.QuickInsertField( *pFieldItem, ESelection( nParaIndex, aSelection.nEndPos, nParaIndex, aSelection.nEndPos + 1 ) );
@@ -2988,7 +2987,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
 {
     SdrObject* pRet = NULL;
     bool bCreateObj = bForce;
-    boost::scoped_ptr<SfxItemSet> pSet;
+    std::unique_ptr<SfxItemSet> pSet;
     sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it later
     DffRecordHeader aPageHd;
     if ( SeekToAktPage( &aPageHd ) )
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index ce51d20e8f7d..1a7f0a52f1b9 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -14,7 +14,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/salbtype.hxx>
 #include <filter/msfilter/util.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <unordered_map>
 
 namespace msfilter {
@@ -89,7 +89,7 @@ DateTime DTTM2DateTime( long lDTTM )
 sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar,
     rtl_TextEncoding& rChrSet, OUString& rFontName)
 {
-    boost::scoped_ptr<StarSymbolToMSMultiFont> pConvert(CreateStarSymbolToMSMultiFont());
+    std::unique_ptr<StarSymbolToMSMultiFont> pConvert(CreateStarSymbolToMSMultiFont());
     OUString sFont = pConvert->ConvertChar(cChar);
     pConvert.reset();
     if (!sFont.isEmpty())
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index d2b511bd3e5d..5d59ea78c726 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -74,7 +74,7 @@
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/drawing/XShapes.hpp"
 #include "com/sun/star/graphic/XGraphicProvider.hpp"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -791,7 +791,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
             aContext.SignTSA = msSignTSA;
 
 // all context data set, time to create the printing device
-            boost::scoped_ptr<vcl::PDFWriter> pPDFWriter(new vcl::PDFWriter( aContext, xEnc ));
+            std::unique_ptr<vcl::PDFWriter> pPDFWriter(new vcl::PDFWriter( aContext, xEnc ));
             OutputDevice*       pOut = pPDFWriter->GetReferenceDevice();
 
             DBG_ASSERT( pOut, "PDFExport::Export: no reference device" );
@@ -811,7 +811,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
             if ( pOut )
             {
                 DBG_ASSERT( pOut->GetExtOutDevData() == NULL, "PDFExport: ExtOutDevData already set!!!" );
-                boost::scoped_ptr<vcl::PDFExtOutDevData> pPDFExtOutDevData(new vcl::PDFExtOutDevData( *pOut ));
+                std::unique_ptr<vcl::PDFExtOutDevData> pPDFExtOutDevData(new vcl::PDFExtOutDevData( *pOut ));
                 pOut->SetExtOutDevData( pPDFExtOutDevData.get() );
                 pPDFExtOutDevData->SetIsExportNotes( mbExportNotes );
                 pPDFExtOutDevData->SetIsExportTaggedPDF( mbUseTaggedPDF );
@@ -894,7 +894,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
 
                 if ( mxStatusIndicator.is() )
                 {
-                    boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag() ));
+                    std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag() ));
                     if ( pResMgr )
                     {
                         sal_Int32 nTotalPageCount = aRangeEnum.size();
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 2512ffb0214f..8c342b0b7ec7 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -24,7 +24,7 @@
 #include <vcl/window.hxx>
 #include <svl/outstrm.hxx>
 #include <vcl/FilterConfigItem.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 // - PDFFilter -
 PDFFilter::PDFFilter( const Reference< XComponentContext > &rxContext ) :
@@ -113,7 +113,7 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
 
         if( bRet )
         {
-            boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aTempFile.GetURL(), StreamMode::READ ));
+            std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aTempFile.GetURL(), StreamMode::READ ));
 
             if( pIStm )
             {
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index e39627bb2cdd..eec15ab0bc21 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -46,7 +46,7 @@
 #include <xmloff/animationexport.hxx>
 
 #include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star::graphic;
 using namespace ::com::sun::star::geometry;
@@ -530,7 +530,7 @@ bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
 {
     Reference< XComponentContext >      xContext( ::comphelper::getProcessComponentContext() ) ;
     Reference< XOutputStream >          xOStm;
-    boost::scoped_ptr<SvStream>         pOStm;
+    std::unique_ptr<SvStream>         pOStm;
     sal_Int32                            nLength = rDescriptor.getLength();
     const PropertyValue*                pValue = rDescriptor.getConstArray();
     bool                            bRet = false;
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 0f20f8f9a832..a51336513fe5 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -50,7 +50,7 @@
 #include "svgfilter.hxx"
 #include "svgwriter.hxx"
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 
@@ -363,7 +363,7 @@ OUString SAL_CALL SVGFilter::detect(Sequence<PropertyValue>& rDescriptor) throw
     try {
         if (isStreamGZip(xInput))
         {
-            boost::scoped_ptr<SvStream> aStream(utl::UcbStreamHelper::CreateStream(xInput, true ));
+            std::unique_ptr<SvStream> aStream(utl::UcbStreamHelper::CreateStream(xInput, true ));
             if(!aStream.get())
                 return OUString();
 
diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx
index 1d3daafe1963..66c88c625eca 100644
--- a/filter/source/svg/svgimport.cxx
+++ b/filter/source/svg/svgimport.cxx
@@ -43,7 +43,7 @@
 #include <unotools/mediadescriptor.hxx>
 #include <tools/zcodec.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::svgi;
@@ -65,7 +65,7 @@ bool SVGFilter::implImport(const Sequence< PropertyValue >& rDescriptor)
             return false;
         xSeek->seek(0);
 
-        boost::scoped_ptr<SvStream> aStream(utl::UcbStreamHelper::CreateStream(xInputStream, true ));
+        std::unique_ptr<SvStream> aStream(utl::UcbStreamHelper::CreateStream(xInputStream, true ));
         if(!aStream.get())
             return false;
 
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 72aeb4d80bda..37b84fd518bd 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -29,7 +29,7 @@
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include <sax/tools/converter.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <boost/shared_array.hpp>
 
 
@@ -195,7 +195,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
                             ( rGradientId = "Gradient_" ) += OUString::number( nCurGradientId++ ) );
 
         {
-            boost::scoped_ptr< SvXMLElementExport >   apGradient;
+            std::unique_ptr< SvXMLElementExport >   apGradient;
             OUString                         aColorStr;
 
             if( rGradient.GetStyle() == GradientStyle_LINEAR || rGradient.GetStyle() == GradientStyle_AXIAL )
diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx
index 3ce15394a502..cd3e58dff52c 100644
--- a/filter/source/textfilterdetect/filterdetect.cxx
+++ b/filter/source/textfilterdetect/filterdetect.cxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <cppuhelper/supportsservice.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #define WRITER_TEXT_FILTER "Text"
 #define CALC_TEXT_FILTER   "Text - txt - csv (StarCalc)"
@@ -39,7 +39,7 @@ namespace {
 
 bool IsHTMLStream( const uno::Reference<io::XInputStream>& xInStream )
 {
-    boost::scoped_ptr<SvStream> pInStream( utl::UcbStreamHelper::CreateStream( xInStream ) );
+    std::unique_ptr<SvStream> pInStream( utl::UcbStreamHelper::CreateStream( xInStream ) );
     if ( !pInStream || pInStream->GetError() )
         // No stream
         return false;
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index d797a9fca61d..ea86801f36de 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -27,7 +27,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace com::sun::star::container;
 using namespace com::sun::star::uno;
@@ -93,7 +93,7 @@ OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun:
             }
         }
 
-        ::boost::scoped_ptr< SvStream > pInStream( ::utl::UcbStreamHelper::CreateStream( xInStream ) );
+        std::unique_ptr< SvStream > pInStream( ::utl::UcbStreamHelper::CreateStream( xInStream ) );
         pInStream->StartReadingUnicodeText( RTL_TEXTENCODING_DONTKNOW );
         sal_Size nUniPos = pInStream->Tell();
 
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 167d17604600..12de44a50565 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -45,7 +45,7 @@
 
 #include <LibXSLTTransformer.hxx>
 #include <OleHandler.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::cppu;
 using namespace ::osl;
@@ -298,7 +298,7 @@ namespace XSLT
         xsltSetGenericDebugFunc(stderr, NULL);
         xsltDebugDumpExtensions(NULL);
 #endif
-        boost::scoped_ptr<OleHandler> oh(new OleHandler(m_transformer->getComponentContext()));
+        std::unique_ptr<OleHandler> oh(new OleHandler(m_transformer->getComponentContext()));
         if (styleSheet)
             {
                 tcontext = xsltNewTransformContext(styleSheet, doc);
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index 55b89b74a646..dbf10e04a30b 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/embed/XTransactedObject.hpp>
 
 #include <OleHandler.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -128,7 +128,7 @@ namespace XSLT
             }
 
         // Decompress the bytes
-        boost::scoped_ptr< ::ZipUtils::Inflater> decompresser(new ::ZipUtils::Inflater(false));
+        std::unique_ptr< ::ZipUtils::Inflater> decompresser(new ::ZipUtils::Inflater(false));
         decompresser->setInput(content);
         Sequence<sal_Int8> result(oleLength);
         decompresser->doInflateSegment(result, 0, oleLength);
@@ -196,7 +196,7 @@ namespace XSLT
 
         // Compress the bytes
         Sequence<sal_Int8> output(oledata.getLength());
-        boost::scoped_ptr< ::ZipUtils::Deflater> compresser(new ::ZipUtils::Deflater((sal_Int32) 3, false));
+        std::unique_ptr< ::ZipUtils::Deflater> compresser(new ::ZipUtils::Deflater((sal_Int32) 3, false));
         compresser->setInputSegment(oledata);
         compresser->finish();
         int compressedDataLength = compresser->doDeflateSegment(output, 0, oledata.getLength());
diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx
index f73772cf92ab..0838c0af613b 100644
--- a/forms/inc/pch/precompiled_frm.hxx
+++ b/forms/inc/pch/precompiled_frm.hxx
@@ -24,7 +24,6 @@
 #include "svtools/imageresourceaccess.hxx"
 #include <algorithm>
 #include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/awt/ActionEvent.hpp>
 #include <com/sun/star/awt/FontEmphasisMark.hpp>
 #include <com/sun/star/awt/FontRelief.hpp>
diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx
index e4210c5b1eb7..3570a8458490 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.cxx
@@ -22,7 +22,7 @@
 #include <tools/debug.hxx>
 #include <cppuhelper/queryinterface.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace frm
 {
@@ -172,7 +172,7 @@ void OComponentEventThread::run()
             ::cppu::OComponentHelper *pCompImpl = m_pCompImpl;
 
             ThreadEvents::iterator firstEvent( m_aEvents.begin() );
-            boost::scoped_ptr<EventObject> pEvt(*firstEvent);
+            std::unique_ptr<EventObject> pEvt(*firstEvent);
             m_aEvents.erase( firstEvent );
 
             ThreadObjects::iterator firstControl( m_aControls.begin() );
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 1ea2a33e7dcb..bb7384779734 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -54,7 +54,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <svl/urihelper.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #define ID_OPEN_GRAPHICS            1
 #define ID_CLEAR_GRAPHICS           2
@@ -403,7 +403,7 @@ void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream)
 bool OImageControlModel::impl_updateStreamForURL_lck( const OUString& _rURL, ValueChangeInstigator _eInstigator )
 {
     // create a stream for the image specified by the URL
-    boost::scoped_ptr< SvStream > pImageStream;
+    std::unique_ptr< SvStream > pImageStream;
     Reference< XInputStream > xImageStream;
 
     if ( ::svt::GraphicAccess::isSupportedURL( _rURL ) )
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 4e54c53a382e..3fd364fdf512 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -45,7 +45,7 @@
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 
 #include <com/sun/star/frame/XModel.hpp>
@@ -803,7 +803,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
     // SYNCHRONIZED ----->
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
 
-    boost::scoped_ptr< ElementDescription > aAutoDeleteMetaData;
+    std::unique_ptr< ElementDescription > aAutoDeleteMetaData;
     ElementDescription* pElementMetaData = _pApprovalResult;
     if ( !pElementMetaData )
     {   // not yet approved by the caller -> do ourself
@@ -951,7 +951,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
     OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implReplaceByIndex: precondition not met (index)!" );
 
     // approve the new object
-    boost::scoped_ptr< ElementDescription > aElementMetaData( createElementMetaData() );
+    std::unique_ptr< ElementDescription > aElementMetaData( createElementMetaData() );
     DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::implReplaceByIndex: createElementMetaData returned nonsense!" );
     {
         Reference< XPropertySet > xElementProps;
@@ -1099,7 +1099,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const An
 {
     Reference< XPropertySet > xElementProps;
 
-    boost::scoped_ptr< ElementDescription > aElementMetaData( createElementMetaData() );
+    std::unique_ptr< ElementDescription > aElementMetaData( createElementMetaData() );
     DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::insertByName: createElementMetaData returned nonsense!" );
 
     // ensure the correct name of the element
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index b04e121abaeb..bce9f149c848 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -35,7 +35,7 @@
 
 #include <algorithm>
 #include <functional>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace frm
 {
@@ -85,7 +85,7 @@ namespace frm
         RichTextEngine* pClone( NULL );
         {
             SolarMutexGuard aGuard;
-            boost::scoped_ptr<EditTextObject> pMyText(CreateTextObject());
+            std::unique_ptr<EditTextObject> pMyText(CreateTextObject());
             OSL_ENSURE( pMyText, "RichTextEngine::Clone: CreateTextObject returned nonsense!" );
 
             pClone = Create();
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 82fb8b9bb682..476fc8cc9410 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -52,10 +52,7 @@
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/interaction.hxx>
 #include <comphelper/processfactory.hxx>
-#include <boost/scoped_ptr.hpp>
-
-
-
+#include <memory>
 
 using com::sun::star::beans::UnknownPropertyException;
 using com::sun::star::beans::PropertyVetoException;
@@ -249,7 +246,7 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler )
         xResult, aMethod.equalsIgnoreAsciiCase("get"));
 
     // submit result; set encoding, etc.
-    boost::scoped_ptr<CSubmission> xSubmission;
+    std::unique_ptr<CSubmission> xSubmission;
     if (aMethod.equalsIgnoreAsciiCase("PUT"))
         xSubmission.reset(new CSubmissionPut( getAction(), aFragment));
     else if (aMethod.equalsIgnoreAsciiCase("post"))
diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx
index 66cb1cee28b3..bdd073cfd3d6 100644
--- a/forms/source/xforms/submission/serialization_app_xml.cxx
+++ b/forms/source/xforms/submission/serialization_app_xml.cxx
@@ -38,8 +38,8 @@
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
 
-#include <boost/scoped_ptr.hpp>
 #include <limits>
+#include <memory>
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Exception;
diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx
index 0d8078b327f1..e5cfd3b2e5e4 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/io/Pipe.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace css::uno;
 using namespace css::ucb;
@@ -50,7 +50,7 @@ CSubmissionGet::CSubmissionGet(const OUString& aURL, const css::uno::Reference<
 CSubmission::SubmissionResult CSubmissionGet::submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler)
 {
     // GET always uses application/x-www-formurlencoded
-    boost::scoped_ptr< CSerialization > apSerialization(new CSerializationURLEncoded());
+    std::unique_ptr< CSerialization > apSerialization(new CSerializationURLEncoded());
     apSerialization->setSource(m_aFragment);
     apSerialization->serialize();
 
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 3080ed48e49b..0617bc003927 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <cppuhelper/implbase.hxx>
 #include <vcl/evntpost.hxx>
 #include <vcl/vclptr.hxx>
@@ -90,7 +90,7 @@ class CloseDispatcher : public  ::cppu::WeakImplHelper<
         /** @short  used for asynchronous callbacks within the main thread.
             @descr  Internally we work asynchronous. Because our callis
                     are not aware, that her request can kill its own environment ... */
-        boost::scoped_ptr<vcl::EventPoster> m_aAsyncCallback;
+        std::unique_ptr<vcl::EventPoster> m_aAsyncCallback;
 
         /** @short  used inside asynchronous callback to decide,
                     which operation must be executed. */
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 8919ad829f78..db393677e694 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -18,8 +18,6 @@
 #include <algorithm>
 #include <boost/bind.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/awt/Command.hpp>
 #include <com/sun/star/awt/ContainerWindowProvider.hpp>
 #include <com/sun/star/awt/DeviceInfo.hpp>
diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx
index 9bb5ac56ba53..5d98a734c677 100644
--- a/framework/inc/pch/precompiled_fwl.hxx
+++ b/framework/inc/pch/precompiled_fwl.hxx
@@ -15,7 +15,6 @@
 */
 
 #include <algorithm>
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index f3013ddc8bb1..a88bc651243f 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -44,7 +44,7 @@
 #include <vcl/pngwrite.hxx>
 #include <rtl/instance.hxx>
 #include <svtools/miscopt.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::XInterface;
@@ -458,7 +458,7 @@ bool ImageManagerImpl::implts_loadUserImages(
                 {
                     BitmapEx aUserBitmap;
                     {
-                        boost::scoped_ptr<SvStream> pSvStream(utl::UcbStreamHelper::CreateStream( xBitmapStream ));
+                        std::unique_ptr<SvStream> pSvStream(utl::UcbStreamHelper::CreateStream( xBitmapStream ));
                         vcl::PNGReader aPngReader( *pSvStream );
                         aUserBitmap = aPngReader.Read();
                     }
@@ -538,7 +538,7 @@ bool ImageManagerImpl::implts_storeUserImages(
                 if ( xBitmapStream.is() )
                 {
                     {
-                        boost::scoped_ptr<SvStream> pSvStream(utl::UcbStreamHelper::CreateStream( xBitmapStream ));
+                        std::unique_ptr<SvStream> pSvStream(utl::UcbStreamHelper::CreateStream( xBitmapStream ));
                         vcl::PNGWriter aPngWriter( pImageList->GetAsHorizontalStrip() );
                         aPngWriter.Write( *pSvStream );
                     }
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index f37038e6817d..227bfd832d74 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -42,7 +42,7 @@
 #include <svtools/menuoptions.hxx>
 #include <svtools/popupmenucontrollerbase.hxx>
 #include <osl/mutex.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 // Copied from svx
 // Function-Id's
@@ -256,7 +256,7 @@ ControlMenuController::~ControlMenuController()
 // private function
 void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu )
 {
-    boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag()));
+    std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag()));
     ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr );
     aResId.SetRT( RSC_IMAGELIST );
 
@@ -393,7 +393,7 @@ void ControlMenuController::impl_setPopupMenu()
 {
     if ( m_pResPopupMenu == 0 )
     {
-        boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag()));
+        std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag()));
         if ( pResMgr )
         {
             ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr );
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index fa4b07b32676..3c6d941b301c 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -36,7 +36,7 @@
 #include <vcl/settings.hxx>
 #include <svtools/ctrltool.hxx>
 #include <osl/mutex.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 //  Defines
 
@@ -134,7 +134,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
 
     if ( pVCLPopupMenu )
     {
-        boost::scoped_ptr<FontList> pFontList;
+        std::unique_ptr<FontList> pFontList;
         ScopedVclPtr<Printer>  pInfoPrinter;
         OUString   aPrinterName;
 
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 34e761f22f6a..5e6c19fd2bd0 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -39,7 +39,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/toolbox.hxx>
 #include <svtools/miscopt.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
@@ -127,7 +127,7 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star
 
 bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage )
 {
-    boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ ));
+    std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ ));
     if ( pStream && ( pStream->GetErrorCode() == 0 ))
     {
         // Use graphic class to also support more graphic formats (bmp,png,...)
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 384c3e1e0a5f..07e977e3e2b9 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -43,7 +43,7 @@
 #include <svtools/acceleratorexecute.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <osl/mutex.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 //  Defines
 
@@ -325,7 +325,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
     if ( pVCLPopupMenu )
     {
         MenuConfiguration aMenuCfg( m_xContext );
-        boost::scoped_ptr<BmkMenu> pSubMenu;
+        std::unique_ptr<BmkMenu> pSubMenu;
 
         if ( m_bNewMenu )
             pSubMenu.reset(static_cast<BmkMenu*>(aMenuCfg.CreateBookmarkMenu( m_xFrame, BOOKMARK_NEWMENU )));
diff --git a/hwpfilter/source/hiodev.h b/hwpfilter/source/hiodev.h
index aac99c94a0d7..7df035a59b4d 100644
--- a/hwpfilter/source/hiodev.h
+++ b/hwpfilter/source/hiodev.h
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <sal/types.h>
 
 #include "hwplib.h"
@@ -77,7 +77,7 @@ class HStreamIODev : public HIODev
 {
     private:
 /* zlib으로 압축을 풀기 위한 자료 구조 */
-        boost::scoped_ptr<HStream> _stream;
+        std::unique_ptr<HStream> _stream;
         gz_stream *_gzfp;
     public:
         HStreamIODev(HStream* stream);
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 17546ef9ee15..1eb5a8052835 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/languagetagicu.hxx>
 #include <sal/log.hxx>
@@ -28,6 +27,7 @@
 
 #include <unicode/rbnf.h>
 #include <unicode/normlzr.h>
+#include <memory>
 
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::uno;
@@ -79,7 +79,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_I
     if (!U_SUCCESS(nCode))
         return retValue;
 
-    boost::scoped_ptr<NumberFormat> xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
+    std::unique_ptr<NumberFormat> xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
     if (!U_SUCCESS(nCode))
         return retValue;
 
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 440f4aa0ff3e..6a639fa718cb 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <com/sun/star/i18n/KCharacterType.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
@@ -29,6 +28,7 @@
 #include "unicode_data.h"
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <rtl/character.hxx>
+#include <memory>
 
 // Workaround for glibc braindamage:
 // glibc 2.4's langinfo.h does "#define CURRENCY_SYMBOL __CURRENCY_SYMBOL"
@@ -980,7 +980,7 @@ OUString SAL_CALL unicode::formatPercent(double dNumber,
 
     icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag);
 
-    boost::scoped_ptr<NumberFormat> xF(
+    std::unique_ptr<NumberFormat> xF(
         NumberFormat::createPercentInstance(aLocale, errorCode));
     if(U_FAILURE(errorCode))
     {
diff --git a/package/inc/pch/precompiled_package2.hxx b/package/inc/pch/precompiled_package2.hxx
index f7143254501c..32525b766a85 100644
--- a/package/inc/pch/precompiled_package2.hxx
+++ b/package/inc/pch/precompiled_package2.hxx
@@ -16,7 +16,6 @@
 
 #include "com/sun/star/io/XAsyncOutputMonitor.hpp"
 #include <algorithm>
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index eae3fa4dd84f..d3d713be0327 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -69,7 +69,7 @@
 #include "com/sun/star/io/XAsyncOutputMonitor.hpp"
 
 #include <cstring>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <vector>
 
 #include <comphelper/processfactory.hxx>
@@ -492,18 +492,18 @@ void ZipPackage::parseContentType()
 
 void ZipPackage::getZipFileContents()
 {
-    boost::scoped_ptr < ZipEnumeration > pEnum ( m_pZipFile->entries() );
+    std::unique_ptr < ZipEnumeration > xEnum(m_pZipFile->entries());
     ZipPackageStream *pPkgStream;
     ZipPackageFolder *pPkgFolder, *pCurrent;
     OUString sTemp, sDirName;
     sal_Int32 nOldIndex, nIndex, nStreamIndex;
     FolderHash::iterator aIter;
 
-    while ( pEnum->hasMoreElements() )
+    while (xEnum->hasMoreElements())
     {
         nIndex = nOldIndex = 0;
         pCurrent = m_pRootFolder;
-        const ZipEntry & rEntry = *pEnum->nextElement();
+        const ZipEntry & rEntry = *xEnum->nextElement();
         OUString rName = rEntry.sPath;
 
         if ( m_bForceRecovery )
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index d52b4bdf21f2..c76d6520590f 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <EncryptedDataHeader.hxx>
 #include <rtl/instance.hxx>
-#include <boost/scoped_ptr.hpp>
 
 using namespace com::sun::star;
 using namespace com::sun::star::packages::zip::ZipConstants;
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index f016a88d55db..2d7905e6b966 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -55,7 +55,7 @@ std::type_info const & getSimpleReferenceObjectTypeInfo()
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace {
 
@@ -108,7 +108,7 @@ public:
 
 void Test::testCondition() {
     osl::Mutex mutex;
-    boost::scoped_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
+    std::unique_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
     CPPUNIT_ASSERT(typeid (*p.get()) != typeid (salhelper::Condition));
     CPPUNIT_ASSERT(typeid (p.get()) == typeid (salhelper::Condition *));
     CPPUNIT_ASSERT(
@@ -221,12 +221,12 @@ void Test::testSimpleReferenceObject() {
 
 void Test::testDerivedCondition() {
     osl::Mutex mutex;
-    boost::scoped_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
+    std::unique_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
     CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != 0);
 }
 
 void Test::testDerivedConditionWaiterTimedout() {
-    boost::scoped_ptr< salhelper::ConditionWaiter::timedout > p(
+    std::unique_ptr< salhelper::ConditionWaiter::timedout > p(
         new DerivedConditionWaiterTimedout);
     CPPUNIT_ASSERT(
         dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != 0);
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 3c2a9dff652c..342964f238a3 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -52,7 +52,7 @@
 #include "com/sun/star/uri/UriReferenceFactory.hpp"
 #include "com/sun/star/uri/XVndSunStarScriptUrl.hpp"
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -213,7 +213,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
             }
 
             // 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 ( bIsDocumentScript )
                 pUndoGuard.reset( new ::framework::DocumentUndoGuard( m_xScriptInvocation ) );
 
@@ -273,7 +273,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
         if ( pFact != NULL )
         {
-            boost::scoped_ptr<VclAbstractDialog> pDlg(
+            std::unique_ptr<VclAbstractDialog> pDlg(
                 pFact->CreateScriptErrorDialog( NULL, aException ));
 
             if ( pDlg )
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index a4224c8d393c..d984fdd236e7 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -47,7 +47,7 @@
 #include "lru_cache.h"
 #include "permissions.h"
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #define SERVICE_NAME "com.sun.star.security.AccessController"
 #define USER_CREDS "access-control.user-credentials"
@@ -533,7 +533,7 @@ inline void AccessController::clearPostPoned()
 void AccessController::checkAndClearPostPoned()
 {
     // check postponed permissions
-    boost::scoped_ptr< t_rec_vec > rec( static_cast< t_rec_vec * >( m_rec.getData() ) );
+    std::unique_ptr< t_rec_vec > rec( static_cast< t_rec_vec * >( m_rec.getData() ) );
     m_rec.setData( 0 ); // takeover ownership
     OSL_ASSERT( rec.get() );
     if (rec.get())
diff --git a/test/source/mtfxmldump.cxx b/test/source/mtfxmldump.cxx
index d95cf642c0a9..f30e72729327 100644
--- a/test/source/mtfxmldump.cxx
+++ b/test/source/mtfxmldump.cxx
@@ -15,7 +15,7 @@
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace
 {
@@ -232,7 +232,7 @@ void MetafileXmlDump::filterAllActionTypes()
 
 xmlDocPtr MetafileXmlDump::dumpAndParse(const GDIMetaFile& rMetaFile, const OUString& rTempStreamName)
 {
-    boost::scoped_ptr<SvStream> pStream;
+    std::unique_ptr<SvStream> pStream;
 
     if (rTempStreamName.isEmpty())
         pStream.reset(new SvMemoryStream());
diff --git a/test/source/primitive2dxmldump.cxx b/test/source/primitive2dxmldump.cxx
index e1be527f96a5..3d2328f51f36 100644
--- a/test/source/primitive2dxmldump.cxx
+++ b/test/source/primitive2dxmldump.cxx
@@ -14,7 +14,7 @@
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
@@ -63,7 +63,7 @@ xmlDocPtr Primitive2dXmlDump::dumpAndParse(
     const drawinglayer::primitive2d::Primitive2DSequence& rPrimitive2DSequence,
     const OUString& rTempStreamName)
 {
-    boost::scoped_ptr<SvStream> pStream;
+    std::unique_ptr<SvStream> pStream;
 
     if (rTempStreamName.isEmpty())
         pStream.reset(new SvMemoryStream());
diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx
index 1274b59bab78..46b3ed6d4129 100644
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@@ -24,7 +24,7 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace osl
 {
@@ -165,7 +165,7 @@ namespace toolkit
         virtual void SAL_CALL removeStyleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     private:
-        ::boost::scoped_ptr< WindowStyleSettings_Data > m_pData;
+        std::unique_ptr< WindowStyleSettings_Data > m_pData;
     };
 
 
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 444d7b1243d4..9bb77f8cb0d0 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -37,7 +37,7 @@
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include "helper/unopropertyarrayhelper.hxx"
 
@@ -311,7 +311,7 @@ void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit >
 
 namespace
 {
-    void lcl_setEventForwarding( const Reference< XControlModel >& i_gridControlModel, const ::boost::scoped_ptr< toolkit::GridEventForwarder >& i_listener,
+    void lcl_setEventForwarding( const Reference< XControlModel >& i_gridControlModel, const std::unique_ptr< toolkit::GridEventForwarder >& i_listener,
         bool const i_add )
     {
         const Reference< XPropertySet > xModelProps( i_gridControlModel, UNO_QUERY );
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index b10dd8de0e9e..2aa1a2202731 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -30,7 +30,7 @@
 #include <comphelper/sequence.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace toolkit
 {
@@ -139,7 +139,7 @@ protected:
 
 private:
     SelectionListenerMultiplexer                m_aSelectionListeners;
-    ::boost::scoped_ptr< GridEventForwarder >   m_pEventForwarder;
+    std::unique_ptr< GridEventForwarder >   m_pEventForwarder;
 };
 
 } // toolkit
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 9498f0652145..62095125dd86 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -49,8 +49,8 @@
 #include <vcl/svapp.hxx>
 #include <uno/data.h>
 
+#include <memory>
 #include <set>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1313,7 +1313,7 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence<
     {
         // if somebody sets properties which are single aspects of a font descriptor,
         // remove them, and build a font descriptor instead
-        boost::scoped_ptr< awt::FontDescriptor > pFD;
+        std::unique_ptr< awt::FontDescriptor > pFD;
         for ( sal_Int32 n = 0; n < nProps; ++n )
         {
             if ( ( pHandles[n] >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( pHandles[n] <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )