boost->std

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

36 files changed, 76 insertions, 123 deletions

diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index a830a6511137..98943bbafcff 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -61,11 +61,7 @@
 #include <basic/sbx.hxx>
 #include <basic/sbxmeth.hxx>
 #include <bitset>
-#include <boost/make_shared.hpp>
-#include <boost/ref.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <cassert>
 #include <cmath>
 #include <com/sun/star/awt/ContainerWindowProvider.hpp>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index a69e8a1eeb17..b6bae428c595 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -96,7 +96,6 @@
 #include <com/sun/star/util/thePathSettings.hpp>
 
 #include "dlgname.hxx"
-#include <boost/scoped_ptr.hpp>
 
 #define PRTSTR(x) OUStringToOString(x, RTL_TEXTENCODING_ASCII_US).pData->buffer
 
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 2e9e87793b6a..246d5d5706ac 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -44,7 +44,6 @@
 
 #include <algorithm>
 #include <set>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 45d302f260b7..0312c9683fc2 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -59,7 +59,6 @@
 #include <svtools/langtab.hxx>
 #include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1469,7 +1468,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                 //text has been added on the right and only the 'error attribute has to be corrected
                 if(pErrorAttrLeft)
                 {
-                    boost::scoped_ptr<TextAttrib> pNewError(pErrorAttrLeft->GetAttr().Clone());
+                    std::unique_ptr<TextAttrib> pNewError(pErrorAttrLeft->GetAttr().Clone());
                     const sal_Int32 nStart = pErrorAttrLeft->GetStart();
                     sal_Int32 nEnd = pErrorAttrLeft->GetEnd();
                     pTextEngine->RemoveAttrib( 0, *pErrorAttrLeft );
@@ -1488,7 +1487,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                     //determine the change
                     sal_Int32 nAddedChars = GetText().getLength() - nCurrentLen;
 
-                    boost::scoped_ptr<TextAttrib> pNewError(pErrorAttr->GetAttr().Clone());
+                    std::unique_ptr<TextAttrib> pNewError(pErrorAttr->GetAttr().Clone());
                     sal_Int32 nStart = pErrorAttr->GetStart();
                     sal_Int32 nEnd = pErrorAttr->GetEnd();
                     pTextEngine->RemoveAttrib( 0, *pErrorAttr );
@@ -1504,7 +1503,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 
                     if(pBackAttrLeft)
                     {
-                        boost::scoped_ptr<TextAttrib> pNewBack(pBackAttrLeft->GetAttr().Clone());
+                        std::unique_ptr<TextAttrib> pNewBack(pBackAttrLeft->GetAttr().Clone());
                         const sal_Int32 _nStart = pBackAttrLeft->GetStart();
                         const sal_Int32 _nEnd = pBackAttrLeft->GetEnd();
                         pTextEngine->RemoveAttrib( 0, *pBackAttrLeft );
@@ -1530,7 +1529,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                     m_nErrorEnd = pFontColor->GetEnd();
                     if(pErrorAttrib->GetStart() != m_nErrorStart || pErrorAttrib->GetEnd() != m_nErrorEnd)
                     {
-                        boost::scoped_ptr<TextAttrib> pNewError(pErrorAttrib->GetAttr().Clone());
+                        std::unique_ptr<TextAttrib> pNewError(pErrorAttrib->GetAttr().Clone());
                         pTextEngine->RemoveAttrib( 0, *pErrorAttr );
                         SetAttrib( *pNewError, 0, m_nErrorStart, m_nErrorEnd );
                     }
@@ -1690,7 +1689,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, Languag
     // undo expanded attributes!
     if( pBackAttrib && pBackAttrib->GetStart() < m_nErrorStart && pBackAttrib->GetEnd() == m_nErrorEnd + nDiffLen)
     {
-        boost::scoped_ptr<TextAttrib> pNewBackground(pBackAttrib->GetAttr().Clone());
+        std::unique_ptr<TextAttrib> pNewBackground(pBackAttrib->GetAttr().Clone());
         const sal_Int32 nStart = pBackAttrib->GetStart();
         pTextEngine->RemoveAttrib(0, *pBackAttrib);
         pTextEngine->SetAttrib(*pNewBackground, 0, nStart, m_nErrorStart);
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 8929c98c12d0..26b18e1c8311 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -36,7 +36,6 @@
 #include <comphelper/string.hxx>
 #include <svx/svxdlg.hxx>
 #include <sal/macros.h>
-#include <boost/scoped_ptr.hpp>
 
 using namespace css::uno;
 using namespace css::i18n;
@@ -356,7 +355,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void
 {
     if (m_ppbApproxSettings == pButton)
     {
-        boost::scoped_ptr<AbstractSvxSearchSimilarityDialog> pDlg;
+        std::unique_ptr<AbstractSvxSearchSimilarityDialog> pDlg;
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if ( pFact )
@@ -378,7 +377,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
-            boost::scoped_ptr<AbstractSvxJSearchOptionsDialog> aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() ));
+            std::unique_ptr<AbstractSvxJSearchOptionsDialog> aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() ));
             DBG_ASSERT(aDlg, "Dialog creation failed!");
             aDlg->Execute();
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index bf221cd3ee9b..caf97258b599 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -32,7 +32,6 @@
 #include <svx/svxdlg.hxx>
 #include <cuires.hrc>
 #include <vcl/builderfactory.hxx>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::ucbhelper;
 
@@ -183,7 +182,7 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
         SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetTopFrame() : 0;
         if ( pFrame )
         {
-            boost::scoped_ptr<TargetList> pList(new TargetList);
+            std::unique_ptr<TargetList> pList(new TargetList);
             pFrame->GetTargetList(*pList);
             if( !pList->empty() )
             {
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index e41cbc22509a..8aac59a7e2d3 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -35,7 +35,6 @@
 #include <vcl/settings.hxx>
 
 #include <dialmgr.hxx>
-#include <boost/scoped_ptr.hpp>
 
 SvPasteObjectDialog::SvPasteObjectDialog( vcl::Window* pParent )
     : ModalDialog(pParent, "PasteSpecialDialog", "cui/ui/pastespecial.ui")
@@ -186,7 +185,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe
 
         if( aTypeName.isEmpty() && aSourceName.isEmpty() )
         {
-            boost::scoped_ptr<ResMgr> pMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ));
+            std::unique_ptr<ResMgr> pMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ));
             // global resource from svtools (former so3 resource)
             if( pMgr )
                 aSourceName = OUString( ResId( STR_UNKNOWN_SOURCE, *pMgr ) );
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index f689b51618ad..1ac98183d69f 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -62,7 +62,6 @@
 #include <tools/urlobj.hxx>
 #include <vector>
 #include <algorithm>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace css::uno;
