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>

8 files changed, 15 insertions, 19 deletions

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