boost->std

Change-Id: Ic18be8b86727dd1179a7e39c70493d088ed00557

20 files changed, 53 insertions, 56 deletions

diff --git a/svtools/inc/table/defaultinputhandler.hxx b/svtools/inc/table/defaultinputhandler.hxx
index af4f668e4fc5..b9b96bbea0a3 100644
--- a/svtools/inc/table/defaultinputhandler.hxx
+++ b/svtools/inc/table/defaultinputhandler.hxx
@@ -23,7 +23,7 @@
 #include <svtools/table/tableinputhandler.hxx>
 #include <svtools/table/tabletypes.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 
 namespace svt { namespace table
@@ -38,7 +38,7 @@ namespace svt { namespace table
     class DefaultInputHandler : public ITableInputHandler
     {
     private:
-        ::boost::scoped_ptr< DefaultInputHandler_Impl > m_pImpl;
+        ::std::unique_ptr< DefaultInputHandler_Impl > m_pImpl;
 
     public:
         DefaultInputHandler();
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx
index e3f14cd341da..1fb1ce4d0308 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -22,7 +22,7 @@
 
 #include <svtools/table/tablemodel.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 
 namespace svt { namespace table
@@ -42,7 +42,7 @@ namespace svt { namespace table
     class GridTableRenderer : public ITableRenderer
     {
     private:
-        ::boost::scoped_ptr< GridTableRenderer_Impl >   m_pImpl;
+        ::std::unique_ptr< GridTableRenderer_Impl >   m_pImpl;
 
     public:
         /** creates a table renderer associated with the given model
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 2f4ef7bcf5f2..e2b8d5b1188c 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -72,8 +72,8 @@
 #include <unotools/intlwrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <svl/urlfilter.hxx>
-#include <boost/scoped_ptr.hpp>
 #include <o3tl/typed_flags_set.hxx>
+#include <memory>
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
@@ -1600,7 +1600,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
     m_aCurrentAsyncActionHandler = Link<void*,void>();
 
     // minimum time to wait
-    boost::scoped_ptr< TimeValue > pTimeout( new TimeValue );
+    std::unique_ptr< TimeValue > pTimeout( new TimeValue );
     sal_Int32 nMinTimeout = pAsyncDescriptor->nMinTimeout;
     OSL_ENSURE( nMinTimeout > 0, "SvtFileView_Impl::GetFolderContent_Impl: invalid minimum timeout!" );
     if ( nMinTimeout <= 0 )
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index fa7b37d90c8a..d04a3e60e87b 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -36,7 +36,7 @@
 #include <svtools/svmedit.hxx>
 
 #include <algorithm>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <vcl/idle.hxx>
 
 #define IMPICNVIEW_ACC_RETURN 1
@@ -302,7 +302,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, size_t
 
 void SvxIconChoiceCtrl_Impl::CreateAutoMnemonics( MnemonicGenerator* _pGenerator )
 {
-    boost::scoped_ptr< MnemonicGenerator > pAutoDeleteOwnGenerator;
+    std::unique_ptr< MnemonicGenerator > pAutoDeleteOwnGenerator;
     if ( !_pGenerator )
     {
         _pGenerator = new MnemonicGenerator;
@@ -661,7 +661,7 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& rRenderContext, const Rec
     rRenderContext.SetClipRegion(vcl::Region(rRect));
 
     SvxIconChoiceCtrlEntryList_impl* pNewZOrderList = new SvxIconChoiceCtrlEntryList_impl();
-    boost::scoped_ptr<SvxIconChoiceCtrlEntryList_impl> pPaintedEntries(new SvxIconChoiceCtrlEntryList_impl());
+    std::unique_ptr<SvxIconChoiceCtrlEntryList_impl> pPaintedEntries(new SvxIconChoiceCtrlEntryList_impl());
 
     size_t nPos = 0;
     while(nCount)
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 414ed855750f..8f080bc440e7 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -36,7 +36,7 @@
 #include <svtools/svtools.hrc>
 #include <svtools/svtresid.hxx>
 #include <svtools/calendar.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #define DAY_OFFX                        4
 #define DAY_OFFY                        2
@@ -1056,7 +1056,7 @@ void Calendar::ImplUpdateSelection( IntDateSet* pOld )
 void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest,
                                 bool bMove, bool bExpand, bool bExtended )
 {
-    boost::scoped_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
+    std::unique_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
     Date    aOldDate = maCurDate;
     Date    aTempDate = rDate;
 
@@ -1307,7 +1307,7 @@ void Calendar::ImplEndTracking( bool bCancel )
 
         if ( !bSpinDown )
         {
-            boost::scoped_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
+            std::unique_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
             Date    aOldDate = maCurDate;
             maCurDate       = maOldCurDate;
             *mpSelectTable  = *mpOldSelectTable;
@@ -1519,7 +1519,7 @@ void Calendar::KeyInput( const KeyEvent& rKEvt )
     {
         if ( bMultiSel && bExpand )
         {
-            boost::scoped_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
+            std::unique_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
             Date aOldAnchorDate = maAnchorDate;
             mbSelLeft = aNewDate < maAnchorDate;
             if ( !bExtended )
@@ -1707,7 +1707,7 @@ void Calendar::SelectDate( const Date& rDate, bool bSelect )
     if ( !rDate.IsValidAndGregorian() )
         return;
 
-    boost::scoped_ptr<IntDateSet> pOldSel;
+    std::unique_ptr<IntDateSet> pOldSel;
 
     if ( !mbInSelChange )
         pOldSel.reset(new IntDateSet( *mpSelectTable ));
@@ -1720,7 +1720,7 @@ void Calendar::SelectDate( const Date& rDate, bool bSelect )
 
 void Calendar::SetNoSelection()
 {
-    boost::scoped_ptr<IntDateSet> pOldSel;
+    std::unique_ptr<IntDateSet> pOldSel;
 
     if ( !mbInSelChange )
         pOldSel.reset(new IntDateSet( *mpSelectTable ));
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 7ad59d401ef9..c428286b1414 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -29,8 +29,7 @@
 #include <svtools/svtools.hrc>
 #include <svtools/colorcfg.hxx>
 
-#include <boost/scoped_ptr.hpp>
-
+#include <memory>
 #include <vector>
 
 using namespace std;
@@ -2024,7 +2023,7 @@ void Ruler::MouseButtonDown( const MouseEvent& rMEvt )
         }
         else
         {
-            boost::scoped_ptr<RulerSelection> pHitTest(new RulerSelection);
+            std::unique_ptr<RulerSelection> pHitTest(new RulerSelection);
             bool bHitTestResult = ImplHitTest(aMousePos, pHitTest.get());
 
             if ( nMouseClicks == 1 )
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 8c054a52ad79..ffd58182b890 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -46,7 +46,7 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 
@@ -250,7 +250,7 @@ sal_Int16 SvFilterOptionsDialog::execute()
             FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, meFieldUnit );
             aFltCallDlgPara.aFilterData = maFilterDataSequence;
 
-            boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ));
+            std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ));
             aFltCallDlgPara.pResMgr = pResMgr.get();
 
             aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat );
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index f0020618878c..6db1ffa47839 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -33,7 +33,7 @@
 
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #define UNOGRAPHIC_GRAPHICTYPE  1
 #define UNOGRAPHIC_MIMETYPE     2
@@ -75,7 +75,7 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic )
 
 void GraphicDescriptor::init( const OUString& rURL )
 {
-    boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, StreamMode::READ ));
+    std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, StreamMode::READ ));
 
     if( pIStm )
         implCreate( *pIStm, &rURL );
@@ -83,7 +83,7 @@ void GraphicDescriptor::init( const OUString& rURL )
 
 void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL )
 {
-    boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rxIStm ));
+    std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rxIStm ));
 
     if( pIStm )
         implCreate( *pIStm, &rURL );
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 2e29e31240a7..1aa1ecbffe75 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -30,7 +30,7 @@
 #include <rtl/strbuf.hxx>
 #include "grfcache.hxx"
 #include <rtl/crc.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #define MAX_BMP_EXTENT  4096
 
@@ -865,7 +865,7 @@ void GraphicCache::AddGraphicObject(
         if( !bInserted )
         {
             GraphicCacheEntryList::iterator it = maGraphicCache.begin();
-            boost::scoped_ptr< GraphicID > apID;
+            std::unique_ptr< GraphicID > apID;
 
             if( !pID )
             {
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 54e54f569991..e6fbd3f3024d 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -37,7 +37,7 @@
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::XInterface;
@@ -238,7 +238,7 @@ void GraphicObject::ImplAutoSwapIn()
 
                             if( osl::FileBase::getFileURLFromSystemPath( GetLink(), aURLStr ) == osl::FileBase::E_None )
                             {
-                                boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::READ ));
+                                std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::READ ));
 
                                 if( pIStm )
                                 {
@@ -1141,7 +1141,7 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const OUString &rURL )
         Graphic     aGraphic;
         if ( !aURL.isEmpty() )
         {
-            boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READ ));
+            std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READ ));
             if( pStream )
                 GraphicConverter::Import( *pStream, aGraphic );
         }
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index afca9bc366a0..d5b0a1d1173e 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -45,7 +45,7 @@
 #include <svtools/grfmgr.hxx>
 #include "provider.hxx"
 #include <vcl/dibtools.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace com::sun::star;
 
@@ -239,7 +239,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O
         OString aResMgrName(OUStringToOString(
             rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US));
 
-        boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() ));
+        std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() ));
 
         if( pResMgr )
         {
@@ -384,7 +384,7 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co
 {
     uno::Reference< ::graphic::XGraphic >   xRet;
     OUString                                aPath;
-    boost::scoped_ptr<SvStream>             pIStm;
+    std::unique_ptr<SvStream>             pIStm;
 
     uno::Reference< io::XInputStream > xIStm;
     uno::Reference< awt::XBitmap >xBtm;
@@ -727,7 +727,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG
 {
     SolarMutexGuard g;
 
-    boost::scoped_ptr<SvStream> pOStm;
+    std::unique_ptr<SvStream> pOStm;
     OUString    aPath;
     sal_Int32   i;
 
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 397ba4013b5c..5cd02f85ca71 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -28,7 +28,7 @@
 #include <svtools/svtresid.hxx>
 #include <svtools/svtools.hrc>
 #include <svtools/sfxecode.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 
 static sal_uInt16 aWndFunc(
@@ -275,7 +275,7 @@ bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const
 
 {
     bool bRet = false;
-    boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() ));
+    std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() ));
     if( pResMgr )
     {
         ResId aId(RID_ERRHDL, *pResMgr );
@@ -302,7 +302,7 @@ bool SfxErrorHandler::GetMessageString(
 
 {
     bool bRet = false;
-    boost::scoped_ptr<ResId> pResId(new ResId(nId, *pMgr));
+    std::unique_ptr<ResId> pResId(new ResId(nId, *pMgr));
 
     ErrorResource_Impl aEr(*pResId, (sal_uInt16)lErrId);
     if(aEr)
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index b25c98848090..98137214b5e4 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -50,7 +50,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace com::sun::star;
 
@@ -434,7 +434,7 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate )
         return;
     }
 
-    boost::scoped_ptr<SvStream> pGraphicStream(GetGraphicStream( bUpdate ));
+    std::unique_ptr<SvStream> pGraphicStream(GetGraphicStream( bUpdate ));
     if ( pGraphicStream )
     {
         GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
@@ -532,7 +532,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream
     mpImpl->aMediaType = rMediaType;
     mpImpl->mnGraphicVersion++;
 
-    boost::scoped_ptr<SvStream> pGraphicStream(::utl::UcbStreamHelper::CreateStream( xInGrStream ));
+    std::unique_ptr<SvStream> pGraphicStream(::utl::UcbStreamHelper::CreateStream( xInGrStream ));
 
     if ( pGraphicStream )
     {
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 2b7ff4bc8f64..63aa45bd68b1 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -33,7 +33,7 @@
 
 #include <string.h>
 #include <math.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 
 #define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator();  \
@@ -81,7 +81,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
     rOStm.WriteBool( bActive );
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding);
 
-    boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rOStm, StreamMode::WRITE ));
+    std::unique_ptr<IMapCompat> pCompat(new IMapCompat( rOStm, StreamMode::WRITE ));
 
     WriteIMapObject( rOStm );
     aEventList.Write( rOStm );                                      // V4
@@ -110,7 +110,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
 
     // make URL absolute
     aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS );
-    boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, StreamMode::READ ));
+    std::unique_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, StreamMode::READ ));
 
     ReadIMapObject( rIStm );
 
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 617024251dcc..8145532dba84 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -59,7 +59,7 @@
 #include <vcl/dibtools.hxx>
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 // - Namespaces -
 
@@ -333,7 +333,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
 
                     if( maAny >>= aSeq )
                     {
-                        boost::scoped_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
+                        std::unique_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
                         GDIMetaFile     aMtf;
 
                         ReadGDIMetaFile( *pSrcStm, aMtf );
@@ -363,7 +363,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
 
                     if( maAny >>= aSeq )
                     {
-                        boost::scoped_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
+                        std::unique_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
                         GDIMetaFile     aMtf;
 
                         ReadGDIMetaFile( *pSrcStm, aMtf );
@@ -1988,7 +1988,7 @@ bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransf
 
                     if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.getLength() - 4).equalsIgnoreAsciiCase(".URL") )
                     {
-                        boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ),
+                        std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ),
                                                                                   STREAM_STD_READ ));
 
                         if( !pStream || pStream->GetError() )
diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx
index d634b5cfc10f..32315c221c6c 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -35,7 +35,7 @@
 #include <unotools/syslocale.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <unordered_map>
 
 namespace svt
@@ -96,7 +96,7 @@ namespace svt
         virtual ::sal_Int32 getFormatKey() const = 0;
     };
 
-    typedef ::boost::shared_ptr< IValueNormalization > PValueNormalization;
+    typedef std::shared_ptr< IValueNormalization > PValueNormalization;
     typedef std::unordered_map< OUString, PValueNormalization, OUStringHash >    NormalizerCache;
 
 
diff --git a/svtools/source/table/cellvalueconversion.hxx b/svtools/source/table/cellvalueconversion.hxx
index 23091bd0391f..59b91affeacc 100644
--- a/svtools/source/table/cellvalueconversion.hxx
+++ b/svtools/source/table/cellvalueconversion.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 
 namespace svt
@@ -43,7 +43,7 @@ namespace svt
         OUString convertToString( const ::com::sun::star::uno::Any& i_cellValue );
 
     private:
-        ::boost::scoped_ptr< CellValueConversion_Data > m_pData;
+        ::std::unique_ptr< CellValueConversion_Data > m_pData;
     };
 
 
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 583ebed423cd..4d916d10a30d 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -33,7 +33,7 @@
 #include <vcl/settings.hxx>
 #include <tools/diagnose_ex.h>
 
-#include <boost/optional.hpp>
+#include <memory>
 #include <vector>
 
 // space around an item
@@ -97,7 +97,7 @@ namespace svt
     protected:
         ~ITabBarRenderer() {}
     };
-    typedef ::boost::shared_ptr< ITabBarRenderer >  PTabBarRenderer;
+    typedef std::shared_ptr< ITabBarRenderer >  PTabBarRenderer;
 
 
     //= VCLItemRenderer - declaration
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index b3504d9d5f55..c8388b91d5a2 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -186,7 +186,7 @@ namespace svt { namespace uno
     {
         ENSURE_OR_RETURN( m_xController.is(), "WizardShell::createPage: no WizardController!", NULL );
 
-        ::boost::shared_ptr< WizardPageController > pController( new WizardPageController( *this, m_xController, impl_stateToPageId( i_nState ) ) );
+        std::shared_ptr< WizardPageController > pController( new WizardPageController( *this, m_xController, impl_stateToPageId( i_nState ) ) );
         VclPtr<TabPage> pPage = pController->getTabPage();
         OSL_ENSURE( pPage, "WizardShell::createPage: illegal tab page!" );
         if ( !pPage )
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index 68650dd067cf..fcdc7d1ddcd6 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -22,11 +22,9 @@
 
 #include <com/sun/star/ui/dialogs/XWizardController.hpp>
 #include <com/sun/star/ui/dialogs/XWizard.hpp>
-
 #include <svtools/roadmapwizard.hxx>
-
-#include <boost/shared_ptr.hpp>
 #include <map>
+#include <memory>
 
 
 namespace svt { namespace uno
@@ -34,7 +32,7 @@ namespace svt { namespace uno
 
 
     class WizardPageController;
-    typedef ::boost::shared_ptr< WizardPageController > PWizardPageController;
+    typedef std::shared_ptr< WizardPageController > PWizardPageController;
 
 
     //= WizardShell