@@ -72,7 +71,7 @@ using namespace css::document;
 
 void ShowErrorDialog( const Any& aException )
 {
-    boost::scoped_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( NULL, aException ));
+    std::unique_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( NULL, aException ));
     pDlg->Execute();
 }
 
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index cdf2ed91d22b..5f53852e20df 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -19,7 +19,6 @@
 
 #include <vcl/msgbox.hxx>
 #include "cuicharmap.hxx"
-#include <boost/scoped_ptr.hpp>
 
 // hook to call special character dialog for edits
 // caution: needs C-Linkage since dynamically loaded via symbol name
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 8e911729fe5f..541d060033ad 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -26,7 +26,6 @@
 #include <vcl/fixed.hxx>
 
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 // forward ---------------------------------------------------------------
 
@@ -43,10 +42,10 @@ private:
     VclPtr<CheckBox> m_pUseDataCB;
     // rows
     struct Row;
-    std::vector<boost::shared_ptr<Row> > vRows;
+    std::vector<std::shared_ptr<Row> > vRows;
     // fields
     struct Field;
-    std::vector<boost::shared_ptr<Field> > vFields;
+    std::vector<std::shared_ptr<Field> > vFields;
     // "name" fields
     unsigned nNameRow;
     unsigned nShortNameField;
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 61e8f22354b2..53eea6bdb7cc 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -30,7 +30,6 @@
 #include <unotools/textsearch.hxx>
 
 #include <vector>
-#include <boost/shared_ptr.hpp>
 #include <iostream>
 
 using namespace svx;
@@ -239,7 +238,7 @@ bool CuiAboutConfigTabPage::FillItemSet()
 {
     bool bModified = false;
 
-    std::vector< boost::shared_ptr< Prop_Impl > >::iterator pIter;
+    std::vector< std::shared_ptr< Prop_Impl > >::iterator pIter;
     for( pIter = m_vectorOfModified.begin() ; pIter != m_vectorOfModified.end(); ++pIter )
     {
         Reference< XNameAccess > xUpdateAccess = getConfigAccess( (*pIter)->Name , true );
@@ -511,7 +510,7 @@ Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( const OUString&
     return xNameAccess;
 }
 
-void CuiAboutConfigTabPage::AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp )
+void CuiAboutConfigTabPage::AddToModifiedVector( const std::shared_ptr< Prop_Impl >& rProp )
 {
     bool isModifiedBefore = false;
     //Check if value modified before
@@ -595,7 +594,7 @@ IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void )
         OUString sPropertyType = SvTabListBox::GetEntryText( pEntry, 2 );
         OUString sPropertyValue = SvTabListBox::GetEntryText( pEntry, 3 );
 
-        boost::shared_ptr< Prop_Impl > pProperty (new Prop_Impl( pUserData->sPropertyPath, sPropertyName, makeAny( sPropertyValue ) ) );
+        std::shared_ptr< Prop_Impl > pProperty (new Prop_Impl( pUserData->sPropertyPath, sPropertyName, makeAny( sPropertyValue ) ) );
         bool bSaveChanges = false;
 
         bool bOpenDialog = true;
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index daa9456b619f..45d7fd5457e2 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -19,8 +19,6 @@
 #include <vcl/edit.hxx>
 
 #include <vector>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 
 namespace svx { class OptHeaderTabListBox; }
 class CuiAboutConfigTabPage;
@@ -50,14 +48,14 @@ private:
     VclPtr<Edit> m_pSearchEdit;
 
     SvTreeListEntries m_modifiedPrefBoxEntries;
-    std::vector< boost::shared_ptr< Prop_Impl > > m_vectorOfModified;
+    std::vector< std::shared_ptr< Prop_Impl > > m_vectorOfModified;
     VclPtr< SvSimpleTable > m_pPrefBox;
 
      //for search
     css::util::SearchOptions m_options;
     SvTreeListEntries m_prefBoxEntries;
 
-    void AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp );
+    void AddToModifiedVector( const std::shared_ptr< Prop_Impl >& rProp );
     static std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString );
     void InsertEntry( SvTreeListEntry *pEntry);
 
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 913b8a230f0f..3feb235a0ae9 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -22,7 +22,6 @@
 #include <svtools/miscopt.hxx>
 #include <iostream>
 #include <officecfg/Office/BasicIDE.hxx>
