diff options
Diffstat (limited to 'framework/source')
5 files changed, 12 insertions, 12 deletions
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index f3013ddc8bb1..a88bc651243f 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -44,7 +44,7 @@ #include <vcl/pngwrite.hxx> #include <rtl/instance.hxx> #include <svtools/miscopt.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; @@ -458,7 +458,7 @@ bool ImageManagerImpl::implts_loadUserImages( { BitmapEx aUserBitmap; { - boost::scoped_ptr<SvStream> pSvStream(utl::UcbStreamHelper::CreateStream( xBitmapStream )); + std::unique_ptr<SvStream> pSvStream(utl::UcbStreamHelper::CreateStream( xBitmapStream )); vcl::PNGReader aPngReader( *pSvStream ); aUserBitmap = aPngReader.Read(); } @@ -538,7 +538,7 @@ bool ImageManagerImpl::implts_storeUserImages( if ( xBitmapStream.is() ) { { - boost::scoped_ptr<SvStream> pSvStream(utl::UcbStreamHelper::CreateStream( xBitmapStream )); + std::unique_ptr<SvStream> pSvStream(utl::UcbStreamHelper::CreateStream( xBitmapStream )); vcl::PNGWriter aPngWriter( pImageList->GetAsHorizontalStrip() ); aPngWriter.Write( *pSvStream ); } diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index f37038e6817d..227bfd832d74 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -42,7 +42,7 @@ #include <svtools/menuoptions.hxx> #include <svtools/popupmenucontrollerbase.hxx> #include <osl/mutex.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> // Copied from svx // Function-Id's @@ -256,7 +256,7 @@ ControlMenuController::~ControlMenuController() // private function void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) { - boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag())); + std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag())); ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr ); aResId.SetRT( RSC_IMAGELIST ); @@ -393,7 +393,7 @@ void ControlMenuController::impl_setPopupMenu() { if ( m_pResPopupMenu == 0 ) { - boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag())); + std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag())); if ( pResMgr ) { ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr ); diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index fa4b07b32676..3c6d941b301c 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -36,7 +36,7 @@ #include <vcl/settings.hxx> #include <svtools/ctrltool.hxx> #include <osl/mutex.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> // Defines @@ -134,7 +134,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r if ( pVCLPopupMenu ) { - boost::scoped_ptr<FontList> pFontList; + std::unique_ptr<FontList> pFontList; ScopedVclPtr<Printer> pInfoPrinter; OUString aPrinterName; diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 34e761f22f6a..5e6c19fd2bd0 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -39,7 +39,7 @@ #include <vcl/graphicfilter.hxx> #include <vcl/toolbox.hxx> #include <svtools/miscopt.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; using namespace ::com::sun::star::awt; @@ -127,7 +127,7 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage ) { - boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ )); + std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ )); if ( pStream && ( pStream->GetErrorCode() == 0 )) { // Use graphic class to also support more graphic formats (bmp,png,...) diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 384c3e1e0a5f..07e977e3e2b9 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -43,7 +43,7 @@ #include <svtools/acceleratorexecute.hxx> #include <unotools/moduleoptions.hxx> #include <osl/mutex.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> // Defines @@ -325,7 +325,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup if ( pVCLPopupMenu ) { MenuConfiguration aMenuCfg( m_xContext ); - boost::scoped_ptr<BmkMenu> pSubMenu; + std::unique_ptr<BmkMenu> pSubMenu; if ( m_bNewMenu ) pSubMenu.reset(static_cast<BmkMenu*>(aMenuCfg.CreateBookmarkMenu( m_xFrame, BOOKMARK_NEWMENU ))); |