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>
This commit is contained in:
Caolán McNamara
2015-09-17 17:10:47 +01:00
parent c8ee3be0e0
commit 3a00aaef2a
81 changed files with 177 additions and 206 deletions

View File

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

View File

@@ -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 ) )

View File

@@ -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

View File

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

View File

@@ -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"))

View File

@@ -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;

View File

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