-#include <boost/shared_ptr.hpp>
 #include <cuires.hrc>
 
 SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet )
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index a6c58658056b..830b89864776 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -32,8 +32,6 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <svx/svxdlg.hxx>
 #include <helpid.hrc>
 #include <dialmgr.hxx>
@@ -253,9 +251,9 @@ private:
     };
 
     // vChapters -- groups (group headers)
-    std::vector<boost::shared_ptr<Chapter> > vChapters;
+    std::vector<std::shared_ptr<Chapter> > vChapters;
     // vEntries -- color options
-    std::vector<boost::shared_ptr<Entry> > vEntries;
+    std::vector<std::shared_ptr<Entry> > vEntries;
 
     // module options
     SvtModuleOptions aModuleOptions;
@@ -551,7 +549,7 @@ void ColorConfigWindow_Impl::CreateEntries()
     for (unsigned i = 0; i != nGroupCount; ++i)
     {
         aModulesInstalled[i] = IsGroupVisible(vGroupInfo[i].eGroup);
-        vChapters.push_back(boost::shared_ptr<Chapter>(
+        vChapters.push_back(std::shared_ptr<Chapter>(
             new Chapter(get<FixedText>(vGroupInfo[i].pGroup), aModulesInstalled[i])));
     }
 
@@ -577,7 +575,7 @@ void ColorConfigWindow_Impl::CreateEntries()
     vEntries.reserve(ColorConfigEntryCount);
     for (unsigned i = 0; i < SAL_N_ELEMENTS(vEntryInfo); ++i)
     {
-        vEntries.push_back(boost::shared_ptr<Entry>(new Entry(*this, i, nCheckBoxLabelOffset,
+        vEntries.push_back(std::shared_ptr<Entry>(new Entry(*this, i, nCheckBoxLabelOffset,
             aModulesInstalled[vEntryInfo[i].eGroup])));
     }
 
@@ -589,7 +587,7 @@ void ColorConfigWindow_Impl::CreateEntries()
         for (unsigned j = 0; j != nExtGroupCount; ++j)
         {
             OUString const sComponentName = aExtConfig.GetComponentName(j);
-            vChapters.push_back(boost::shared_ptr<Chapter>(new Chapter(
+            vChapters.push_back(std::shared_ptr<Chapter>(new Chapter(
                 m_pGrid, nLineNum,
                 aExtConfig.GetComponentDisplayName(sComponentName)
             )));
@@ -599,7 +597,7 @@ void ColorConfigWindow_Impl::CreateEntries()
             {
                 ExtendedColorConfigValue const aColorEntry =
                     aExtConfig.GetComponentColorConfigValue(sComponentName, i);
-                vEntries.push_back(boost::shared_ptr<Entry>( new Entry (
+                vEntries.push_back(std::shared_ptr<Entry>( new Entry (
                     m_pGrid, nLineNum, aColorEntry, nCheckBoxLabelOffset
                 )));
                 ++nLineNum;
@@ -1194,7 +1192,7 @@ IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, vo
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialog creation failed!");
-        boost::scoped_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( pButton,
+        std::unique_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( pButton,
                             sName, CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2) ));
         DBG_ASSERT(aNameDlg, "Dialog creation failed!");
         aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 24558d54d589..baafb9d79329 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -25,8 +25,6 @@
 #include <sfx2/tabdlg.hxx>
 #include <svx/langbox.hxx>
 
-#include <boost/scoped_ptr.hpp>
-
 class CanvasSettings;
 class SvtOptionsDrawinglayer;
 
@@ -110,7 +108,7 @@ private:
     SvtTabAppearanceCfg*    pAppearanceCfg;
     CanvasSettings*         pCanvasSettings;
     SvtOptionsDrawinglayer* mpDrawinglayerOpt;
-    boost::scoped_ptr<svt::OpenGLCfg> mpOpenGLConfig;
+    std::unique_ptr<svt::OpenGLCfg> mpOpenGLConfig;
 
     std::vector<vcl::IconThemeInfo> mInstalledIconThemes;
 
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index a17991765d80..7903b1cbea20 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -33,9 +33,6 @@
 #include <svx/dlgutil.hxx>
 #include <svx/svxids.hrc>
 
-#include <boost/ref.hpp>
-#include <boost/make_shared.hpp>
-
 namespace
 {
 
@@ -262,7 +259,7 @@ void SvxGeneralTabPage::InitControls ()
         if (!(vRowInfo[iRow].nLangFlags & LangBit))
             continue;
         // creating row
-        vRows.push_back(boost::make_shared<Row>(
+        vRows.push_back(std::make_shared<Row>(
             get<FixedText>(vRowInfo[iRow].pTextId), eRow));
         Row& rRow = *vRows.back();
         // fields in the row
@@ -275,7 +272,7 @@ void SvxGeneralTabPage::InitControls ()
         for ( ; iField != nFieldCount && vFieldInfo[iField].eRow == eRow; ++iField)
         {
             // creating edit field
-            vFields.push_back(boost::make_shared<Field>(
+            vFields.push_back(std::make_shared<Field>(
                 get<Edit>(vFieldInfo[iField].pEditId), iField));
             // "short name" field?
             if (vFieldInfo[iField].nUserOptionsId == UserOptToken::ID)
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 7f078937f2c5..40b77cb3d6bf 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -67,7 +67,6 @@
 
 #include <vector>
 #include <map>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::ucbhelper;
 using namespace ::com::sun::star;
@@ -1620,7 +1619,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void )
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
-            boost::scoped_ptr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 ));
+            std::unique_ptr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 ));
             DBG_ASSERT(aDlg, "Dialog creation failed!");
             uno::Reference< XDictionary >  xNewDic;
             if ( aDlg->Execute() == RET_OK )
@@ -1655,7 +1654,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void )
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)
                     {
-                        boost::scoped_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), xSpellChecker1, RID_SFXDLG_EDITDICT ));
+                        std::unique_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), xSpellChecker1, RID_SFXDLG_EDITDICT ));
                         DBG_ASSERT(aDlg, "Dialog creation failed!");
                         aDlg->Execute();
                     }
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 893c49e6364a..002d16e0e310 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -51,8 +51,6 @@
 #include "optHeaderTabListbox.hxx"
 #include <vcl/help.hxx>
 
-#include <boost/scoped_ptr.hpp>
-
 using namespace css::beans;
 using namespace css::lang;
 using namespace css::ui::dialogs;
@@ -551,7 +549,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void)
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if ( pFact )
         {
-            boost::scoped_ptr<AbstractSvxMultiPathDialog> pMultiDlg(
+            std::unique_ptr<AbstractSvxMultiPathDialog> pMultiDlg(
                 pFact->CreateSvxMultiPathDialog( this ));
             DBG_ASSERT( pMultiDlg, "Dialog creation failed!" );
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f386c7c423b3..1495984f4ea8 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -107,8 +107,6 @@
 #include <sys/stat.h>
 #endif
 
-#include <boost/scoped_ptr.hpp>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
@@ -2141,7 +2139,7 @@ void  OfaTreeOptionsDialog::InsertNodes( const VectorOfNodes& rNodeList )
 
 short OfaTreeOptionsDialog::Execute()
 {
-    boost::scoped_ptr< SvxDicListChgClamp > pClamp;
+    std::unique_ptr< SvxDicListChgClamp > pClamp;
     if ( !bIsFromExtensionManager )
     {
         // collect all DictionaryList Events while the dialog is executed
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index 82668264249f..b5b0988ff434 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -15,8 +15,6 @@
 
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include <boost/scoped_ptr.hpp>
-
 using namespace ::com::sun::star;
 
 TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent)
@@ -101,7 +99,7 @@ IMPL_LINK_NOARG_TYPED(TSAURLsDialog, AddHdl_Impl, Button*, void)
     OUString aDesc( get<FixedText>("enteraurl")->GetText() );
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-    boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( m_pAddBtn, aURL, aDesc));
+    std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( m_pAddBtn, aURL, aDesc));
 
     if ( pDlg->Execute() == RET_OK )
     {
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index f1e5f23dd22b..df4fbb1a402b 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -55,7 +55,6 @@
 #include <editeng/unolingu.hxx>
 #include <dialmgr.hxx>
 #include <svx/svxids.hrc>
-#include <boost/scoped_ptr.hpp>
 
 static LanguageType eLastDialogLanguage = LANGUAGE_SYSTEM;
 
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 9939e630d5a7..0450870bc34c 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -51,7 +51,6 @@
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include <svtools/grfmgr.hxx>
-#include <boost/scoped_ptr.hpp>
 
 using namespace css;
 
@@ -583,7 +582,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
     const SvxBrushItem* pBgdAttr = NULL;
     sal_uInt16 nSlot = SID_VIEW_FLD_PIC;
     sal_uInt16 nWhich = GetWhich( nSlot );
-    boost::scoped_ptr<SvxBrushItem> pTemp;
+    std::unique_ptr<SvxBrushItem> pTemp;
 
     if ( rSet.GetItemState( nWhich, false ) >= SfxItemState::DEFAULT )
     {
@@ -754,7 +753,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
             }
             else
             {
-                boost::scoped_ptr<SvxBrushItem> pTmpBrush;
+                std::unique_ptr<SvxBrushItem> pTmpBrush;
                 if ( m_pBtnLink->IsChecked() )
                 {
                     pTmpBrush.reset(new SvxBrushItem( aBgdGraphicPath,
@@ -1328,7 +1327,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox )
     sal_Int32 nSelPos = pBox->GetSelectEntryPos();
     if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos)
     {
-        boost::scoped_ptr<SvxBrushItem> xItemHolder;
+        std::unique_ptr<SvxBrushItem> xItemHolder;
         SvxBrushItem* pActItem = NULL;
         sal_uInt16 nWhich = 0;
         switch(pTableBck_Impl->nActPos)
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 6a3cdfeca9ce..3127082839dd 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -71,7 +71,6 @@
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include "svx/flagsdef.hxx"
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 22521fd51fb7..1ef5ae44a712 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -34,7 +34,6 @@
 #include <svx/dialogs.hrc>
 #include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
 
 #define CM_1_TO_TWIP        567
 #define TWIP_TO_INCH        1440
@@ -304,7 +303,7 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet)
     {
         sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_CROP );
         FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW ));
-        boost::scoped_ptr<SvxGrfCrop> pNew(static_cast<SvxGrfCrop*>(rSet->Get( nW ).Clone()));
+        std::unique_ptr<SvxGrfCrop> pNew(static_cast<SvxGrfCrop*>(rSet->Get( nW ).Clone()));
 
         pNew->SetLeft( lcl_GetValue( *m_pLeftMF, eUnit ) );
         pNew->SetRight( lcl_GetValue( *m_pRightMF, eUnit ) );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 61c3d6fc56cf..fc8e3fd07380 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -71,7 +71,6 @@
 #include <svl/aeitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/slstitm.hxx>
-#include <boost/scoped_ptr.hpp>
 #include <sfx2/filedlghelper.hxx>
 #include "svx/gallery1.hxx"
 #include "svx/galtheme.hxx"
@@ -1030,7 +1029,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, voi
         {
             xSimpleFileAccess->copy( aUserImageURL, aUserGalleryURL );
             INetURLObject gURL( aUserGalleryURL );
-                 boost::scoped_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream(
+                 std::unique_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream(
                           gURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
             if ( pIn )
             {
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 1a7d7b0b2761..0fcf338a9d42 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -61,7 +61,6 @@
 #include <svx/unobrushitemhelper.hxx>
 
 #include <numpages.hxx>
-#include <boost/scoped_ptr.hpp>
 
 // static ----------------------------------------------------------------
 
@@ -903,7 +902,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
        (m_pRegisterCB->IsChecked() || m_pRegisterCB->IsValueChangedFromSaved()))
     {
         const SfxBoolItem& rRegItem = static_cast<const SfxBoolItem&>(rOldSet.Get(SID_SWREGISTER_MODE));
-        boost::scoped_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(rRegItem.Clone()));
+        std::unique_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(rRegItem.Clone()));
         bool bCheck = m_pRegisterCB->IsChecked();
         pRegItem->SetValue(bCheck);
         rSet->Put(*pRegItem);
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 9571163ab264..71bbb4b60944 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -51,7 +51,6 @@
 #include <svl/eitem.hxx>
 #include <sfx2/request.hxx>
 #include <svl/intitem.hxx>
-#include <boost/scoped_ptr.hpp>
 
 const sal_uInt16 SvxStdParagraphTabPage::pStdRanges[] =
 {
@@ -384,7 +383,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
                             *rOutSet, SID_ATTR_PARA_REGISTER));
         if (!pBoolItem)
             return bModified;
-        boost::scoped_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(pBoolItem->Clone()));
+        std::unique_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(pBoolItem->Clone()));
         sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_REGISTER );
         bool bSet = pRegItem->GetValue();
 
@@ -2231,7 +2230,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet )
     SfxItemPool* pPool = rSet->GetPool();
     if (m_pScriptSpaceCB->IsEnabled() && m_pScriptSpaceCB->IsValueChangedFromSaved())
     {
-        boost::scoped_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
+        std::unique_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
             pPool->GetWhich(SID_ATTR_PARA_SCRIPTSPACE)).Clone()));
         pNewItem->SetValue(m_pScriptSpaceCB->IsChecked());
         rSet->Put(*pNewItem);
@@ -2239,7 +2238,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet )
     }
     if (m_pHangingPunctCB->IsEnabled() && m_pHangingPunctCB->IsValueChangedFromSaved())
     {
-        boost::scoped_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
+        std::unique_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
             pPool->GetWhich(SID_ATTR_PARA_HANGPUNCTUATION)).Clone()));
         pNewItem->SetValue(m_pHangingPunctCB->IsChecked());
         rSet->Put(*pNewItem);
