diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-15 15:35:44 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-16 15:34:23 +0100 |
commit | 31ebd9f475f94fb4f05bbeaa8077122a2635d528 (patch) | |
tree | 0f3eb9182102e613ee08706750e2b72fd1db239e /svtools/source/graphic | |
parent | 21b2cb540aaa308ea1911af34dc4862a24dcb545 (diff) |
boost->std
Change-Id: Ic18be8b86727dd1179a7e39c70493d088ed00557
Diffstat (limited to 'svtools/source/graphic')
-rw-r--r-- | svtools/source/graphic/descriptor.cxx | 6 | ||||
-rw-r--r-- | svtools/source/graphic/grfcache.cxx | 4 | ||||
-rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 6 | ||||
-rw-r--r-- | svtools/source/graphic/provider.cxx | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index f0020618878c..6db1ffa47839 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -33,7 +33,7 @@ #include <vcl/graph.hxx> #include <vcl/svapp.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #define UNOGRAPHIC_GRAPHICTYPE 1 #define UNOGRAPHIC_MIMETYPE 2 @@ -75,7 +75,7 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic ) void GraphicDescriptor::init( const OUString& rURL ) { - boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, StreamMode::READ )); + std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, StreamMode::READ )); if( pIStm ) implCreate( *pIStm, &rURL ); @@ -83,7 +83,7 @@ void GraphicDescriptor::init( const OUString& rURL ) void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL ) { - boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rxIStm )); + std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rxIStm )); if( pIStm ) implCreate( *pIStm, &rURL ); diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 2e29e31240a7..1aa1ecbffe75 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -30,7 +30,7 @@ #include <rtl/strbuf.hxx> #include "grfcache.hxx" #include <rtl/crc.h> -#include <boost/scoped_ptr.hpp> +#include <memory> #define MAX_BMP_EXTENT 4096 @@ -865,7 +865,7 @@ void GraphicCache::AddGraphicObject( if( !bInserted ) { GraphicCacheEntryList::iterator it = maGraphicCache.begin(); - boost::scoped_ptr< GraphicID > apID; + std::unique_ptr< GraphicID > apID; if( !pID ) { diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 54e54f569991..e6fbd3f3024d 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> using com::sun::star::uno::Reference; using com::sun::star::uno::XInterface; @@ -238,7 +238,7 @@ void GraphicObject::ImplAutoSwapIn() if( osl::FileBase::getFileURLFromSystemPath( GetLink(), aURLStr ) == osl::FileBase::E_None ) { - boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::READ )); + std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::READ )); if( pIStm ) { @@ -1141,7 +1141,7 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const OUString &rURL ) Graphic aGraphic; if ( !aURL.isEmpty() ) { - boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READ )); + std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READ )); if( pStream ) GraphicConverter::Import( *pStream, aGraphic ); } diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index afca9bc366a0..d5b0a1d1173e 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -45,7 +45,7 @@ #include <svtools/grfmgr.hxx> #include "provider.hxx" #include <vcl/dibtools.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace com::sun::star; @@ -239,7 +239,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O OString aResMgrName(OUStringToOString( rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US)); - boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() )); + std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() )); if( pResMgr ) { @@ -384,7 +384,7 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co { uno::Reference< ::graphic::XGraphic > xRet; OUString aPath; - boost::scoped_ptr<SvStream> pIStm; + std::unique_ptr<SvStream> pIStm; uno::Reference< io::XInputStream > xIStm; uno::Reference< awt::XBitmap >xBtm; @@ -727,7 +727,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG { SolarMutexGuard g; - boost::scoped_ptr<SvStream> pOStm; + std::unique_ptr<SvStream> pOStm; OUString aPath; sal_Int32 i; |