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>

7 files changed, 18 insertions, 22 deletions

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();