@@ -2247,7 +2246,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet )
     }
     if (m_pForbiddenRulesCB->IsEnabled() && m_pForbiddenRulesCB->IsValueChangedFromSaved())
     {
-        boost::scoped_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
+        std::unique_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
             pPool->GetWhich(SID_ATTR_PARA_FORBIDDEN_RULES)).Clone()));
         pNewItem->SetValue(m_pForbiddenRulesCB->IsChecked());
         rSet->Put(*pNewItem);
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 7b45ae17f6aa..997e55ac4046 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star::text;
 #define SwFPos SvxSwFramePosString
@@ -891,7 +890,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet)
                 const SfxPoolItem* pItem = GetItem( rOldSet, SID_SW_FOLLOW_TEXT_FLOW);
                 if(pItem)
                 {
-                    boost::scoped_ptr<SfxBoolItem> pFollow(static_cast<SfxBoolItem*>(pItem->Clone()));
+                    std::unique_ptr<SfxBoolItem> pFollow(static_cast<SfxBoolItem*>(pItem->Clone()));
                     pFollow->SetValue(m_pFollowCB->IsChecked());
                     bModified |= 0 != rSet->Put(*pFollow);
                 }
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index e03c98781499..b604038fa78e 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -43,7 +43,6 @@
 //UUUU
 #include "sfx2/opengrf.hxx"
 #include <vcl/layout.hxx>
