mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boost->std

Browse Source 
Change-Id: Idac11d3a634ba0a899db605449c894d4c3a61ead
Reviewed-on: https://gerrit.libreoffice.org/18680
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-18 09:29:33 +01:00
parent c8204ba5b8
commit f36a36b575
6 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fpicker/source/office/asyncfilepicker.cxx
View File

@@ -23,7 +23,7 @@
#include "svtools/fileview.hxx" #include "svtools/fileview.hxx"
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace svt namespace svt
@@ -76,7 +76,7 @@ namespace svt
if ( nMaxTimeout <= nMinTimeout ) if ( nMaxTimeout <= nMinTimeout )
nMaxTimeout = nMinTimeout + 30000; nMaxTimeout = nMinTimeout + 30000;
boost::scoped_ptr< FileViewAsyncAction > pActionDescriptor; std::unique_ptr< FileViewAsyncAction > pActionDescriptor;
if ( nMinTimeout ) if ( nMinTimeout )
{ {
pActionDescriptor.reset( new FileViewAsyncAction ); pActionDescriptor.reset( new FileViewAsyncAction );

8
fpicker/source/win32/filepicker/asyncrequests.hxx
View File

@@ -26,7 +26,7 @@
#include <osl/thread.hxx> #include <osl/thread.hxx>
#include <osl/time.h> #include <osl/time.h>
#include <queue> #include <queue>
#include <boost/shared_ptr.hpp> #include <memory>
namespace fpicker{ namespace fpicker{
namespace win32{ namespace win32{
@@ -113,8 +113,8 @@ class Request
::comphelper::SequenceAsHashMap m_lArguments; ::comphelper::SequenceAsHashMap m_lArguments;
}; };
typedef ::boost::shared_ptr< Request > RequestRef; typedef std::shared_ptr< Request > RequestRef;
typedef ::std::queue< RequestRef > RequestQueue; typedef std::queue< RequestRef > RequestQueue;
class RequestHandler class RequestHandler
@@ -125,7 +125,7 @@ class RequestHandler
virtual void after() = 0; virtual void after() = 0;
}; };
typedef ::boost::shared_ptr< RequestHandler > RequestHandlerRef; typedef std::shared_ptr< RequestHandler > RequestHandlerRef;
/** @todo document me /** @todo document me

7
fpicker/source/win32/filepicker/filepickerstate.cxx
View File

@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <boost/scoped_ptr.hpp>
#include "filepickerstate.hxx" #include "filepickerstate.hxx"
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "controlaccess.hxx" #include "controlaccess.hxx"
@@ -32,6 +30,7 @@
#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XInterface.hpp>
#include <osl/file.hxx> #include <osl/file.hxx>
#include "FileOpenDlg.hxx" #include "FileOpenDlg.hxx"
#include <memory>
#include "../misc/WinImplHelper.hxx" #include "../misc/WinImplHelper.hxx"
@@ -104,7 +103,7 @@ Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int
if (m_FirstControlCommand) if (m_FirstControlCommand)
{ {
// pass the request along the command-chain // pass the request along the command-chain
boost::scoped_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &value_request ) ); std::unique_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &value_request ) );
OSL_ENSURE( result.get(), "invalid getValue request" ); OSL_ENSURE( result.get(), "invalid getValue request" );
@@ -168,7 +167,7 @@ OUString SAL_CALL CNonExecuteFilePickerState::getLabel( sal_Int16 aControlId )
CControlCommandRequest label_request( aControlId ); CControlCommandRequest label_request( aControlId );
// pass the request along the command-chain // pass the request along the command-chain
boost::scoped_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &label_request ) ); std::unique_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &label_request ) );
OSL_ENSURE( result->hasResult( ), "invalid getValue request" ); OSL_ENSURE( result->hasResult( ), "invalid getValue request" );

1
vcl/inc/pch/precompiled_vcl.hxx
View File

@@ -137,7 +137,6 @@
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include <memory> #include <memory>
#include <boost/shared_ptr.hpp>
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
#include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/AccessibleEventObject.hpp>

4
vcl/inc/win/salbmp.h
View File

@@ -23,7 +23,7 @@
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <win/wincomp.hxx> #include <win/wincomp.hxx>
#include <salbmp.hxx> #include <salbmp.hxx>
#include <boost/shared_ptr.hpp> #include <memory>
// - SalBitmap - // - SalBitmap -
@@ -32,7 +32,7 @@ class BitmapColor;
class BitmapPalette; class BitmapPalette;
class SalGraphics; class SalGraphics;
namespace Gdiplus { class Bitmap; } namespace Gdiplus { class Bitmap; }
typedef boost::shared_ptr< Gdiplus::Bitmap > GdiPlusBmpPtr; typedef std::shared_ptr< Gdiplus::Bitmap > GdiPlusBmpPtr;
class WinSalBitmap : public SalBitmap class WinSalBitmap : public SalBitmap
{ {

3
vcl/osx/DataFlavorMapping.hxx
View File

@@ -31,7 +31,6 @@
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include <boost/shared_ptr.hpp>
/* An interface to get the clipboard data in either /* An interface to get the clipboard data in either
system or OOo format. system or OOo format.
@@ -123,7 +122,7 @@ private:
mutable OfficeOnlyTypes maOfficeOnlyTypes; mutable OfficeOnlyTypes maOfficeOnlyTypes;
}; };
typedef boost::shared_ptr<DataFlavorMapper> DataFlavorMapperPtr_t; typedef std::shared_ptr<DataFlavorMapper> DataFlavorMapperPtr_t;
#endif // INCLUDED_VCL_OSX_DATAFLAVORMAPPING_HXX #endif // INCLUDED_VCL_OSX_DATAFLAVORMAPPING_HXX