-#include <boost/scoped_ptr.hpp>
 
 using namespace com::sun::star;
 
@@ -1300,7 +1299,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
               m_pTsbOriginal->IsEnabled() &&
               m_pTsbScale->GetSavedValue() != TRISTATE_TRUE ) )
         {
-            boost::scoped_ptr<XFillBmpSizeLogItem> pItem;
+            std::unique_ptr<XFillBmpSizeLogItem> pItem;
             if( m_pTsbScale->IsEnabled() )
                 pItem.reset(new XFillBmpSizeLogItem( eState == TRISTATE_FALSE ));
             else if( m_pTsbOriginal->IsEnabled() && m_pTsbOriginal->GetState() == TRISTATE_TRUE )
@@ -1320,7 +1319,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
         //aMtrFldXSize
         OUString aStr = m_pMtrFldXSize->GetText();
         {
-            boost::scoped_ptr<XFillBmpSizeXItem> pItem;
+            std::unique_ptr<XFillBmpSizeXItem> pItem;
             TriState eScaleState = m_pTsbScale->GetState();
 
             if( m_pMtrFldXSize->IsEnabled() &&
@@ -1355,7 +1354,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
         //aMtrFldYSize
         aStr = m_pMtrFldYSize->GetText();
         {
-            boost::scoped_ptr<XFillBmpSizeYItem> pItem;
+            std::unique_ptr<XFillBmpSizeYItem> pItem;
             TriState eScaleState = m_pTsbScale->GetState();
 
             if( m_pMtrFldYSize->IsEnabled() &&
@@ -2343,7 +2342,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
 
     if( m_pMtrFldXSize->IsEnabled() )
     {
-        boost::scoped_ptr<XFillBmpSizeXItem> pItem;
+        std::unique_ptr<XFillBmpSizeXItem> pItem;
         TriState eScaleState = m_pTsbScale->GetState();
 
         if( eScaleState == TRISTATE_FALSE )
@@ -2362,7 +2361,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
 
     if( m_pMtrFldYSize->IsEnabled() )
     {
-        boost::scoped_ptr<XFillBmpSizeYItem> pItem;
+        std::unique_ptr<XFillBmpSizeYItem> pItem;
         TriState eScaleState = m_pTsbScale->GetState();
 
         if( eScaleState == TRISTATE_FALSE )
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 69e5937f1ee7..462e9abf9fff 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -46,7 +46,6 @@
 #include <dialmgr.hxx>
 #include "sfx2/opengrf.hxx"
 #include "paragrph.hrc"
-#include <boost/scoped_ptr.hpp>
 
 using namespace com::sun::star;
 
@@ -319,7 +318,7 @@ VclPtr<SfxTabPage> SvxBitmapTabPage::Create( vcl::Window* pWindow,
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
 {
-    boost::scoped_ptr<GraphicObject> pGraphicObject;
+    std::unique_ptr<GraphicObject> pGraphicObject;
     int nPos(m_pLbBitmaps->GetSelectEntryPos());
 
     if(LISTBOX_ENTRY_NOTFOUND != nPos)
@@ -507,7 +506,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void)
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "Dialog creation failed!");
-    boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+    std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
     DBG_ASSERT(pDlg, "Dialog creation failed!");
     ScopedVclPtr<MessageDialog> pWarnBox;
     sal_uInt16         nError(1);
@@ -615,7 +614,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl_Impl, Button*, void)
             INetURLObject   aURL( aDlg.GetPath() );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialog creation failed!");
-            boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aURL.GetName().getToken( 0, '.' ), aDesc ));
+            std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aURL.GetName().getToken( 0, '.' ), aDesc ));
             DBG_ASSERT(pDlg, "Dialog creation failed!");
             nError = 1;
 
@@ -686,7 +685,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickModifyHdl_Impl, Button*, void)
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialog creation failed!");
-        boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+        std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
         DBG_ASSERT(pDlg, "Dialog creation failed!");
 
         long nCount = m_pBitmapList->Count();
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 2f16de25b91c..53c04b00966d 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -45,7 +45,6 @@
 #include <cuitabline.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
 
 using namespace com::sun::star;
 
@@ -713,7 +712,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void)
     }
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-    boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+    std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
     ScopedVclPtr<MessageDialog> pWarnBox;
     sal_uInt16 nError = 1;
 
@@ -797,7 +796,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void)
             aWarningBox->Execute();
 
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-            boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+            std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
             bool bLoop = true;
 
             while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK )
@@ -841,7 +840,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void)
 
 IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void)
 {
-    boost::scoped_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParentDialog() ));
+    std::unique_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParentDialog() ));
 
     pColorDlg->SetColor (aCurrentColor);
     pColorDlg->SetMode( svtools::ColorPickerMode_MODIFY );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 0c4a25c39bc7..0396464d6fca 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -40,7 +40,6 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include "paragrph.hrc"
-#include <boost/scoped_ptr.hpp>
 
 using namespace com::sun::star;
 
@@ -340,7 +339,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
     {
         // CheckChanges(); <-- duplicate inquiry ?
 
-        boost::scoped_ptr<XGradient> pXGradient;
+        std::unique_ptr<XGradient> pXGradient;
         OUString      aString;
         sal_Int32      nPos = m_pLbGradients->GetSelectEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -453,7 +452,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void)
     }
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-    boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+    std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
     ScopedVclPtr<MessageDialog> pWarnBox;
     sal_uInt16 nError   = 1;
 
@@ -544,7 +543,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void)
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialog creation failed!");
-        boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+        std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
         DBG_ASSERT(pDlg, "Dialog creation failed!");
 
         long nCount = m_pGradientList->Count();
@@ -806,7 +805,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickSaveHdl_Impl, Button*, void)
 
 IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
 {
-    boost::scoped_ptr<XGradient> pGradient;
+    std::unique_ptr<XGradient> pGradient;
     int nPos = m_pLbGradients->GetSelectEntryPos();
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 1dae3a319f7a..cbe50521cd09 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -42,7 +42,6 @@
 #include <svx/dialmgr.hxx>
 #include "paragrph.hrc"
 #include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
 
 using namespace com::sun::star;
 
@@ -307,7 +306,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
         {
             // CheckChanges(); <-- duplicate inquiry ?
 
-            boost::scoped_ptr<XHatch> pXHatch;
+            std::unique_ptr<XHatch> pXHatch;
             OUString  aString;
             sal_Int32  nPos = m_pLbHatchings->GetSelectEntryPos();
             if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -402,7 +401,7 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p )
 
 IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
 {
-    boost::scoped_ptr<XHatch> pHatch;
+    std::unique_ptr<XHatch> pHatch;
     int nPos = m_pLbHatchings->GetSelectEntryPos();
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -497,7 +496,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void)
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "Dialog creation failed!");
-    boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+    std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
     DBG_ASSERT(pDlg, "Dialog creation failed!");
     ScopedVclPtr<MessageDialog> pWarnBox;
     sal_uInt16         nError   = 1;
@@ -581,7 +580,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void)
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialog creation failed!");
-        boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+        std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
         DBG_ASSERT(pDlg, "Dialog creation failed!");
 
         long nCount = m_pHatchingList->Count();
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 0ff3f605ea35..e044eb34c49e 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -51,7 +51,6 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
 
 #define MAX_BMP_WIDTH   16
 #define MAX_BMP_HEIGHT  16
@@ -360,7 +359,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
     {
         ScopedVclPtrInstance< VirtualDevice > pVDev;
         pVDev->SetMapMode(MapMode(MAP_100TH_MM));
-        boost::scoped_ptr<SdrModel> pModel(new SdrModel);
+        std::unique_ptr<SdrModel> pModel(new SdrModel);
         pModel->GetItemPool().FreezeIdRanges();
         // Page
         SdrPage* pPage = new SdrPage( *pModel, false );
@@ -368,7 +367,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
         pModel->InsertPage( pPage, 0 );
         {
         // 3D View
-        boost::scoped_ptr<SdrView> pView(new SdrView( pModel.get(), pVDev ));
+        std::unique_ptr<SdrView> pView(new SdrView( pModel.get(), pVDev ));
         pView->hideMarkHandles();
         pView->ShowSdrPage(pPage);
 
@@ -723,7 +722,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
         if( nPos != LISTBOX_ENTRY_NOTFOUND &&
             m_pLbLineStyle->IsValueChangedFromSaved() )
         {
-            boost::scoped_ptr<XLineStyleItem> pStyleItem;
+            std::unique_ptr<XLineStyleItem> pStyleItem;
 
             if( nPos == 0 )
                 pStyleItem.reset(new XLineStyleItem( drawing::LineStyle_NONE ));
@@ -807,7 +806,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
         nPos = m_pLbStartStyle->GetSelectEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbStartStyle->IsValueChangedFromSaved() )
         {
-            boost::scoped_ptr<XLineStartItem> pItem;
+            std::unique_ptr<XLineStartItem> pItem;
             if( nPos == 0 )
                 pItem.reset(new XLineStartItem());
             else if( m_pLineEndList->Count() > (long) ( nPos - 1 ) )
@@ -823,7 +822,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
         nPos = m_pLbEndStyle->GetSelectEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbEndStyle->IsValueChangedFromSaved() )
         {
-            boost::scoped_ptr<XLineEndItem> pItem;
+            std::unique_ptr<XLineEndItem> pItem;
             if( nPos == 0 )
                 pItem.reset(new XLineEndItem());
             else if( m_pLineEndList->Count() > (long) ( nPos - 1 ) )
@@ -879,7 +878,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
     nPos = m_pLBEdgeStyle->GetSelectEntryPos();
     if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBEdgeStyle->IsValueChangedFromSaved() )
     {
-        boost::scoped_ptr<XLineJointItem> pNew;
+        std::unique_ptr<XLineJointItem> pNew;
 
         switch(nPos)
         {
@@ -921,7 +920,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
     nPos = m_pLBCapStyle->GetSelectEntryPos();
     if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBCapStyle->IsValueChangedFromSaved() )
     {
-        boost::scoped_ptr<XLineCapItem> pNew;
+        std::unique_ptr<XLineCapItem> pNew;
 
         switch(nPos)
         {
@@ -1154,13 +1153,13 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
         ScopedVclPtrInstance< VirtualDevice > pVDev;
         pVDev->SetMapMode(MapMode(MAP_100TH_MM));
 
-        boost::scoped_ptr<SdrModel> pModel(new SdrModel);
+        std::unique_ptr<SdrModel> pModel(new SdrModel);
         pModel->GetItemPool().FreezeIdRanges();
         SdrPage* pPage = new SdrPage( *pModel, false );
         pPage->SetSize(Size(1000,1000));
         pModel->InsertPage( pPage, 0 );
         {
-        boost::scoped_ptr<SdrView> pView(new SdrView( pModel.get(), pVDev ));
+        std::unique_ptr<SdrView> pView(new SdrView( pModel.get(), pVDev ));
         pView->hideMarkHandles();
         pView->ShowSdrPage(pPage);
         SdrObject *pObj=NULL;
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index d6a48aa54112..176a6657b71c 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -42,7 +42,6 @@
 #include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
 
 #define XOUT_WIDTH    150
 
@@ -568,7 +567,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void)
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "Dialog creation failed!");
-    boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+    std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
     DBG_ASSERT(pDlg, "Dialog creation failed!");
     bool bLoop = true;
 
@@ -644,7 +643,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void)
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialog creation failed!");
-        boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+        std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
         DBG_ASSERT(pDlg, "Dialog creation failed!");
 
         long nCount = pDashList->Count();
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 22d88d359ecb..e466a09208d7 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -44,7 +44,6 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
 
 #define XOUT_WIDTH    150
 
@@ -348,7 +347,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void)
 
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialog creation failed!");
-            boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+            std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
             DBG_ASSERT(pDlg, "Dialog creation failed!");
             bool bLoop = true;
 
@@ -461,7 +460,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void)
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialog creation failed!");
-        boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+        std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
         DBG_ASSERT(pDlg, "Dialog creation failed!");
         bool bLoop = true;