diff options
156 files changed, 353 insertions, 511 deletions
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index e2634f933f32..6ba85f4b196a 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -103,7 +103,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString rtl::OUString url; osl::FileBase::getFileURLFromSystemPath( fileName, url ); - boost::shared_ptr<SvStream> stream( utl::UcbStreamHelper::CreateStream( url, + std::shared_ptr<SvStream> stream( utl::UcbStreamHelper::CreateStream( url, STREAM_STD_READ ) ); vcl::PNGReader reader( *stream ); diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx index 83fd08aae496..ce0fd809f718 100644 --- a/avmedia/source/vlc/vlcframegrabber.hxx +++ b/avmedia/source/vlc/vlcframegrabber.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX #define INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX -#include <boost/shared_ptr.hpp> #include <com/sun/star/media/XFrameGrabber.hpp> #include <cppuhelper/implbase.hxx> #include "vlccommon.hxx" diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 4bb502f8ba5e..8801498bf7d0 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -396,7 +396,7 @@ void LanguageBox::FillBox() m_sCurrentText = GetSelectEntry(); ClearBox(); - boost::shared_ptr<LocalizationMgr> pCurMgr(GetShell()->GetCurLocalizationMgr()); + std::shared_ptr<LocalizationMgr> pCurMgr(GetShell()->GetCurLocalizationMgr()); if ( pCurMgr->isLibraryLocalized() ) { Enable(); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index b7135ce282d1..7aab76158f51 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -73,8 +73,8 @@ friend class CodeCompleteListBox; private: class ChangesListener; - boost::scoped_ptr<ExtTextView> pEditView; - boost::scoped_ptr<ExtTextEngine> pEditEngine; + std::unique_ptr<ExtTextView> pEditView; + std::unique_ptr<ExtTextEngine> pEditEngine; ModulWindow& rModulWindow; rtl::Reference< ChangesListener > listener_; @@ -92,7 +92,7 @@ private: // progress bar class ProgressInfo; - boost::scoped_ptr<ProgressInfo> pProgress; + std::unique_ptr<ProgressInfo> pProgress; virtual void DataChanged(DataChangedEvent const & rDCEvt) SAL_OVERRIDE; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 971cb24a2359..f97ffbebf6f7 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -221,8 +221,6 @@ private: EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : Window(pParent, WB_BORDER), - pEditView(0), - pEditEngine(0), rModulWindow(*pModulWindow), nCurTextWidth(0), aHighlighter(HIGHLIGHT_BASIC), diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 92d6837f83ee..5a3b9c52a122 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -1088,7 +1088,7 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script bool bCopyResourcesForDialog = true; if( bAddDialogLanguagesToLib ) { - boost::shared_ptr<LocalizationMgr> pCurMgr = pShell->GetCurLocalizationMgr(); + std::shared_ptr<LocalizationMgr> pCurMgr = pShell->GetCurLocalizationMgr(); lang::Locale aFirstLocale; aFirstLocale = aOnlyInImportLanguages[0]; diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index bcaa2a976a79..a4215bb10b74 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -557,7 +557,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) break; case SID_BASICIDE_SHOWWINDOW: { - boost::scoped_ptr< ScriptDocument > pDocument; + std::unique_ptr< ScriptDocument > pDocument; SFX_REQUEST_ARG( rReq, pDocumentItem, SfxStringItem, SID_BASICIDE_ARG_DOCUMENT, false ); if ( pDocumentItem ) @@ -906,7 +906,7 @@ void Shell::GetState(SfxItemSet &rSet) else { OUString aItemStr; - boost::shared_ptr<LocalizationMgr> pCurMgr(GetCurLocalizationMgr()); + std::shared_ptr<LocalizationMgr> pCurMgr(GetCurLocalizationMgr()); if ( pCurMgr->isLibraryLocalized() ) { Sequence< lang::Locale > aLocaleSeq = pCurMgr->getStringResourceManager()->getLocales(); diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index ab3c1acbd11e..7410fea52fb6 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -950,7 +950,7 @@ void Shell::SetCurLibForLocalization( const ScriptDocument& rDocument, const OUS catch (const container::NoSuchElementException& ) {} - m_pCurLocalizationMgr = boost::shared_ptr<LocalizationMgr>(new LocalizationMgr(this, rDocument, aLibName, xStringResourceManager)); + m_pCurLocalizationMgr = std::shared_ptr<LocalizationMgr>(new LocalizationMgr(this, rDocument, aLibName, xStringResourceManager)); m_pCurLocalizationMgr->handleTranslationbar(); } diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 47e765b8696c..fcc515ac3692 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -55,7 +55,7 @@ bool localesAreEqual( const Locale& rLocaleLeft, const Locale& rLocaleRight ) return bRet; } -ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) +ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, std::shared_ptr<LocalizationMgr> xLMgr) : ModalDialog(pParent, "ManageLanguagesDialog", "modules/BasicIDE/ui/managelanguages.ui") , m_xLocalizationMgr(xLMgr) , m_sDefLangStr(IDE_RESSTR(RID_STR_DEF_LANG)) @@ -230,7 +230,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl) // class SetDefaultLanguageDialog ----------------------------------------------- -SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) +SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent, std::shared_ptr<LocalizationMgr> xLMgr) : ModalDialog(pParent, "DefaultLanguageDialog", "modules/BasicIDE/ui/defaultlanguage.ui") , m_pCheckLangLB(NULL) , m_xLocalizationMgr(xLMgr) diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 9206e01ea381..1dd3fc13b9ee 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -28,7 +28,7 @@ #include <svx/ifaceids.hxx> #include <vcl/scrbar.hxx> #include <map> -#include <boost/scoped_ptr.hpp> +#include <memory> class SfxViewFactory; class SdrView; @@ -69,7 +69,7 @@ private: VclPtr<BaseWindow> pCurWin; ScriptDocument m_aCurDocument; OUString m_aCurLibName; - boost::shared_ptr<LocalizationMgr> m_pCurLocalizationMgr; + std::shared_ptr<LocalizationMgr> m_pCurLocalizationMgr; VclPtr<ScrollBar> aHScrollBar; VclPtr<ScrollBar> aVScrollBar; @@ -160,7 +160,7 @@ public: BaseWindow* GetCurWindow() const { return pCurWin; } ScriptDocument const& GetCurDocument() const { return m_aCurDocument; } OUString const& GetCurLibName() const { return m_aCurLibName; } - boost::shared_ptr<LocalizationMgr> GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; } + std::shared_ptr<LocalizationMgr> GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; } TabBar& GetTabBar() { return *pTabBar; } WindowTable& GetWindowTable() { return aWindowTable; } diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index 0bd64d700fbe..469ee685f5ff 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -57,7 +57,7 @@ private: VclPtr<PushButton> m_pDeletePB; VclPtr<PushButton> m_pMakeDefPB; - boost::shared_ptr<LocalizationMgr> m_xLocalizationMgr; + std::shared_ptr<LocalizationMgr> m_xLocalizationMgr; OUString m_sDefLangStr; OUString m_sCreateLangStr; @@ -72,7 +72,7 @@ private: DECL_LINK(SelectHdl, void *); public: - ManageLanguageDialog( vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr ); + ManageLanguageDialog( vcl::Window* pParent, std::shared_ptr<LocalizationMgr> _pLMgr ); virtual ~ManageLanguageDialog(); virtual void dispose() SAL_OVERRIDE; }; @@ -87,12 +87,12 @@ private: VclPtr<FixedText> m_pDefinedFT; VclPtr<FixedText> m_pAddedFT; - boost::shared_ptr<LocalizationMgr> m_xLocalizationMgr; + std::shared_ptr<LocalizationMgr> m_xLocalizationMgr; void FillLanguageBox(); public: - SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr); + SetDefaultLanguageDialog(vcl::Window* pParent, std::shared_ptr<LocalizationMgr> xLMgr); virtual ~SetDefaultLanguageDialog(); virtual void dispose() SAL_OVERRIDE; diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx index 6b8dc9024674..815c78b80195 100644 --- a/basctl/source/inc/scriptdocument.hxx +++ b/basctl/source/inc/scriptdocument.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/io/XInputStreamProvider.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> #include <vector> class SfxListener; @@ -67,7 +67,7 @@ namespace basctl { private: class Impl; - boost::shared_ptr<Impl> m_pImpl; + std::shared_ptr<Impl> m_pImpl; private: /** creates a ScriptDocument instance which operates on the application-wide diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index b9c2a6d9b34e..41a78527d580 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -37,7 +37,6 @@ #include <unordered_map> #include <vector> #include <map> -#include <boost/shared_ptr.hpp> void registerComponentToBeDisposedForBasic( css::uno::Reference< css::lang::XComponent > xComponent, StarBASIC* pBasic ); @@ -110,7 +109,7 @@ class SbUnoObject: public SbxObject bool bNeedIntrospection; bool bNativeCOMObject; css::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection! - ::boost::shared_ptr< SbUnoStructRefObject > maStructInfo; + std::shared_ptr< SbUnoStructRefObject > maStructInfo; // help method to establish the dbg_-properties void implCreateDbgProperties(); diff --git a/canvas/source/directx/dx_bitmap.hxx b/canvas/source/directx/dx_bitmap.hxx index 90ebd05cbd7b..b17c7f5364a1 100644 --- a/canvas/source/directx/dx_bitmap.hxx +++ b/canvas/source/directx/dx_bitmap.hxx @@ -22,10 +22,10 @@ #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> -#include <boost/shared_ptr.hpp> #include <basegfx/vector/b2ivector.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/range/b2drange.hxx> +#include <memory> #include "dx_winstuff.hxx" #include "dx_ibitmap.hxx" #include "dx_graphicsprovider.hxx" @@ -79,7 +79,7 @@ namespace dxcanvas bool mbAlpha; }; - typedef ::boost::shared_ptr< DXBitmap > DXBitmapSharedPtr; + typedef std::shared_ptr< DXBitmap > DXBitmapSharedPtr; } #endif diff --git a/canvas/source/directx/dx_bitmapprovider.hxx b/canvas/source/directx/dx_bitmapprovider.hxx index 1c9ae8f839c6..f363f91b694e 100644 --- a/canvas/source/directx/dx_bitmapprovider.hxx +++ b/canvas/source/directx/dx_bitmapprovider.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX #include "dx_ibitmap.hxx" -#include <boost/shared_ptr.hpp> +#include <memory> namespace dxcanvas { @@ -31,7 +31,7 @@ namespace dxcanvas virtual IBitmapSharedPtr getBitmap() const = 0; }; - typedef boost::shared_ptr<BitmapProvider> BitmapProviderSharedPtr; + typedef std::shared_ptr<BitmapProvider> BitmapProviderSharedPtr; } #endif diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index 0ed123d6ec53..d23325bc1fa8 100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx @@ -24,11 +24,7 @@ #include <com/sun/star/rendering/XBitmapCanvas.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> - #include <basegfx/vector/b2isize.hxx> - -#include <boost/shared_ptr.hpp> - #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <canvas/base/basemutexhelper.hxx> diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx index d6a788046f89..fbbdb61bfea5 100644 --- a/canvas/source/directx/dx_canvasfont.hxx +++ b/canvas/source/directx/dx_canvasfont.hxx @@ -29,7 +29,7 @@ #include <rtl/ref.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> #include <boost/noncopyable.hpp> #include "dx_winstuff.hxx" @@ -40,8 +40,8 @@ namespace dxcanvas { - typedef ::boost::shared_ptr< Gdiplus::Font > FontSharedPtr; - typedef ::boost::shared_ptr< Gdiplus::FontFamily > FontFamilySharedPtr; + typedef std::shared_ptr< Gdiplus::Font > FontSharedPtr; + typedef std::shared_ptr< Gdiplus::FontFamily > FontFamilySharedPtr; typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont, css::lang::XServiceInfo > CanvasFont_Base; diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx index f776ec73c9db..c2e0c96ecc45 100644 --- a/canvas/source/directx/dx_canvashelper_texturefill.cxx +++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <boost/bind.hpp> -#include <boost/scoped_ptr.hpp> #include <boost/tuple/tuple.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -50,7 +49,7 @@ namespace dxcanvas { namespace { - typedef ::boost::shared_ptr< Gdiplus::PathGradientBrush > PathGradientBrushSharedPtr; + typedef std::shared_ptr< Gdiplus::PathGradientBrush > PathGradientBrushSharedPtr; bool fillLinearGradient( GraphicsSharedPtr& rGraphics, const ::canvas::ParametricPolyPolygon::Values& /*rValues*/, diff --git a/canvas/source/directx/dx_gdiplususer.hxx b/canvas/source/directx/dx_gdiplususer.hxx index 2f11574b63fb..a050d24fb389 100644 --- a/canvas/source/directx/dx_gdiplususer.hxx +++ b/canvas/source/directx/dx_gdiplususer.hxx @@ -21,8 +21,7 @@ #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX #include <sal/config.h> - -#include <boost/shared_ptr.hpp> +#include <memory> /* Definition of GDIPlusUser class */ @@ -31,7 +30,7 @@ namespace dxcanvas class GDIPlusUser { public: - typedef ::boost::shared_ptr< GDIPlusUser > GDIPlusUserSharedPtr; + typedef std::shared_ptr< GDIPlusUser > GDIPlusUserSharedPtr; static GDIPlusUserSharedPtr createInstance(); ~GDIPlusUser(); diff --git a/canvas/source/directx/dx_graphicsprovider.hxx b/canvas/source/directx/dx_graphicsprovider.hxx index 1b7ec65035ae..4e8e4272d4a0 100644 --- a/canvas/source/directx/dx_graphicsprovider.hxx +++ b/canvas/source/directx/dx_graphicsprovider.hxx @@ -21,9 +21,8 @@ #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX #include "dx_winstuff.hxx" - -#include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> +#include <memory> namespace Gdiplus{ class Graphics; } @@ -39,7 +38,7 @@ namespace dxcanvas virtual GraphicsSharedPtr getGraphics() = 0; }; - typedef ::boost::shared_ptr< GraphicsProvider > GraphicsProviderSharedPtr; + typedef std::shared_ptr< GraphicsProvider > GraphicsProviderSharedPtr; } #endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX diff --git a/canvas/source/directx/dx_ibitmap.hxx b/canvas/source/directx/dx_ibitmap.hxx index 28d6ee1ad74c..c16faaf5f60b 100644 --- a/canvas/source/directx/dx_ibitmap.hxx +++ b/canvas/source/directx/dx_ibitmap.hxx @@ -22,10 +22,10 @@ #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> -#include <boost/shared_ptr.hpp> #include <basegfx/vector/b2ivector.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/range/b2drange.hxx> +#include <memory> #include "dx_graphicsprovider.hxx" namespace dxcanvas @@ -56,7 +56,7 @@ namespace dxcanvas const css::geometry::IntegerPoint2D& pos ) = 0; }; - typedef boost::shared_ptr<IBitmap> IBitmapSharedPtr; + typedef std::shared_ptr<IBitmap> IBitmapSharedPtr; } #endif diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx index 62be92b8b045..5601e21d5f45 100644 --- a/canvas/source/directx/dx_impltools.hxx +++ b/canvas/source/directx/dx_impltools.hxx @@ -28,7 +28,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/numeric/ftools.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> #include "dx_canvasfont.hxx" namespace basegfx @@ -106,11 +106,11 @@ namespace dxcanvas bool drawGdiPlusBitmap( const GraphicsSharedPtr& rGraphics, const BitmapSharedPtr& rBitmap ); - bool drawDIBits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, + bool drawDIBits( const std::shared_ptr< Gdiplus::Graphics >& rGraphics, const BITMAPINFO& rBI, const void* pBits ); - bool drawRGBABits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, + bool drawRGBABits( const std::shared_ptr< Gdiplus::Graphics >& rGraphics, const RawRGBABitmap& rRawRGBAData ); BitmapSharedPtr bitmapFromXBitmap( const css::uno::Reference< css::rendering::XBitmap >& xBitmap ); diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx index 6a61a64b09dc..b4863953a4c3 100644 --- a/canvas/source/directx/dx_rendermodule.hxx +++ b/canvas/source/directx/dx_rendermodule.hxx @@ -23,7 +23,7 @@ #include <basegfx/vector/b2ivector.hxx> #include <basegfx/range/b2irectangle.hxx> #include <canvas/rendering/irendermodule.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> #include "dx_winstuff.hxx" namespace vcl { class Window; } @@ -69,7 +69,7 @@ namespace dxcanvas virtual HWND getHWND() const = 0; }; - typedef ::boost::shared_ptr< IDXRenderModule > IDXRenderModuleSharedPtr; + typedef std::shared_ptr< IDXRenderModule > IDXRenderModuleSharedPtr; /** Factory method, to create an IRenderModule instance for the diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx index 6d1744efda73..85b2c6105749 100644 --- a/canvas/source/directx/dx_surfacebitmap.hxx +++ b/canvas/source/directx/dx_surfacebitmap.hxx @@ -130,7 +130,7 @@ namespace dxcanvas bool mbAlpha; }; - typedef ::boost::shared_ptr< DXSurfaceBitmap > DXSurfaceBitmapSharedPtr; + typedef std::shared_ptr< DXSurfaceBitmap > DXSurfaceBitmapSharedPtr; } #endif diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx index fbbe023a2cb0..b524254127c9 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.hxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX -#include <boost/shared_ptr.hpp> +#include <memory> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/rendering/StringContext.hpp> @@ -46,7 +46,7 @@ namespace dxcanvas ~TextLayoutDrawHelper(); // draw text - void drawText( const boost::shared_ptr<Gdiplus::Graphics>& rGraphics, + void drawText( const std::shared_ptr<Gdiplus::Graphics>& rGraphics, const css::rendering::ViewState& rViewState, const css::rendering::RenderState& rRenderState, const ::basegfx::B2ISize& rOutputOffset, diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx index 336dc0bd205c..38462b4690cd 100644 --- a/canvas/source/directx/dx_vcltools.cxx +++ b/canvas/source/directx/dx_vcltools.cxx @@ -64,7 +64,7 @@ namespace dxcanvas } /// Draw DI bits to given Graphics - bool drawDIBits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, + bool drawDIBits( const std::shared_ptr< Gdiplus::Graphics >& rGraphics, const void* hDIB ) { bool bRet( false ); @@ -94,7 +94,7 @@ namespace dxcanvas Reference to bitmap. Might get modified, in such a way that it will hold a DIB after a successful function call. */ - bool drawVCLBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, + bool drawVCLBitmap( const std::shared_ptr< Gdiplus::Graphics >& rGraphics, ::Bitmap& rBmp ) { BitmapSystemData aBmpSysData; @@ -467,7 +467,7 @@ namespace dxcanvas return aBmpData; } - bool drawVCLBitmapEx( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, + bool drawVCLBitmapEx( const std::shared_ptr< Gdiplus::Graphics >& rGraphics, const ::BitmapEx& rBmpEx ) { if( !rBmpEx.IsTransparent() ) @@ -483,7 +483,7 @@ namespace dxcanvas } } - bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, + bool drawVCLBitmapFromXBitmap( const std::shared_ptr< Gdiplus::Graphics >& rGraphics, const uno::Reference< rendering::XBitmap >& xBitmap ) { // TODO(F2): add support for floating point bitmap formats diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx index 422252766947..e3fb62269cac 100644 --- a/canvas/source/directx/dx_vcltools.hxx +++ b/canvas/source/directx/dx_vcltools.hxx @@ -22,9 +22,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/util/TriState.hpp> - -#include <boost/shared_ptr.hpp> - +#include <memory> namespace Gdiplus { class Graphics; } @@ -39,10 +37,10 @@ namespace dxcanvas { sal_Int32 mnWidth; sal_Int32 mnHeight; - ::boost::shared_ptr< sal_uInt8 > mpBitmapData; + std::shared_ptr< sal_uInt8 > mpBitmapData; }; - bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, + bool drawVCLBitmapFromXBitmap( const std::shared_ptr< Gdiplus::Graphics >& rGraphics, const css::uno::Reference< css::rendering::XBitmap >& xBitmap ); } diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 5ffd3abb6771..478acaf61435 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -21,8 +21,7 @@ #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX #include <algorithm> - -#include <boost/shared_ptr.hpp> +#include <memory> #include <basegfx/numeric/ftools.hxx> @@ -72,13 +71,13 @@ typedef IDirect3DSurface9 surface_type; namespace dxcanvas { // some shared pointer typedefs to Gdiplus objects - typedef ::boost::shared_ptr< Gdiplus::Graphics > GraphicsSharedPtr; - typedef ::boost::shared_ptr< Gdiplus::GraphicsPath > GraphicsPathSharedPtr; - typedef ::boost::shared_ptr< Gdiplus::Bitmap > BitmapSharedPtr; - typedef ::boost::shared_ptr< Gdiplus::CachedBitmap > CachedBitmapSharedPtr; - typedef ::boost::shared_ptr< Gdiplus::Font > FontSharedPtr; - typedef ::boost::shared_ptr< Gdiplus::Brush > BrushSharedPtr; - typedef ::boost::shared_ptr< Gdiplus::TextureBrush > TextureBrushSharedPtr; + typedef std::shared_ptr< Gdiplus::Graphics > GraphicsSharedPtr; + typedef std::shared_ptr< Gdiplus::GraphicsPath > GraphicsPathSharedPtr; + typedef std::shared_ptr< Gdiplus::Bitmap > BitmapSharedPtr; + typedef std::shared_ptr< Gdiplus::CachedBitmap > CachedBitmapSharedPtr; + typedef std::shared_ptr< Gdiplus::Font > FontSharedPtr; + typedef std::shared_ptr< Gdiplus::Brush > BrushSharedPtr; + typedef std::shared_ptr< Gdiplus::TextureBrush > TextureBrushSharedPtr; /** COM object RAII wrapper diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx index c820d307e695..cfb8ff8163b2 100644 --- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx +++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx @@ -15,14 +15,8 @@ #include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2dsize.hxx> - -#include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> -#include <vector> - #include "ogl_canvashelper.hxx" - namespace oglcanvas { /** Helper class for basic canvas functionality. */ diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx index a99446b7ad2c..202e0634dbad 100644 --- a/canvas/source/opengl/ogl_buffercontext.hxx +++ b/canvas/source/opengl/ogl_buffercontext.hxx @@ -13,8 +13,7 @@ #include <GL/glew.h> #include <sal/config.h> -#include <boost/shared_ptr.hpp> - +#include <memory> namespace oglcanvas { @@ -31,7 +30,7 @@ namespace oglcanvas virtual GLuint getTextureId() = 0; }; - typedef ::boost::shared_ptr<IBufferContext> IBufferContextSharedPtr; + typedef std::shared_ptr<IBufferContext> IBufferContextSharedPtr; } #endif diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx index ba2d0a6dd8be..99cc42548053 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.hxx +++ b/canvas/source/opengl/ogl_canvasbitmap.hxx @@ -19,8 +19,6 @@ #include <canvas/base/basemutexhelper.hxx> #include <basegfx/vector/b2isize.hxx> -#include <boost/shared_ptr.hpp> - #include "ogl_bitmapcanvashelper.hxx" #include "ogl_spritecanvas.hxx" diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx index 12f66171b0ac..3a87a1c3e907 100644 --- a/canvas/source/opengl/ogl_canvasfont.hxx +++ b/canvas/source/opengl/ogl_canvasfont.hxx @@ -18,7 +18,6 @@ #include <rtl/ref.hxx> -#include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx index 2a9914506aeb..e7a10764a91e 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.hxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx @@ -16,7 +16,6 @@ #include <canvas/elapsedtime.hxx> #include <com/sun/star/rendering/XGraphicDevice.hpp> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> #include "ogl_buffercontext.hxx" @@ -131,7 +130,7 @@ namespace oglcanvas /// For the frame counter timings ::canvas::tools::ElapsedTime maLastUpdate; - boost::shared_ptr<TextureCache> mpTextureCache; + std::shared_ptr<TextureCache> mpTextureCache; unsigned int mnLinearTwoColorGradientProgram; unsigned int mnLinearMultiColorGradientProgram; diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index 4fa647732bdd..8922f5ca055d 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -123,7 +123,7 @@ ElapsedTime::ElapsedTime() } ElapsedTime::ElapsedTime( - boost::shared_ptr<ElapsedTime> const & pTimeBase ) + std::shared_ptr<ElapsedTime> const & pTimeBase ) : m_pTimeBase( pTimeBase ), m_fLastQueriedTime( 0.0 ), m_fStartTime( getCurrentTime() ), diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx index 75ef54402be1..c456a2983570 100644 --- a/canvas/source/tools/page.hxx +++ b/canvas/source/tools/page.hxx @@ -27,15 +27,15 @@ #include <canvas/rendering/isurface.hxx> #include <list> +#include <memory> #include <vector> -#include <boost/shared_ptr.hpp> #include "surfacerect.hxx" namespace canvas { class PageFragment; - typedef ::boost::shared_ptr< PageFragment > FragmentSharedPtr; + typedef std::shared_ptr< PageFragment > FragmentSharedPtr; /** One page of IRenderModule-provided texture space */ @@ -62,7 +62,7 @@ namespace canvas bool isValidLocation( const SurfaceRect& r ) const; }; - typedef ::boost::shared_ptr< Page > PageSharedPtr; + typedef std::shared_ptr< Page > PageSharedPtr; /** A part of a page, which gets allocated to a surface diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx index 632d4d6bae6c..9161fe438406 100644 --- a/canvas/source/tools/pagemanager.hxx +++ b/canvas/source/tools/pagemanager.hxx @@ -72,7 +72,7 @@ namespace canvas // PageManagerSharedPtr - typedef ::boost::shared_ptr< PageManager > PageManagerSharedPtr; + typedef std::shared_ptr< PageManager > PageManagerSharedPtr; } #endif diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx index 33186c11ce17..d6b8d90995e0 100644 --- a/canvas/source/tools/surface.hxx +++ b/canvas/source/tools/surface.hxx @@ -142,7 +142,7 @@ namespace canvas const ::basegfx::B2ISize& rSize ) const; }; - typedef ::boost::shared_ptr< Surface > SurfaceSharedPtr; + typedef std::shared_ptr< Surface > SurfaceSharedPtr; } #endif diff --git a/canvas/source/tools/surfaceproxy.hxx b/canvas/source/tools/surfaceproxy.hxx index 3eb7019e0f27..56f4ac7a926b 100644 --- a/canvas/source/tools/surfaceproxy.hxx +++ b/canvas/source/tools/surfaceproxy.hxx @@ -115,7 +115,7 @@ namespace canvas canvas::IColorBufferSharedPtr mpBuffer; }; - typedef ::boost::shared_ptr< SurfaceProxy > SurfaceProxySharedPtr; + typedef std::shared_ptr< SurfaceProxy > SurfaceProxySharedPtr; } #endif diff --git a/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx index 0beeda2e0467..babdf935874d 100644 --- a/canvas/source/vcl/backbuffer.hxx +++ b/canvas/source/vcl/backbuffer.hxx @@ -25,8 +25,7 @@ #include <canvas/vclwrapper.hxx> #include "outdevprovider.hxx" -#include <boost/shared_ptr.hpp> - +#include <memory> namespace vclcanvas { @@ -54,7 +53,7 @@ namespace vclcanvas VclPtr< VirtualDevice > maVDev; }; - typedef ::boost::shared_ptr< BackBuffer > BackBufferSharedPtr; + typedef std::shared_ptr< BackBuffer > BackBufferSharedPtr; } #endif // INCLUDED_CANVAS_SOURCE_VCL_BACKBUFFER_HXX diff --git a/canvas/source/vcl/bitmapbackbuffer.hxx b/canvas/source/vcl/bitmapbackbuffer.hxx index b51867994a68..1207369074da 100644 --- a/canvas/source/vcl/bitmapbackbuffer.hxx +++ b/canvas/source/vcl/bitmapbackbuffer.hxx @@ -26,8 +26,7 @@ #include <canvas/vclwrapper.hxx> #include "outdevprovider.hxx" -#include <boost/shared_ptr.hpp> - +#include <memory> namespace vclcanvas { @@ -88,7 +87,7 @@ namespace vclcanvas mutable bool mbVDevContentIsCurrent; }; - typedef ::boost::shared_ptr< BitmapBackBuffer > BitmapBackBufferSharedPtr; + typedef std::shared_ptr< BitmapBackBuffer > BitmapBackBufferSharedPtr; } diff --git a/canvas/source/vcl/cachedbitmap.hxx b/canvas/source/vcl/cachedbitmap.hxx index ffb9d571a367..acf8391933d8 100644 --- a/canvas/source/vcl/cachedbitmap.hxx +++ b/canvas/source/vcl/cachedbitmap.hxx @@ -21,17 +21,15 @@ #define INCLUDED_CANVAS_SOURCE_VCL_CACHEDBITMAP_HXX #include <canvas/base/cachedprimitivebase.hxx> - #include <svtools/grfmgr.hxx> - -#include <boost/shared_ptr.hpp> +#include <memory> /* Definition of CachedBitmap class */ namespace vclcanvas { - typedef ::boost::shared_ptr< GraphicObject > GraphicObjectSharedPtr; + typedef std::shared_ptr< GraphicObject > GraphicObjectSharedPtr; class CachedBitmap : public ::canvas::CachedPrimitiveBase { diff --git a/canvas/source/vcl/outdevprovider.hxx b/canvas/source/vcl/outdevprovider.hxx index 37c48c63a36e..c09b580cf4f9 100644 --- a/canvas/source/vcl/outdevprovider.hxx +++ b/canvas/source/vcl/outdevprovider.hxx @@ -21,8 +21,7 @@ #define INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX #include <sal/types.h> -#include <boost/shared_ptr.hpp> - +#include <memory> class OutputDevice; @@ -47,7 +46,7 @@ namespace vclcanvas virtual const OutputDevice& getOutDev() const = 0; }; - typedef ::boost::shared_ptr< OutDevProvider > OutDevProviderSharedPtr; + typedef std::shared_ptr< OutDevProvider > OutDevProviderSharedPtr; } #endif // INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx index 35bdc06a823f..cfc80557196e 100644 --- a/comphelper/inc/pch/precompiled_comphelper.hxx +++ b/comphelper/inc/pch/precompiled_comphelper.hxx @@ -20,7 +20,6 @@ #include <boost/current_function.hpp> #include <boost/noncopyable.hpp> #include <memory> -#include <boost/shared_ptr.hpp> #include <cassert> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx index a916ba90f7bd..965a93c22e41 100644 --- a/comphelper/source/misc/threadpool.cxx +++ b/comphelper/source/misc/threadpool.cxx @@ -10,9 +10,9 @@ #include <comphelper/threadpool.hxx> #include <rtl/instance.hxx> -#include <boost/shared_ptr.hpp> -#include <thread> #include <algorithm> +#include <memory> +#include <thread> namespace comphelper { @@ -111,12 +111,12 @@ ThreadPool::~ThreadPool() waitAndCleanupWorkers(); } -struct ThreadPoolStatic : public rtl::StaticWithInit< boost::shared_ptr< ThreadPool >, +struct ThreadPoolStatic : public rtl::StaticWithInit< std::shared_ptr< ThreadPool >, ThreadPoolStatic > { - boost::shared_ptr< ThreadPool > operator () () { + std::shared_ptr< ThreadPool > operator () () { sal_Int32 nThreads = std::max( std::thread::hardware_concurrency(), 1U ); - return boost::shared_ptr< ThreadPool >( new ThreadPool( nThreads ) ); + return std::shared_ptr< ThreadPool >( new ThreadPool( nThreads ) ); }; }; diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx index c47bb29e6c20..aa63ffce01bd 100644 --- a/cppcanvas/source/inc/action.hxx +++ b/cppcanvas/source/inc/action.hxx @@ -21,8 +21,7 @@ #define INCLUDED_CPPCANVAS_SOURCE_INC_ACTION_HXX #include <sal/types.h> - -#include <boost/shared_ptr.hpp> +#include <memory> namespace basegfx { @@ -146,7 +145,7 @@ namespace cppcanvas virtual sal_Int32 getActionCount() const = 0; }; - typedef ::boost::shared_ptr< Action > ActionSharedPtr; + typedef std::shared_ptr< Action > ActionSharedPtr; } } diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 6c627282d43f..dbf205ddf749 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -21,8 +21,6 @@ #define INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX #include <sal/types.h> - -#include <boost/shared_ptr.hpp> #include <cppcanvas/renderer.hxx> #include <cppcanvas/canvas.hxx> diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx index 32cf790a5d05..08ea31f52fa0 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx @@ -22,8 +22,6 @@ #include <com/sun/star/rendering/XBitmapCanvas.hpp> #include <com/sun/star/rendering/XBitmap.hpp> - -#include <boost/shared_ptr.hpp> #include <basegfx/vector/b2dsize.hxx> #include <cppcanvas/bitmapcanvas.hxx> diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx index 7a317ad60ca1..f6949b262e68 100644 --- a/cppcanvas/source/wrapper/implcolor.hxx +++ b/cppcanvas/source/wrapper/implcolor.hxx @@ -21,13 +21,9 @@ #define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX #include <com/sun/star/uno/Sequence.hxx> - -#include <boost/shared_ptr.hpp> - #include <com/sun/star/rendering/XGraphicDevice.hpp> #include <cppcanvas/color.hxx> - /* Definition of Color class */ namespace cppcanvas diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx index ba3acdb3573c..4e6674dcffbc 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.hxx +++ b/cppcanvas/source/wrapper/implcustomsprite.hxx @@ -21,15 +21,11 @@ #define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX #include <sal/types.h> - -#include <boost/shared_ptr.hpp> #include <cppcanvas/canvas.hxx> #include <cppcanvas/customsprite.hxx> - #include <implsprite.hxx> #include <implspritecanvas.hxx> - namespace cppcanvas { namespace internal diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx index 710cb41c6784..bb8793ca26ed 100644 --- a/cppcanvas/source/wrapper/implfont.hxx +++ b/cppcanvas/source/wrapper/implfont.hxx @@ -21,13 +21,9 @@ #define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX #include <com/sun/star/uno/Reference.hxx> - -#include <boost/shared_ptr.hpp> - #include <com/sun/star/rendering/XCanvas.hpp> #include <cppcanvas/font.hxx> - namespace com { namespace sun { namespace star { namespace rendering { class XCanvasFont; diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx index 094748538524..e5aeb29c0283 100644 --- a/cppcanvas/source/wrapper/implsprite.hxx +++ b/cppcanvas/source/wrapper/implsprite.hxx @@ -23,13 +23,9 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/rendering/XSprite.hpp> - -#include <boost/shared_ptr.hpp> #include <cppcanvas/sprite.hxx> - #include <implspritecanvas.hxx> - namespace cppcanvas { namespace internal diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index b2af49deee31..51374bfcf904 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -23,15 +23,9 @@ #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <basegfx/vector/b2dsize.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> - -#include <boost/shared_ptr.hpp> - - #include <cppcanvas/spritecanvas.hxx> - #include <implcanvas.hxx> - namespace cppcanvas { namespace internal @@ -76,7 +70,7 @@ namespace cppcanvas ::basegfx::B2DHomMatrix maTransformation; }; - typedef ::boost::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr; + typedef std::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr; private: ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION; diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx index 3a55d6b2a82c..6d357986e254 100644 --- a/cppu/source/threadpool/jobqueue.hxx +++ b/cppu/source/threadpool/jobqueue.hxx @@ -21,13 +21,12 @@ #define INCLUDED_CPPU_SOURCE_THREADPOOL_JOBQUEUE_HXX #include <list> +#include <memory> #include <sal/types.h> #include <osl/conditn.hxx> #include <osl/mutex.hxx> -#include <boost/shared_ptr.hpp> - namespace cppu_threadpool { extern "C" typedef void (SAL_CALL RequestFun)(void *); @@ -43,7 +42,7 @@ namespace cppu_threadpool typedef ::std::list < sal_Int64 > CallStackList; class DisposedCallerAdmin; - typedef boost::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder; + typedef std::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder; class JobQueue { diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx index d1d448f42906..ead78c3080f1 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <algorithm> #include <cstdlib> #include <osl/diagnose.h> #include <uno/threadpool.h> diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 6e7a2c06363a..9868d0cd64b5 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -20,6 +20,7 @@ #include "sal/config.h" #include <cassert> +#include <algorithm> #include <unordered_map> #include <osl/diagnose.h> diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx index b13dc0f31d2b..d1605d849911 100644 --- a/cppu/source/threadpool/threadpool.hxx +++ b/cppu/source/threadpool/threadpool.hxx @@ -29,8 +29,6 @@ #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> -#include <boost/shared_ptr.hpp> - #include "jobqueue.hxx" @@ -80,7 +78,7 @@ namespace cppu_threadpool { typedef ::std::list < struct ::cppu_threadpool::WaitingThread * > WaitingThreadList; class DisposedCallerAdmin; - typedef boost::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder; + typedef std::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder; class DisposedCallerAdmin { diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx index 0eae67893273..d54a695f1f14 100644 --- a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx +++ b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx @@ -17,8 +17,6 @@ #include <algorithm> #include <boost/noncopyable.hpp> #include <memory> -#include <boost/shared_ptr.hpp> -#include <boost/weak_ptr.hpp> #include <cassert> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/Property.hpp> diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index 2140a2f74f07..c58caf891da2 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -14,8 +14,6 @@ #include <vector> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/weak_ptr.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/ElementExistException.hpp> @@ -67,7 +65,7 @@ void insertImplementationMap( i != source.end(); ++i) { std::vector< - boost::shared_ptr< + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > > & impls = (*destination)[i->first]; impls.insert(impls.end(), i->second.begin(), i->second.end()); @@ -77,7 +75,7 @@ void insertImplementationMap( void removeFromImplementationMap( cppuhelper::ServiceManager::Data::ImplementationMap * map, std::vector< rtl::OUString > const & elements, - boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > const & implementation) { // The underlying data structures make this function somewhat inefficient, @@ -90,7 +88,7 @@ void removeFromImplementationMap( map->find(*i)); assert(j != map->end()); std::vector< - boost::shared_ptr< + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > >::iterator k(std::find(j->second.begin(), j->second.end(), implementation)); assert(k != j->second.end()); @@ -129,7 +127,7 @@ private: rtl::OUString attrUri_; rtl::OUString attrEnvironment_; rtl::OUString attrPrefix_; - boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > implementation_; }; @@ -495,7 +493,7 @@ class SingletonFactory: public: SingletonFactory( rtl::Reference< cppuhelper::ServiceManager > const & manager, - boost::shared_ptr< + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > const & implementation): manager_(manager), implementation_(implementation) @@ -516,7 +514,7 @@ private: throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; rtl::Reference< cppuhelper::ServiceManager > manager_; - boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > implementation_; }; @@ -549,7 +547,7 @@ class ImplementationWrapper: public: ImplementationWrapper( rtl::Reference< cppuhelper::ServiceManager > const & manager, - boost::shared_ptr< + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > const & implementation): manager_(manager), implementation_(implementation) @@ -587,7 +585,7 @@ private: getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; rtl::Reference< cppuhelper::ServiceManager > manager_; - boost::weak_ptr< cppuhelper::ServiceManager::Data::Implementation > + std::weak_ptr< cppuhelper::ServiceManager::Data::Implementation > implementation_; }; @@ -596,7 +594,7 @@ ImplementationWrapper::createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { - boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock(); + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock(); assert(impl); manager_->loadImplementation(Context, impl); return impl->createInstance(Context, false); @@ -608,7 +606,7 @@ ImplementationWrapper::createInstanceWithArgumentsAndContext( css::uno::Reference< css::uno::XComponentContext > const & Context) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { - boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock(); + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock(); assert(impl); manager_->loadImplementation(Context, impl); return impl->createInstanceWithArguments( @@ -634,7 +632,7 @@ ImplementationWrapper::createInstanceWithArguments( rtl::OUString ImplementationWrapper::getImplementationName() throw (css::uno::RuntimeException, std::exception) { - boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock(); + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock(); assert(impl); return impl->info->name; } @@ -649,7 +647,7 @@ css::uno::Sequence< rtl::OUString > ImplementationWrapper::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { - boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock(); + std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock(); assert(impl); if (impl->info->services.size() > static_cast< sal_uInt32 >(SAL_MAX_INT32)) @@ -773,7 +771,7 @@ void cppuhelper::ServiceManager::addSingletonContextEntries( void cppuhelper::ServiceManager::loadImplementation( css::uno::Reference< css::uno::XComponentContext > const & context, - boost::shared_ptr< Data::Implementation > & implementation) + std::shared_ptr< Data::Implementation > & implementation) { assert(implementation.get() != 0); { @@ -1014,7 +1012,7 @@ cppuhelper::ServiceManager::createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { - boost::shared_ptr< Data::Implementation > impl( + std::shared_ptr< Data::Implementation > impl( findServiceImplementation(Context, aServiceSpecifier)); return impl.get() == 0 ? css::uno::Reference< css::uno::XInterface >() @@ -1028,7 +1026,7 @@ cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext( css::uno::Reference< css::uno::XComponentContext > const & Context) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { - boost::shared_ptr< Data::Implementation > impl( + std::shared_ptr< Data::Implementation > impl( findServiceImplementation(Context, ServiceSpecifier)); return impl.get() == 0 ? css::uno::Reference< css::uno::XInterface >() @@ -1183,7 +1181,7 @@ cppuhelper::ServiceManager::createContentEnumeration( rtl::OUString const & aServiceName) throw (css::uno::RuntimeException, std::exception) { - std::vector< boost::shared_ptr< Data::Implementation > > impls; + std::vector< std::shared_ptr< Data::Implementation > > impls; { osl::MutexGuard g(rBHelper.rMutex); Data::ImplementationMap::const_iterator i( @@ -1194,7 +1192,7 @@ cppuhelper::ServiceManager::createContentEnumeration( } std::vector< css::uno::Any > factories; for (std::vector< - boost::shared_ptr< Data::Implementation > >::const_iterator i( + std::shared_ptr< Data::Implementation > >::const_iterator i( impls.begin()); i != impls.end(); ++i) { @@ -1496,7 +1494,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) { assert(implKey.getName().match("/IMPLEMENTATIONS/")); rtl::OUString name( implKey.getName().copy(RTL_CONSTASCII_LENGTH("/IMPLEMENTATIONS/"))); - boost::shared_ptr< Data::Implementation > impl( + std::shared_ptr< Data::Implementation > impl( new Data::Implementation( name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"), readLegacyRdbString(uri, implKey, "UNO/LOCATION"), "", "", "", @@ -1633,7 +1631,7 @@ void cppuhelper::ServiceManager::insertLegacyFactory( } css::uno::Reference< css::lang::XComponent > comp( factoryInfo, css::uno::UNO_QUERY); - boost::shared_ptr< Data::Implementation > impl( + std::shared_ptr< Data::Implementation > impl( new Data::Implementation(name, f1, f2, comp)); Data extra; if (!name.isEmpty()) { @@ -1739,7 +1737,7 @@ void cppuhelper::ServiceManager::removeRdbFiles( // The underlying data structures make this function somewhat inefficient, // but the assumption is that it is rarely called (and that if it is called, // it is called with a uris vector of size one): - std::vector< boost::shared_ptr< Data::Implementation > > clear; + std::vector< std::shared_ptr< Data::Implementation > > clear; { osl::MutexGuard g(rBHelper.rMutex); for (std::vector< rtl::OUString >::const_iterator i(uris.begin()); @@ -1774,7 +1772,7 @@ bool cppuhelper::ServiceManager::removeLegacyFactory( bool removeListener) { assert(factoryInfo.is()); - boost::shared_ptr< Data::Implementation > clear; + std::shared_ptr< Data::Implementation > clear; css::uno::Reference< css::lang::XComponent > comp; { osl::MutexGuard g(rBHelper.rMutex); @@ -1807,7 +1805,7 @@ bool cppuhelper::ServiceManager::removeLegacyFactory( void cppuhelper::ServiceManager::removeImplementation(const rtl::OUString & name) { // The underlying data structures make this function somewhat inefficient, // but the assumption is that it is rarely called: - boost::shared_ptr< Data::Implementation > clear; + std::shared_ptr< Data::Implementation > clear; { osl::MutexGuard g(rBHelper.rMutex); if (isDisposed()) { @@ -1840,12 +1838,12 @@ void cppuhelper::ServiceManager::removeImplementation(const rtl::OUString & name } } -boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > +std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > cppuhelper::ServiceManager::findServiceImplementation( css::uno::Reference< css::uno::XComponentContext > const & context, rtl::OUString const & specifier) { - boost::shared_ptr< Data::Implementation > impl; + std::shared_ptr< Data::Implementation > impl; bool loaded; { osl::MutexGuard g(rBHelper.rMutex); @@ -1856,7 +1854,7 @@ cppuhelper::ServiceManager::findServiceImplementation( data_.namedImplementations.find(specifier)); if (j == data_.namedImplementations.end()) { SAL_INFO("cppuhelper", "No implementation for " << specifier); - return boost::shared_ptr< Data::Implementation >(); + return std::shared_ptr< Data::Implementation >(); } impl = j->second; } else { diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index 903084b11eef..03ed72abe2c8 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -14,10 +14,10 @@ #include <cassert> #include <map> +#include <memory> #include <vector> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> @@ -138,7 +138,7 @@ public: enum Status { STATUS_NEW, STATUS_WRAPPER, STATUS_LOADED }; - boost::shared_ptr< ImplementationInfo > info; + std::shared_ptr< ImplementationInfo > info; ImplementationConstructorFn * constructor; css::uno::Reference< css::lang::XSingleComponentFactory > factory1; css::uno::Reference< css::lang::XSingleServiceFactory > factory2; @@ -155,19 +155,19 @@ public: css::uno::Reference<css::uno::XInterface> const & instance); }; - typedef std::map< rtl::OUString, boost::shared_ptr< Implementation > > + typedef std::map< rtl::OUString, std::shared_ptr< Implementation > > NamedImplementations; typedef std::map< css::uno::Reference< css::lang::XServiceInfo >, - boost::shared_ptr< Implementation > > + std::shared_ptr< Implementation > > DynamicImplementations; typedef std::map< rtl::OUString, - std::vector< boost::shared_ptr< Implementation > > > + std::vector< std::shared_ptr< Implementation > > > ImplementationMap; NamedImplementations namedImplementations; @@ -201,7 +201,7 @@ public: void loadImplementation( css::uno::Reference< css::uno::XComponentContext > const & context, - boost::shared_ptr< Data::Implementation > & implementation); + std::shared_ptr< Data::Implementation > & implementation); private: virtual ~ServiceManager() {} @@ -371,7 +371,7 @@ private: void removeImplementation(const rtl::OUString & name); - boost::shared_ptr< Data::Implementation > findServiceImplementation( + std::shared_ptr< Data::Implementation > findServiceImplementation( css::uno::Reference< css::uno::XComponentContext > const & context, rtl::OUString const & specifier); diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index a830a6511137..98943bbafcff 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -61,11 +61,7 @@ #include <basic/sbx.hxx> #include <basic/sbxmeth.hxx> #include <bitset> -#include <boost/make_shared.hpp> -#include <boost/ref.hpp> #include <memory> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> #include <cassert> #include <cmath> #include <com/sun/star/awt/ContainerWindowProvider.hpp> diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index a69e8a1eeb17..b6bae428c595 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -96,7 +96,6 @@ #include <com/sun/star/util/thePathSettings.hpp> #include "dlgname.hxx" -#include <boost/scoped_ptr.hpp> #define PRTSTR(x) OUStringToOString(x, RTL_TEXTENCODING_ASCII_US).pData->buffer diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 2e9e87793b6a..246d5d5706ac 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -44,7 +44,6 @@ #include <algorithm> #include <set> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 45d302f260b7..0312c9683fc2 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -59,7 +59,6 @@ #include <svtools/langtab.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1469,7 +1468,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) //text has been added on the right and only the 'error attribute has to be corrected if(pErrorAttrLeft) { - boost::scoped_ptr<TextAttrib> pNewError(pErrorAttrLeft->GetAttr().Clone()); + std::unique_ptr<TextAttrib> pNewError(pErrorAttrLeft->GetAttr().Clone()); const sal_Int32 nStart = pErrorAttrLeft->GetStart(); sal_Int32 nEnd = pErrorAttrLeft->GetEnd(); pTextEngine->RemoveAttrib( 0, *pErrorAttrLeft ); @@ -1488,7 +1487,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) //determine the change sal_Int32 nAddedChars = GetText().getLength() - nCurrentLen; - boost::scoped_ptr<TextAttrib> pNewError(pErrorAttr->GetAttr().Clone()); + std::unique_ptr<TextAttrib> pNewError(pErrorAttr->GetAttr().Clone()); sal_Int32 nStart = pErrorAttr->GetStart(); sal_Int32 nEnd = pErrorAttr->GetEnd(); pTextEngine->RemoveAttrib( 0, *pErrorAttr ); @@ -1504,7 +1503,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if(pBackAttrLeft) { - boost::scoped_ptr<TextAttrib> pNewBack(pBackAttrLeft->GetAttr().Clone()); + std::unique_ptr<TextAttrib> pNewBack(pBackAttrLeft->GetAttr().Clone()); const sal_Int32 _nStart = pBackAttrLeft->GetStart(); const sal_Int32 _nEnd = pBackAttrLeft->GetEnd(); pTextEngine->RemoveAttrib( 0, *pBackAttrLeft ); @@ -1530,7 +1529,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) m_nErrorEnd = pFontColor->GetEnd(); if(pErrorAttrib->GetStart() != m_nErrorStart || pErrorAttrib->GetEnd() != m_nErrorEnd) { - boost::scoped_ptr<TextAttrib> pNewError(pErrorAttrib->GetAttr().Clone()); + std::unique_ptr<TextAttrib> pNewError(pErrorAttrib->GetAttr().Clone()); pTextEngine->RemoveAttrib( 0, *pErrorAttr ); SetAttrib( *pNewError, 0, m_nErrorStart, m_nErrorEnd ); } @@ -1690,7 +1689,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, Languag // undo expanded attributes! if( pBackAttrib && pBackAttrib->GetStart() < m_nErrorStart && pBackAttrib->GetEnd() == m_nErrorEnd + nDiffLen) { - boost::scoped_ptr<TextAttrib> pNewBackground(pBackAttrib->GetAttr().Clone()); + std::unique_ptr<TextAttrib> pNewBackground(pBackAttrib->GetAttr().Clone()); const sal_Int32 nStart = pBackAttrib->GetStart(); pTextEngine->RemoveAttrib(0, *pBackAttrib); pTextEngine->SetAttrib(*pNewBackground, 0, nStart, m_nErrorStart); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 8929c98c12d0..26b18e1c8311 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -36,7 +36,6 @@ #include <comphelper/string.hxx> #include <svx/svxdlg.hxx> #include <sal/macros.h> -#include <boost/scoped_ptr.hpp> using namespace css::uno; using namespace css::i18n; @@ -356,7 +355,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void { if (m_ppbApproxSettings == pButton) { - boost::scoped_ptr<AbstractSvxSearchSimilarityDialog> pDlg; + std::unique_ptr<AbstractSvxSearchSimilarityDialog> pDlg; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) @@ -378,7 +377,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - boost::scoped_ptr<AbstractSvxJSearchOptionsDialog> aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() )); + std::unique_ptr<AbstractSvxJSearchOptionsDialog> aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() )); DBG_ASSERT(aDlg, "Dialog creation failed!"); aDlg->Execute(); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index bf221cd3ee9b..caf97258b599 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -32,7 +32,6 @@ #include <svx/svxdlg.hxx> #include <cuires.hrc> #include <vcl/builderfactory.hxx> -#include <boost/scoped_ptr.hpp> using namespace ::ucbhelper; @@ -183,7 +182,7 @@ void SvxHyperlinkTabPageBase::InitStdControls () SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetTopFrame() : 0; if ( pFrame ) { - boost::scoped_ptr<TargetList> pList(new TargetList); + std::unique_ptr<TargetList> pList(new TargetList); pFrame->GetTargetList(*pList); if( !pList->empty() ) { diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index e41cbc22509a..8aac59a7e2d3 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -35,7 +35,6 @@ #include <vcl/settings.hxx> #include <dialmgr.hxx> -#include <boost/scoped_ptr.hpp> SvPasteObjectDialog::SvPasteObjectDialog( vcl::Window* pParent ) : ModalDialog(pParent, "PasteSpecialDialog", "cui/ui/pastespecial.ui") @@ -186,7 +185,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe if( aTypeName.isEmpty() && aSourceName.isEmpty() ) { - boost::scoped_ptr<ResMgr> pMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() )); + std::unique_ptr<ResMgr> pMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() )); // global resource from svtools (former so3 resource) if( pMgr ) aSourceName = OUString( ResId( STR_UNKNOWN_SOURCE, *pMgr ) ); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index f689b51618ad..1ac98183d69f 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -62,7 +62,6 @@ #include <tools/urlobj.hxx> #include <vector> #include <algorithm> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace css::uno; @@ -72,7 +71,7 @@ using namespace css::document; void ShowErrorDialog( const Any& aException ) { - boost::scoped_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( NULL, aException )); + std::unique_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( NULL, aException )); pDlg->Execute(); } diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx index cdf2ed91d22b..5f53852e20df 100644 --- a/cui/source/factory/init.cxx +++ b/cui/source/factory/init.cxx @@ -19,7 +19,6 @@ #include <vcl/msgbox.hxx> #include "cuicharmap.hxx" -#include <boost/scoped_ptr.hpp> // hook to call special character dialog for edits // caution: needs C-Linkage since dynamically loaded via symbol name diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 8e911729fe5f..541d060033ad 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -26,7 +26,6 @@ #include <vcl/fixed.hxx> #include <vector> -#include <boost/shared_ptr.hpp> // forward --------------------------------------------------------------- @@ -43,10 +42,10 @@ private: VclPtr<CheckBox> m_pUseDataCB; // rows struct Row; - std::vector<boost::shared_ptr<Row> > vRows; + std::vector<std::shared_ptr<Row> > vRows; // fields struct Field; - std::vector<boost::shared_ptr<Field> > vFields; + std::vector<std::shared_ptr<Field> > vFields; // "name" fields unsigned nNameRow; unsigned nShortNameField; diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 61e8f22354b2..53eea6bdb7cc 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -30,7 +30,6 @@ #include <unotools/textsearch.hxx> #include <vector> -#include <boost/shared_ptr.hpp> #include <iostream> using namespace svx; @@ -239,7 +238,7 @@ bool CuiAboutConfigTabPage::FillItemSet() { bool bModified = false; - std::vector< boost::shared_ptr< Prop_Impl > >::iterator pIter; + std::vector< std::shared_ptr< Prop_Impl > >::iterator pIter; for( pIter = m_vectorOfModified.begin() ; pIter != m_vectorOfModified.end(); ++pIter ) { Reference< XNameAccess > xUpdateAccess = getConfigAccess( (*pIter)->Name , true ); @@ -511,7 +510,7 @@ Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( const OUString& return xNameAccess; } -void CuiAboutConfigTabPage::AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp ) +void CuiAboutConfigTabPage::AddToModifiedVector( const std::shared_ptr< Prop_Impl >& rProp ) { bool isModifiedBefore = false; //Check if value modified before @@ -595,7 +594,7 @@ IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) OUString sPropertyType = SvTabListBox::GetEntryText( pEntry, 2 ); OUString sPropertyValue = SvTabListBox::GetEntryText( pEntry, 3 ); - boost::shared_ptr< Prop_Impl > pProperty (new Prop_Impl( pUserData->sPropertyPath, sPropertyName, makeAny( sPropertyValue ) ) ); + std::shared_ptr< Prop_Impl > pProperty (new Prop_Impl( pUserData->sPropertyPath, sPropertyName, makeAny( sPropertyValue ) ) ); bool bSaveChanges = false; bool bOpenDialog = true; diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index daa9456b619f..45d7fd5457e2 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -19,8 +19,6 @@ #include <vcl/edit.hxx> #include <vector> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> namespace svx { class OptHeaderTabListBox; } class CuiAboutConfigTabPage; @@ -50,14 +48,14 @@ private: VclPtr<Edit> m_pSearchEdit; SvTreeListEntries m_modifiedPrefBoxEntries; - std::vector< boost::shared_ptr< Prop_Impl > > m_vectorOfModified; + std::vector< std::shared_ptr< Prop_Impl > > m_vectorOfModified; VclPtr< SvSimpleTable > m_pPrefBox; //for search css::util::SearchOptions m_options; SvTreeListEntries m_prefBoxEntries; - void AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp ); + void AddToModifiedVector( const std::shared_ptr< Prop_Impl >& rProp ); static std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString ); void InsertEntry( SvTreeListEntry *pEntry); diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 913b8a230f0f..3feb235a0ae9 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -22,7 +22,6 @@ #include <svtools/miscopt.hxx> #include <iostream> #include <officecfg/Office/BasicIDE.hxx> -#include <boost/shared_ptr.hpp> #include <cuires.hrc> SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index a6c58658056b..830b89864776 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -32,8 +32,6 @@ #include <vcl/msgbox.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> #include <svx/svxdlg.hxx> #include <helpid.hrc> #include <dialmgr.hxx> @@ -253,9 +251,9 @@ private: }; // vChapters -- groups (group headers) - std::vector<boost::shared_ptr<Chapter> > vChapters; + std::vector<std::shared_ptr<Chapter> > vChapters; // vEntries -- color options - std::vector<boost::shared_ptr<Entry> > vEntries; + std::vector<std::shared_ptr<Entry> > vEntries; // module options SvtModuleOptions aModuleOptions; @@ -551,7 +549,7 @@ void ColorConfigWindow_Impl::CreateEntries() for (unsigned i = 0; i != nGroupCount; ++i) { aModulesInstalled[i] = IsGroupVisible(vGroupInfo[i].eGroup); - vChapters.push_back(boost::shared_ptr<Chapter>( + vChapters.push_back(std::shared_ptr<Chapter>( new Chapter(get<FixedText>(vGroupInfo[i].pGroup), aModulesInstalled[i]))); } @@ -577,7 +575,7 @@ void ColorConfigWindow_Impl::CreateEntries() vEntries.reserve(ColorConfigEntryCount); for (unsigned i = 0; i < SAL_N_ELEMENTS(vEntryInfo); ++i) { - vEntries.push_back(boost::shared_ptr<Entry>(new Entry(*this, i, nCheckBoxLabelOffset, + vEntries.push_back(std::shared_ptr<Entry>(new Entry(*this, i, nCheckBoxLabelOffset, aModulesInstalled[vEntryInfo[i].eGroup]))); } @@ -589,7 +587,7 @@ void ColorConfigWindow_Impl::CreateEntries() for (unsigned j = 0; j != nExtGroupCount; ++j) { OUString const sComponentName = aExtConfig.GetComponentName(j); - vChapters.push_back(boost::shared_ptr<Chapter>(new Chapter( + vChapters.push_back(std::shared_ptr<Chapter>(new Chapter( m_pGrid, nLineNum, aExtConfig.GetComponentDisplayName(sComponentName) ))); @@ -599,7 +597,7 @@ void ColorConfigWindow_Impl::CreateEntries() { ExtendedColorConfigValue const aColorEntry = aExtConfig.GetComponentColorConfigValue(sComponentName, i); - vEntries.push_back(boost::shared_ptr<Entry>( new Entry ( + vEntries.push_back(std::shared_ptr<Entry>( new Entry ( m_pGrid, nLineNum, aColorEntry, nCheckBoxLabelOffset ))); ++nLineNum; @@ -1194,7 +1192,7 @@ IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, vo SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( pButton, + std::unique_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( pButton, sName, CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2) )); DBG_ASSERT(aNameDlg, "Dialog creation failed!"); aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 24558d54d589..baafb9d79329 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -25,8 +25,6 @@ #include <sfx2/tabdlg.hxx> #include <svx/langbox.hxx> -#include <boost/scoped_ptr.hpp> - class CanvasSettings; class SvtOptionsDrawinglayer; @@ -110,7 +108,7 @@ private: SvtTabAppearanceCfg* pAppearanceCfg; CanvasSettings* pCanvasSettings; SvtOptionsDrawinglayer* mpDrawinglayerOpt; - boost::scoped_ptr<svt::OpenGLCfg> mpOpenGLConfig; + std::unique_ptr<svt::OpenGLCfg> mpOpenGLConfig; std::vector<vcl::IconThemeInfo> mInstalledIconThemes; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index a17991765d80..7903b1cbea20 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -33,9 +33,6 @@ #include <svx/dlgutil.hxx> #include <svx/svxids.hrc> -#include <boost/ref.hpp> -#include <boost/make_shared.hpp> - namespace { @@ -262,7 +259,7 @@ void SvxGeneralTabPage::InitControls () if (!(vRowInfo[iRow].nLangFlags & LangBit)) continue; // creating row - vRows.push_back(boost::make_shared<Row>( + vRows.push_back(std::make_shared<Row>( get<FixedText>(vRowInfo[iRow].pTextId), eRow)); Row& rRow = *vRows.back(); // fields in the row @@ -275,7 +272,7 @@ void SvxGeneralTabPage::InitControls () for ( ; iField != nFieldCount && vFieldInfo[iField].eRow == eRow; ++iField) { // creating edit field - vFields.push_back(boost::make_shared<Field>( + vFields.push_back(std::make_shared<Field>( get<Edit>(vFieldInfo[iField].pEditId), iField)); // "short name" field? if (vFieldInfo[iField].nUserOptionsId == UserOptToken::ID) diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 7f078937f2c5..40b77cb3d6bf 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -67,7 +67,6 @@ #include <vector> #include <map> -#include <boost/scoped_ptr.hpp> using namespace ::ucbhelper; using namespace ::com::sun::star; @@ -1620,7 +1619,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - boost::scoped_ptr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 )); + std::unique_ptr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 )); DBG_ASSERT(aDlg, "Dialog creation failed!"); uno::Reference< XDictionary > xNewDic; if ( aDlg->Execute() == RET_OK ) @@ -1655,7 +1654,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - boost::scoped_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), xSpellChecker1, RID_SFXDLG_EDITDICT )); + std::unique_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), xSpellChecker1, RID_SFXDLG_EDITDICT )); DBG_ASSERT(aDlg, "Dialog creation failed!"); aDlg->Execute(); } diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 893c49e6364a..002d16e0e310 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -51,8 +51,6 @@ #include "optHeaderTabListbox.hxx" #include <vcl/help.hxx> -#include <boost/scoped_ptr.hpp> - using namespace css::beans; using namespace css::lang; using namespace css::ui::dialogs; @@ -551,7 +549,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { - boost::scoped_ptr<AbstractSvxMultiPathDialog> pMultiDlg( + std::unique_ptr<AbstractSvxMultiPathDialog> pMultiDlg( pFact->CreateSvxMultiPathDialog( this )); DBG_ASSERT( pMultiDlg, "Dialog creation failed!" ); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index f386c7c423b3..1495984f4ea8 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -107,8 +107,6 @@ #include <sys/stat.h> #endif -#include <boost/scoped_ptr.hpp> - using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; @@ -2141,7 +2139,7 @@ void OfaTreeOptionsDialog::InsertNodes( const VectorOfNodes& rNodeList ) short OfaTreeOptionsDialog::Execute() { - boost::scoped_ptr< SvxDicListChgClamp > pClamp; + std::unique_ptr< SvxDicListChgClamp > pClamp; if ( !bIsFromExtensionManager ) { // collect all DictionaryList Events while the dialog is executed diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index 82668264249f..b5b0988ff434 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -15,8 +15,6 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <boost/scoped_ptr.hpp> - using namespace ::com::sun::star; TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent) @@ -101,7 +99,7 @@ IMPL_LINK_NOARG_TYPED(TSAURLsDialog, AddHdl_Impl, Button*, void) OUString aDesc( get<FixedText>("enteraurl")->GetText() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( m_pAddBtn, aURL, aDesc)); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( m_pAddBtn, aURL, aDesc)); if ( pDlg->Execute() == RET_OK ) { diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index f1e5f23dd22b..df4fbb1a402b 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -55,7 +55,6 @@ #include <editeng/unolingu.hxx> #include <dialmgr.hxx> #include <svx/svxids.hrc> -#include <boost/scoped_ptr.hpp> static LanguageType eLastDialogLanguage = LANGUAGE_SYSTEM; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 9939e630d5a7..0450870bc34c 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -51,7 +51,6 @@ #include <svl/intitem.hxx> #include <sfx2/request.hxx> #include <svtools/grfmgr.hxx> -#include <boost/scoped_ptr.hpp> using namespace css; @@ -583,7 +582,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet ) const SvxBrushItem* pBgdAttr = NULL; sal_uInt16 nSlot = SID_VIEW_FLD_PIC; sal_uInt16 nWhich = GetWhich( nSlot ); - boost::scoped_ptr<SvxBrushItem> pTemp; + std::unique_ptr<SvxBrushItem> pTemp; if ( rSet.GetItemState( nWhich, false ) >= SfxItemState::DEFAULT ) { @@ -754,7 +753,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet ) } else { - boost::scoped_ptr<SvxBrushItem> pTmpBrush; + std::unique_ptr<SvxBrushItem> pTmpBrush; if ( m_pBtnLink->IsChecked() ) { pTmpBrush.reset(new SvxBrushItem( aBgdGraphicPath, @@ -1328,7 +1327,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) sal_Int32 nSelPos = pBox->GetSelectEntryPos(); if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos) { - boost::scoped_ptr<SvxBrushItem> xItemHolder; + std::unique_ptr<SvxBrushItem> xItemHolder; SvxBrushItem* pActItem = NULL; sal_uInt16 nWhich = 0; switch(pTableBck_Impl->nActPos) diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 6a3cdfeca9ce..3127082839dd 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -71,7 +71,6 @@ #include <svl/intitem.hxx> #include <sfx2/request.hxx> #include "svx/flagsdef.hxx" -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 22521fd51fb7..1ef5ae44a712 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -34,7 +34,6 @@ #include <svx/dialogs.hrc> #include <vcl/builderfactory.hxx> #include <vcl/settings.hxx> -#include <boost/scoped_ptr.hpp> #define CM_1_TO_TWIP 567 #define TWIP_TO_INCH 1440 @@ -304,7 +303,7 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet) { sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_CROP ); FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW )); - boost::scoped_ptr<SvxGrfCrop> pNew(static_cast<SvxGrfCrop*>(rSet->Get( nW ).Clone())); + std::unique_ptr<SvxGrfCrop> pNew(static_cast<SvxGrfCrop*>(rSet->Get( nW ).Clone())); pNew->SetLeft( lcl_GetValue( *m_pLeftMF, eUnit ) ); pNew->SetRight( lcl_GetValue( *m_pRightMF, eUnit ) ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 61c3d6fc56cf..fc8e3fd07380 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -71,7 +71,6 @@ #include <svl/aeitem.hxx> #include <svl/stritem.hxx> #include <svl/slstitm.hxx> -#include <boost/scoped_ptr.hpp> #include <sfx2/filedlghelper.hxx> #include "svx/gallery1.hxx" #include "svx/galtheme.hxx" @@ -1030,7 +1029,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, voi { xSimpleFileAccess->copy( aUserImageURL, aUserGalleryURL ); INetURLObject gURL( aUserGalleryURL ); - boost::scoped_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( + std::unique_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( gURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); if ( pIn ) { diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 1a7d7b0b2761..0fcf338a9d42 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -61,7 +61,6 @@ #include <svx/unobrushitemhelper.hxx> #include <numpages.hxx> -#include <boost/scoped_ptr.hpp> // static ---------------------------------------------------------------- @@ -903,7 +902,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) (m_pRegisterCB->IsChecked() || m_pRegisterCB->IsValueChangedFromSaved())) { const SfxBoolItem& rRegItem = static_cast<const SfxBoolItem&>(rOldSet.Get(SID_SWREGISTER_MODE)); - boost::scoped_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(rRegItem.Clone())); + std::unique_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(rRegItem.Clone())); bool bCheck = m_pRegisterCB->IsChecked(); pRegItem->SetValue(bCheck); rSet->Put(*pRegItem); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 9571163ab264..71bbb4b60944 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -51,7 +51,6 @@ #include <svl/eitem.hxx> #include <sfx2/request.hxx> #include <svl/intitem.hxx> -#include <boost/scoped_ptr.hpp> const sal_uInt16 SvxStdParagraphTabPage::pStdRanges[] = { @@ -384,7 +383,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) *rOutSet, SID_ATTR_PARA_REGISTER)); if (!pBoolItem) return bModified; - boost::scoped_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(pBoolItem->Clone())); + std::unique_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(pBoolItem->Clone())); sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_REGISTER ); bool bSet = pRegItem->GetValue(); @@ -2231,7 +2230,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet ) SfxItemPool* pPool = rSet->GetPool(); if (m_pScriptSpaceCB->IsEnabled() && m_pScriptSpaceCB->IsValueChangedFromSaved()) { - boost::scoped_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get( + std::unique_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get( pPool->GetWhich(SID_ATTR_PARA_SCRIPTSPACE)).Clone())); pNewItem->SetValue(m_pScriptSpaceCB->IsChecked()); rSet->Put(*pNewItem); @@ -2239,7 +2238,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet ) } if (m_pHangingPunctCB->IsEnabled() && m_pHangingPunctCB->IsValueChangedFromSaved()) { - boost::scoped_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get( + std::unique_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get( pPool->GetWhich(SID_ATTR_PARA_HANGPUNCTUATION)).Clone())); pNewItem->SetValue(m_pHangingPunctCB->IsChecked()); rSet->Put(*pNewItem); @@ -2247,7 +2246,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet ) } if (m_pForbiddenRulesCB->IsEnabled() && m_pForbiddenRulesCB->IsValueChangedFromSaved()) { - boost::scoped_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get( + std::unique_ptr<SfxBoolItem> pNewItem(static_cast<SfxBoolItem*>(rSet->Get( pPool->GetWhich(SID_ATTR_PARA_FORBIDDEN_RULES)).Clone())); pNewItem->SetValue(m_pForbiddenRulesCB->IsChecked()); rSet->Put(*pNewItem); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 7b45ae17f6aa..997e55ac4046 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> #include <svx/dialogs.hrc> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star::text; #define SwFPos SvxSwFramePosString @@ -891,7 +890,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) const SfxPoolItem* pItem = GetItem( rOldSet, SID_SW_FOLLOW_TEXT_FLOW); if(pItem) { - boost::scoped_ptr<SfxBoolItem> pFollow(static_cast<SfxBoolItem*>(pItem->Clone())); + std::unique_ptr<SfxBoolItem> pFollow(static_cast<SfxBoolItem*>(pItem->Clone())); pFollow->SetValue(m_pFollowCB->IsChecked()); bModified |= 0 != rSet->Put(*pFollow); } diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index e03c98781499..b604038fa78e 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -43,7 +43,6 @@ //UUUU #include "sfx2/opengrf.hxx" #include <vcl/layout.hxx> -#include <boost/scoped_ptr.hpp> using namespace com::sun::star; @@ -1300,7 +1299,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) m_pTsbOriginal->IsEnabled() && m_pTsbScale->GetSavedValue() != TRISTATE_TRUE ) ) { - boost::scoped_ptr<XFillBmpSizeLogItem> pItem; + std::unique_ptr<XFillBmpSizeLogItem> pItem; if( m_pTsbScale->IsEnabled() ) pItem.reset(new XFillBmpSizeLogItem( eState == TRISTATE_FALSE )); else if( m_pTsbOriginal->IsEnabled() && m_pTsbOriginal->GetState() == TRISTATE_TRUE ) @@ -1320,7 +1319,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) //aMtrFldXSize OUString aStr = m_pMtrFldXSize->GetText(); { - boost::scoped_ptr<XFillBmpSizeXItem> pItem; + std::unique_ptr<XFillBmpSizeXItem> pItem; TriState eScaleState = m_pTsbScale->GetState(); if( m_pMtrFldXSize->IsEnabled() && @@ -1355,7 +1354,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) //aMtrFldYSize aStr = m_pMtrFldYSize->GetText(); { - boost::scoped_ptr<XFillBmpSizeYItem> pItem; + std::unique_ptr<XFillBmpSizeYItem> pItem; TriState eScaleState = m_pTsbScale->GetState(); if( m_pMtrFldYSize->IsEnabled() && @@ -2343,7 +2342,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) if( m_pMtrFldXSize->IsEnabled() ) { - boost::scoped_ptr<XFillBmpSizeXItem> pItem; + std::unique_ptr<XFillBmpSizeXItem> pItem; TriState eScaleState = m_pTsbScale->GetState(); if( eScaleState == TRISTATE_FALSE ) @@ -2362,7 +2361,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) if( m_pMtrFldYSize->IsEnabled() ) { - boost::scoped_ptr<XFillBmpSizeYItem> pItem; + std::unique_ptr<XFillBmpSizeYItem> pItem; TriState eScaleState = m_pTsbScale->GetState(); if( eScaleState == TRISTATE_FALSE ) diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 69e5937f1ee7..462e9abf9fff 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -46,7 +46,6 @@ #include <dialmgr.hxx> #include "sfx2/opengrf.hxx" #include "paragrph.hrc" -#include <boost/scoped_ptr.hpp> using namespace com::sun::star; @@ -319,7 +318,7 @@ VclPtr<SfxTabPage> SvxBitmapTabPage::Create( vcl::Window* pWindow, IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl) { - boost::scoped_ptr<GraphicObject> pGraphicObject; + std::unique_ptr<GraphicObject> pGraphicObject; int nPos(m_pLbBitmaps->GetSelectEntryPos()); if(LISTBOX_ENTRY_NOTFOUND != nPos) @@ -507,7 +506,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); DBG_ASSERT(pDlg, "Dialog creation failed!"); ScopedVclPtr<MessageDialog> pWarnBox; sal_uInt16 nError(1); @@ -615,7 +614,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl_Impl, Button*, void) INetURLObject aURL( aDlg.GetPath() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aURL.GetName().getToken( 0, '.' ), aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aURL.GetName().getToken( 0, '.' ), aDesc )); DBG_ASSERT(pDlg, "Dialog creation failed!"); nError = 1; @@ -686,7 +685,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickModifyHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); DBG_ASSERT(pDlg, "Dialog creation failed!"); long nCount = m_pBitmapList->Count(); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 2f16de25b91c..53c04b00966d 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -45,7 +45,6 @@ #include <cuitabline.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include <boost/scoped_ptr.hpp> using namespace com::sun::star; @@ -713,7 +712,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); ScopedVclPtr<MessageDialog> pWarnBox; sal_uInt16 nError = 1; @@ -797,7 +796,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void) aWarningBox->Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); bool bLoop = true; while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) @@ -841,7 +840,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void) IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) { - boost::scoped_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParentDialog() )); + std::unique_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParentDialog() )); pColorDlg->SetColor (aCurrentColor); pColorDlg->SetMode( svtools::ColorPickerMode_MODIFY ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 0c4a25c39bc7..0396464d6fca 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -40,7 +40,6 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include "paragrph.hrc" -#include <boost/scoped_ptr.hpp> using namespace com::sun::star; @@ -340,7 +339,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) { // CheckChanges(); <-- duplicate inquiry ? - boost::scoped_ptr<XGradient> pXGradient; + std::unique_ptr<XGradient> pXGradient; OUString aString; sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -453,7 +452,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); ScopedVclPtr<MessageDialog> pWarnBox; sal_uInt16 nError = 1; @@ -544,7 +543,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); DBG_ASSERT(pDlg, "Dialog creation failed!"); long nCount = m_pGradientList->Count(); @@ -806,7 +805,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickSaveHdl_Impl, Button*, void) IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl) { - boost::scoped_ptr<XGradient> pGradient; + std::unique_ptr<XGradient> pGradient; int nPos = m_pLbGradients->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 1dae3a319f7a..cbe50521cd09 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -42,7 +42,6 @@ #include <svx/dialmgr.hxx> #include "paragrph.hrc" #include <svx/dialogs.hrc> -#include <boost/scoped_ptr.hpp> using namespace com::sun::star; @@ -307,7 +306,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) { // CheckChanges(); <-- duplicate inquiry ? - boost::scoped_ptr<XHatch> pXHatch; + std::unique_ptr<XHatch> pXHatch; OUString aString; sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -402,7 +401,7 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p ) IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl) { - boost::scoped_ptr<XHatch> pHatch; + std::unique_ptr<XHatch> pHatch; int nPos = m_pLbHatchings->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -497,7 +496,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); DBG_ASSERT(pDlg, "Dialog creation failed!"); ScopedVclPtr<MessageDialog> pWarnBox; sal_uInt16 nError = 1; @@ -581,7 +580,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); DBG_ASSERT(pDlg, "Dialog creation failed!"); long nCount = m_pHatchingList->Count(); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 0ff3f605ea35..e044eb34c49e 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -51,7 +51,6 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <vcl/settings.hxx> -#include <boost/scoped_ptr.hpp> #define MAX_BMP_WIDTH 16 #define MAX_BMP_HEIGHT 16 @@ -360,7 +359,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton) { ScopedVclPtrInstance< VirtualDevice > pVDev; pVDev->SetMapMode(MapMode(MAP_100TH_MM)); - boost::scoped_ptr<SdrModel> pModel(new SdrModel); + std::unique_ptr<SdrModel> pModel(new SdrModel); pModel->GetItemPool().FreezeIdRanges(); // Page SdrPage* pPage = new SdrPage( *pModel, false ); @@ -368,7 +367,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton) pModel->InsertPage( pPage, 0 ); { // 3D View - boost::scoped_ptr<SdrView> pView(new SdrView( pModel.get(), pVDev )); + std::unique_ptr<SdrView> pView(new SdrView( pModel.get(), pVDev )); pView->hideMarkHandles(); pView->ShowSdrPage(pPage); @@ -723,7 +722,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbLineStyle->IsValueChangedFromSaved() ) { - boost::scoped_ptr<XLineStyleItem> pStyleItem; + std::unique_ptr<XLineStyleItem> pStyleItem; if( nPos == 0 ) pStyleItem.reset(new XLineStyleItem( drawing::LineStyle_NONE )); @@ -807,7 +806,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) nPos = m_pLbStartStyle->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbStartStyle->IsValueChangedFromSaved() ) { - boost::scoped_ptr<XLineStartItem> pItem; + std::unique_ptr<XLineStartItem> pItem; if( nPos == 0 ) pItem.reset(new XLineStartItem()); else if( m_pLineEndList->Count() > (long) ( nPos - 1 ) ) @@ -823,7 +822,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) nPos = m_pLbEndStyle->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbEndStyle->IsValueChangedFromSaved() ) { - boost::scoped_ptr<XLineEndItem> pItem; + std::unique_ptr<XLineEndItem> pItem; if( nPos == 0 ) pItem.reset(new XLineEndItem()); else if( m_pLineEndList->Count() > (long) ( nPos - 1 ) ) @@ -879,7 +878,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) nPos = m_pLBEdgeStyle->GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBEdgeStyle->IsValueChangedFromSaved() ) { - boost::scoped_ptr<XLineJointItem> pNew; + std::unique_ptr<XLineJointItem> pNew; switch(nPos) { @@ -921,7 +920,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) nPos = m_pLBCapStyle->GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBCapStyle->IsValueChangedFromSaved() ) { - boost::scoped_ptr<XLineCapItem> pNew; + std::unique_ptr<XLineCapItem> pNew; switch(nPos) { @@ -1154,13 +1153,13 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) ScopedVclPtrInstance< VirtualDevice > pVDev; pVDev->SetMapMode(MapMode(MAP_100TH_MM)); - boost::scoped_ptr<SdrModel> pModel(new SdrModel); + std::unique_ptr<SdrModel> pModel(new SdrModel); pModel->GetItemPool().FreezeIdRanges(); SdrPage* pPage = new SdrPage( *pModel, false ); pPage->SetSize(Size(1000,1000)); pModel->InsertPage( pPage, 0 ); { - boost::scoped_ptr<SdrView> pView(new SdrView( pModel.get(), pVDev )); + std::unique_ptr<SdrView> pView(new SdrView( pModel.get(), pVDev )); pView->hideMarkHandles(); pView->ShowSdrPage(pPage); SdrObject *pObj=NULL; diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index d6a48aa54112..176a6657b71c 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -42,7 +42,6 @@ #include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include <boost/scoped_ptr.hpp> #define XOUT_WIDTH 150 @@ -568,7 +567,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); DBG_ASSERT(pDlg, "Dialog creation failed!"); bool bLoop = true; @@ -644,7 +643,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); DBG_ASSERT(pDlg, "Dialog creation failed!"); long nCount = pDashList->Count(); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 22d88d359ecb..e466a09208d7 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -44,7 +44,6 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svx/dialogs.hrc> -#include <boost/scoped_ptr.hpp> #define XOUT_WIDTH 150 @@ -348,7 +347,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); DBG_ASSERT(pDlg, "Dialog creation failed!"); bool bLoop = true; @@ -461,7 +460,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); - boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); + std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); DBG_ASSERT(pDlg, "Dialog creation failed!"); bool bLoop = true; diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index 7d38304f4bd3..38b53d00d045 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -57,7 +57,7 @@ namespace drawinglayer const bool bOldModulate(getModulate()); mbModulate = rPrimitive.getModulate(); const bool bOldFilter(getFilter()); mbFilter = rPrimitive.getFilter(); const bool bOldSimpleTextureActive(getSimpleTextureActive()); - boost::shared_ptr< texture::GeoTexSvx > pOldTex = (bTransparence) ? mpTransparenceGeoTexSvx : mpGeoTexSvx; + std::shared_ptr< texture::GeoTexSvx > pOldTex = (bTransparence) ? mpTransparenceGeoTexSvx : mpGeoTexSvx; // create texture const attribute::FillGradientAttribute& rFillGradient = rPrimitive.getGradient(); @@ -67,7 +67,7 @@ namespace drawinglayer const basegfx::BColor aStart(rFillGradient.getStartColor()); const basegfx::BColor aEnd(rFillGradient.getEndColor()); const sal_uInt32 nMaxSteps(sal_uInt32((aStart.getMaximumDistance(aEnd) * 127.5) + 0.5)); - boost::shared_ptr< texture::GeoTexSvx > pNewTex; + std::shared_ptr< texture::GeoTexSvx > pNewTex; if(nMaxSteps) { @@ -219,7 +219,7 @@ namespace drawinglayer // rescue values const bool bOldModulate(getModulate()); mbModulate = rPrimitive.getModulate(); const bool bOldFilter(getFilter()); mbFilter = rPrimitive.getFilter(); - boost::shared_ptr< texture::GeoTexSvx > pOldTex = mpGeoTexSvx; + std::shared_ptr< texture::GeoTexSvx > pOldTex = mpGeoTexSvx; // calculate logic pixel size in object coordinates. Create transformation view // to object by inverting ObjectToView @@ -260,7 +260,7 @@ namespace drawinglayer // rescue values const bool bOldModulate(getModulate()); mbModulate = rPrimitive.getModulate(); const bool bOldFilter(getFilter()); mbFilter = rPrimitive.getFilter(); - boost::shared_ptr< texture::GeoTexSvx > pOldTex = mpGeoTexSvx; + std::shared_ptr< texture::GeoTexSvx > pOldTex = mpGeoTexSvx; // create texture const attribute::FillGraphicAttribute& rFillGraphicAttribute = rPrimitive.getFillGraphicAttribute(); diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index 52371c2613e9..ec7f2760cd6a 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -466,8 +466,8 @@ void ZBufferRasterConverter3D::processLineSpan(const basegfx::RasterConversionLi class RasterPrimitive3D { private: - boost::shared_ptr< drawinglayer::texture::GeoTexSvx > mpGeoTexSvx; - boost::shared_ptr< drawinglayer::texture::GeoTexSvx > mpTransparenceGeoTexSvx; + std::shared_ptr< drawinglayer::texture::GeoTexSvx > mpGeoTexSvx; + std::shared_ptr< drawinglayer::texture::GeoTexSvx > mpTransparenceGeoTexSvx; drawinglayer::attribute::MaterialAttribute3D maMaterial; basegfx::B3DPolyPolygon maPolyPolygon; double mfCenterZ; @@ -480,8 +480,8 @@ private: public: RasterPrimitive3D( - const boost::shared_ptr< drawinglayer::texture::GeoTexSvx >& pGeoTexSvx, - const boost::shared_ptr< drawinglayer::texture::GeoTexSvx >& pTransparenceGeoTexSvx, + const std::shared_ptr< drawinglayer::texture::GeoTexSvx >& pGeoTexSvx, + const std::shared_ptr< drawinglayer::texture::GeoTexSvx >& pTransparenceGeoTexSvx, const drawinglayer::attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolyPolygon& rPolyPolygon, bool bModulate, @@ -520,8 +520,8 @@ public: return mfCenterZ < rComp.mfCenterZ; } - const boost::shared_ptr< drawinglayer::texture::GeoTexSvx >& getGeoTexSvx() const { return mpGeoTexSvx; } - const boost::shared_ptr< drawinglayer::texture::GeoTexSvx >& getTransparenceGeoTexSvx() const { return mpTransparenceGeoTexSvx; } + const std::shared_ptr< drawinglayer::texture::GeoTexSvx >& getGeoTexSvx() const { return mpGeoTexSvx; } + const std::shared_ptr< drawinglayer::texture::GeoTexSvx >& getTransparenceGeoTexSvx() const { return mpTransparenceGeoTexSvx; } const drawinglayer::attribute::MaterialAttribute3D& getMaterial() const { return maMaterial; } const basegfx::B3DPolyPolygon& getPolyPolygon() const { return maPolyPolygon; } bool getModulate() const { return mbModulate; } diff --git a/hwpfilter/inc/pch/precompiled_hwp.hxx b/hwpfilter/inc/pch/precompiled_hwp.hxx index 13658fb72775..752f2ec1f05d 100644 --- a/hwpfilter/inc/pch/precompiled_hwp.hxx +++ b/hwpfilter/inc/pch/precompiled_hwp.hxx @@ -15,7 +15,6 @@ */ #include <assert.h> -#include <boost/shared_ptr.hpp> #include <comphelper/newarray.hxx> #include <ctype.h> #include <deque> diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 7beafe2d615d..46f83877f093 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -20,8 +20,6 @@ #include <deque> #include <memory> -#include <boost/shared_ptr.hpp> - #include "hwpreader.hxx" #include <math.h> @@ -1746,7 +1744,7 @@ void HwpReader::makePageStyle() if( hwpinfo.back_info.type == 2 ){ rstartEl("office:binary-data", rList); pList->clear(); - boost::shared_ptr<char> pStr(base64_encode_string(reinterpret_cast<unsigned char *>(hwpinfo.back_info.data), hwpinfo.back_info.size ), Free<char>()); + std::shared_ptr<char> pStr(base64_encode_string(reinterpret_cast<unsigned char *>(hwpinfo.back_info.data), hwpinfo.back_info.size ), Free<char>()); rchars(ascii(pStr.get())); rendEl("office:binary-data"); } @@ -3907,7 +3905,7 @@ void HwpReader::makePicture(Picture * hbox) EmPicture *emp = hwpfile.GetEmPicture(hbox); if( emp ) { - boost::shared_ptr<char> pStr(base64_encode_string( emp->data, emp->size ), Free<char>()); + std::shared_ptr<char> pStr(base64_encode_string( emp->data, emp->size ), Free<char>()); rchars(ascii(pStr.get())); } } @@ -3931,7 +3929,7 @@ void HwpReader::makePicture(Picture * hbox) rchars(""); } else{ - boost::shared_ptr<char> pStr(base64_encode_string( (uchar *)pObj, strlen((char *)pObj)), Free<char>()); + std::shared_ptr<char> pStr(base64_encode_string( (uchar *)pObj, strlen((char *)pObj)), Free<char>()); rchars(ascii(pStr.get())); pObj->Release(); srcsto->Release(); diff --git a/include/basebmp/debug.hxx b/include/basebmp/debug.hxx index 688daf41c834..c99f764946ce 100644 --- a/include/basebmp/debug.hxx +++ b/include/basebmp/debug.hxx @@ -21,7 +21,7 @@ #define INCLUDED_BASEBMP_DEBUG_HXX #include <iostream> -#include <boost/shared_ptr.hpp> +#include <memory> #include <basebmp/basebmpdllapi.h> namespace basebmp @@ -48,7 +48,7 @@ namespace basebmp debugDump( pMyDevice, output ); </pre> */ - void BASEBMP_DLLPUBLIC debugDump( const boost::shared_ptr< BitmapDevice >& rDevice, + void BASEBMP_DLLPUBLIC debugDump( const std::shared_ptr< BitmapDevice >& rDevice, ::std::ostream& rOutputStream ); } diff --git a/include/canvas/debug.hxx b/include/canvas/debug.hxx index 275fc45d1279..308026a0e188 100644 --- a/include/canvas/debug.hxx +++ b/include/canvas/debug.hxx @@ -26,7 +26,7 @@ #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS # include <sal/config.h> -# include <boost/shared_ptr.hpp> +# include <memory> ::std::size_t find_unreachable_objects( bool ); diff --git a/include/canvas/elapsedtime.hxx b/include/canvas/elapsedtime.hxx index f942749c8a6a..f1d68ba8527f 100644 --- a/include/canvas/elapsedtime.hxx +++ b/include/canvas/elapsedtime.hxx @@ -21,9 +21,8 @@ #define INCLUDED_CANVAS_ELAPSEDTIME_HXX #include <sal/types.h> - -#include <boost/shared_ptr.hpp> #include <canvas/canvastoolsdllapi.h> +#include <memory> namespace canvas { @@ -57,7 +56,7 @@ namespace canvas are not taken from the system's time base, but from the provided timer. */ - ElapsedTime( ::boost::shared_ptr<ElapsedTime> const & pTimeBase ); + ElapsedTime( std::shared_ptr<ElapsedTime> const & pTimeBase ); /** Reset the time @@ -147,7 +146,7 @@ namespace canvas double getCurrentTime() const; double getElapsedTimeImpl() const; // does not set m_fLastQueriedTime - const ::boost::shared_ptr<ElapsedTime> m_pTimeBase; + const std::shared_ptr<ElapsedTime> m_pTimeBase; /// To validate adjustTimer() calls with bLimitToLastQueriedTime=true mutable double m_fLastQueriedTime; diff --git a/include/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx index 9fc1070f243a..d8061889d6bd 100644 --- a/include/canvas/rendering/bitmap.hxx +++ b/include/canvas/rendering/bitmap.hxx @@ -29,7 +29,6 @@ #include <canvas/rendering/icachedprimitive.hxx> #include <canvas/rendering/isurfaceproxymanager.hxx> -#include <boost/shared_ptr.hpp> #include <memory> #include <vector> @@ -214,7 +213,7 @@ namespace canvas const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, - const ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations, + const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations, const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ); /** See XCanvas interface @@ -231,7 +230,7 @@ namespace canvas const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, - const ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations, + const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations, const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping, const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ); @@ -256,7 +255,7 @@ namespace canvas const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, - const ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations ); + const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations ); /** See XCanvas interface @param textureAnnotations @@ -272,7 +271,7 @@ namespace canvas const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, - const ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations, + const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations, const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping ); @@ -284,7 +283,7 @@ namespace canvas const ::com::sun::star::rendering::RenderState& renderState ); /// See XCanvas interface ICachedPrimitiveSharedPtr drawBitmap( - const ::boost::shared_ptr<Bitmap>& rImage, + const std::shared_ptr<Bitmap>& rImage, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); @@ -296,7 +295,7 @@ namespace canvas const ::com::sun::star::rendering::RenderState& renderState ); /// See XCanvas interface ICachedPrimitiveSharedPtr drawBitmapModulated( - const ::boost::shared_ptr<Bitmap>& rImage, + const std::shared_ptr<Bitmap>& rImage, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); @@ -306,7 +305,7 @@ namespace canvas const std::unique_ptr< ImplBitmap > mxImpl; }; - typedef ::boost::shared_ptr< Bitmap > BitmapSharedPtr; + typedef std::shared_ptr< Bitmap > BitmapSharedPtr; } #endif // INCLUDED_CANVAS_RENDERING_BITMAP_HXX diff --git a/include/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx index 8df4cc94a136..ecf5843ae4c3 100644 --- a/include/canvas/rendering/icachedprimitive.hxx +++ b/include/canvas/rendering/icachedprimitive.hxx @@ -22,8 +22,7 @@ #include <sal/types.h> -#include <boost/shared_ptr.hpp> - +#include <memory> namespace basegfx { @@ -52,7 +51,7 @@ namespace canvas virtual sal_Int8 redraw( const ::com::sun::star::rendering::ViewState& aState ) const = 0; }; - typedef ::boost::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr; + typedef std::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr; } #endif // INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX diff --git a/include/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx index a9922bead33e..6b8c8c0ee1ef 100644 --- a/include/canvas/rendering/icolorbuffer.hxx +++ b/include/canvas/rendering/icolorbuffer.hxx @@ -21,9 +21,7 @@ #define INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX #include <sal/types.h> - -#include <boost/shared_ptr.hpp> - +#include <memory> namespace canvas { @@ -80,7 +78,7 @@ namespace canvas virtual Format getFormat() const = 0; }; - typedef ::boost::shared_ptr< IColorBuffer > IColorBufferSharedPtr; + typedef std::shared_ptr< IColorBuffer > IColorBufferSharedPtr; } #endif // INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX diff --git a/include/canvas/rendering/irendermodule.hxx b/include/canvas/rendering/irendermodule.hxx index cbde9e67cb97..2e78d1ee2f19 100644 --- a/include/canvas/rendering/irendermodule.hxx +++ b/include/canvas/rendering/irendermodule.hxx @@ -21,10 +21,8 @@ #define INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX #include <sal/types.h> - -#include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> - +#include <memory> namespace basegfx { @@ -85,7 +83,7 @@ namespace canvas @return a pointer to a surface, which is an abstraction of a piece of (possibly hardware-accelerated) texture memory. */ - virtual ::boost::shared_ptr<ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize ) = 0; + virtual std::shared_ptr<ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize ) = 0; /** Begin rendering the given primitive. @@ -116,7 +114,7 @@ namespace canvas virtual bool isError() = 0; }; - typedef ::boost::shared_ptr< IRenderModule > IRenderModuleSharedPtr; + typedef std::shared_ptr< IRenderModule > IRenderModuleSharedPtr; /// Little RAII wrapper for guarding access to IRenderModule interface class RenderModuleGuard : private ::boost::noncopyable diff --git a/include/canvas/rendering/isurface.hxx b/include/canvas/rendering/isurface.hxx index 1e8e47a5578b..896a4396324f 100644 --- a/include/canvas/rendering/isurface.hxx +++ b/include/canvas/rendering/isurface.hxx @@ -21,9 +21,7 @@ #define INCLUDED_CANVAS_RENDERING_ISURFACE_HXX #include <sal/types.h> - -#include <boost/shared_ptr.hpp> - +#include <memory> namespace basegfx { @@ -74,7 +72,7 @@ namespace canvas virtual ::basegfx::B2IVector getSize() = 0; }; - typedef ::boost::shared_ptr< ISurface > ISurfaceSharedPtr; + typedef std::shared_ptr< ISurface > ISurfaceSharedPtr; } #endif // INCLUDED_CANVAS_RENDERING_ISURFACE_HXX diff --git a/include/canvas/rendering/isurfaceproxy.hxx b/include/canvas/rendering/isurfaceproxy.hxx index 47a2e98b3d94..9523ffa40a30 100644 --- a/include/canvas/rendering/isurfaceproxy.hxx +++ b/include/canvas/rendering/isurfaceproxy.hxx @@ -21,8 +21,7 @@ #define INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX #include <canvas/rendering/irendermodule.hxx> - -#include <boost/shared_ptr.hpp> +#include <memory> namespace basegfx { @@ -99,7 +98,7 @@ namespace canvas const ::basegfx::B2DHomMatrix& rTransform ) = 0; }; - typedef ::boost::shared_ptr< ISurfaceProxy > ISurfaceProxySharedPtr; + typedef std::shared_ptr< ISurfaceProxy > ISurfaceProxySharedPtr; } #endif // INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX diff --git a/include/canvas/rendering/isurfaceproxymanager.hxx b/include/canvas/rendering/isurfaceproxymanager.hxx index 7172748f8531..c2ba559d4c48 100644 --- a/include/canvas/rendering/isurfaceproxymanager.hxx +++ b/include/canvas/rendering/isurfaceproxymanager.hxx @@ -22,10 +22,8 @@ #include <canvas/rendering/irendermodule.hxx> #include <canvas/rendering/icolorbuffer.hxx> - -#include <boost/shared_ptr.hpp> - #include <canvas/canvastoolsdllapi.h> +#include <memory> namespace canvas { @@ -57,11 +55,11 @@ namespace canvas Internally this texture may even be distributed to several real hardware surfaces. */ - virtual ::boost::shared_ptr< ISurfaceProxy > createSurfaceProxy( + virtual std::shared_ptr< ISurfaceProxy > createSurfaceProxy( const IColorBufferSharedPtr& pBuffer ) const = 0; }; - typedef ::boost::shared_ptr< ISurfaceProxyManager > ISurfaceProxyManagerSharedPtr; + typedef std::shared_ptr< ISurfaceProxyManager > ISurfaceProxyManagerSharedPtr; /** Create a surface proxy for the given render module. diff --git a/include/comphelper/make_shared_from_uno.hxx b/include/comphelper/make_shared_from_uno.hxx index 03bc03c6036c..17496eeb4aa4 100644 --- a/include/comphelper/make_shared_from_uno.hxx +++ b/include/comphelper/make_shared_from_uno.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX #define INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX -#include <boost/shared_ptr.hpp> #include <functional> +#include <memory> namespace comphelper { @@ -32,12 +32,12 @@ template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> { }; } // namespace detail -/** Makes a boost::shared_ptr from a ref-counted UNO object pointer. +/** Makes a std::shared_ptr from a ref-counted UNO object pointer. This makes sense if the object is used via UNO (implementing some X interface) and also internally using its implementation class, e.g. <pre> - boost::shared_ptr<MyUnoImpl> const ptr( + std::shared_ptr<MyUnoImpl> const ptr( comphelper::make_shared_from_UNO( new MyUnoImpl ) ); ... xUno->callingUno( uno::Reference<XSomeInterface>( ptr.get() ) ); @@ -47,7 +47,7 @@ template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> { </pre> @attention The shared_ptr operates on a separate reference counter, so - weak pointers (boost::weak_ptr) are invalidated when the last + weak pointers (std::weak_ptr) are invalidated when the last shared_ptr is destroyed, although the UNO object may still be alive. @@ -55,10 +55,10 @@ template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> { @return shared_ptr to object */ template <typename T> -inline ::boost::shared_ptr<T> make_shared_from_UNO( T * p ) +inline std::shared_ptr<T> make_shared_from_UNO( T * p ) { p->acquire(); - return ::boost::shared_ptr<T>( p, detail::ReleaseFunc<T>() ); + return std::shared_ptr<T>( p, detail::ReleaseFunc<T>() ); } } // namespace comphelper diff --git a/include/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx index 12eed6e30e8d..eed0607ecd5e 100644 --- a/include/cppcanvas/bitmap.hxx +++ b/include/cppcanvas/bitmap.hxx @@ -21,10 +21,9 @@ #define INCLUDED_CPPCANVAS_BITMAP_HXX #include <com/sun/star/uno/Reference.hxx> - -#include <boost/shared_ptr.hpp> #include <cppcanvas/canvasgraphic.hxx> #include <cppcanvas/bitmapcanvas.hxx> +#include <memory> namespace com { namespace sun { namespace star { namespace rendering { @@ -66,7 +65,7 @@ namespace cppcanvas ::com::sun::star::rendering::XBitmap > getUNOBitmap() const = 0; }; - typedef ::boost::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr; + typedef std::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr; } #endif // INCLUDED_CPPCANVAS_BITMAP_HXX diff --git a/include/cppcanvas/bitmapcanvas.hxx b/include/cppcanvas/bitmapcanvas.hxx index b47d438151e5..1d4775ccd0aa 100644 --- a/include/cppcanvas/bitmapcanvas.hxx +++ b/include/cppcanvas/bitmapcanvas.hxx @@ -22,10 +22,9 @@ #include <sal/types.h> #include <osl/diagnose.h> - -#include <boost/shared_ptr.hpp> #include <basegfx/vector/b2isize.hxx> #include <cppcanvas/canvas.hxx> +#include <memory> /* Definition of BitmapCanvas */ @@ -35,7 +34,7 @@ namespace cppcanvas class BitmapCanvas; // forward declaration, since cloneBitmapCanvas() also references BitmapCanvas - typedef ::boost::shared_ptr< BitmapCanvas > BitmapCanvasSharedPtr; + typedef std::shared_ptr< BitmapCanvas > BitmapCanvasSharedPtr; /** BitmapCanvas interface */ diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx index 3538ffd619f3..caba56da59f3 100644 --- a/include/cppcanvas/canvas.hxx +++ b/include/cppcanvas/canvas.hxx @@ -21,11 +21,9 @@ #define INCLUDED_CPPCANVAS_CANVAS_HXX #include <com/sun/star/uno/Reference.hxx> - -#include <boost/shared_ptr.hpp> #include <cppcanvas/font.hxx> #include <cppcanvas/color.hxx> - +#include <memory> namespace basegfx { @@ -48,10 +46,10 @@ namespace cppcanvas class Canvas; // forward declaration, since tools::PolyPolygon also references Canvas - typedef ::boost::shared_ptr< PolyPolygon > PolyPolygonSharedPtr; + typedef std::shared_ptr< PolyPolygon > PolyPolygonSharedPtr; // forward declaration, since cloneCanvas() also references Canvas - typedef ::boost::shared_ptr< Canvas > CanvasSharedPtr; + typedef std::shared_ptr< Canvas > CanvasSharedPtr; /** Canvas interface */ diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx index 173ee466cef2..8792b6c4982e 100644 --- a/include/cppcanvas/canvasgraphic.hxx +++ b/include/cppcanvas/canvasgraphic.hxx @@ -21,10 +21,9 @@ #define INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX #include <sal/types.h> - -#include <boost/shared_ptr.hpp> #include <cppcanvas/color.hxx> #include <cppcanvas/canvas.hxx> +#include <memory> namespace basegfx { @@ -38,7 +37,7 @@ namespace basegfx namespace cppcanvas { // forward declaration, since tools::PolyPolygon also derives from CanvasGraphic - typedef ::boost::shared_ptr< class PolyPolygon > PolyPolygonSharedPtr; + typedef std::shared_ptr< class PolyPolygon > PolyPolygonSharedPtr; /** This interface defines basic properties of @@ -138,7 +137,7 @@ namespace cppcanvas }; - typedef ::boost::shared_ptr< ::cppcanvas::CanvasGraphic > CanvasGraphicSharedPtr; + typedef std::shared_ptr< ::cppcanvas::CanvasGraphic > CanvasGraphicSharedPtr; } #endif // INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX diff --git a/include/cppcanvas/color.hxx b/include/cppcanvas/color.hxx index b6ed71d823bf..e216203024c5 100644 --- a/include/cppcanvas/color.hxx +++ b/include/cppcanvas/color.hxx @@ -21,9 +21,7 @@ #define INCLUDED_CPPCANVAS_COLOR_HXX #include <com/sun/star/uno/Sequence.hxx> - -#include <boost/shared_ptr.hpp> - +#include <memory> /* Definition of Color class */ @@ -44,7 +42,7 @@ namespace cppcanvas virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const = 0; }; - typedef ::boost::shared_ptr< ::cppcanvas::Color > ColorSharedPtr; + typedef std::shared_ptr< ::cppcanvas::Color > ColorSharedPtr; inline sal_uInt8 getRed( Color::IntSRGBA nCol ) { diff --git a/include/cppcanvas/customsprite.hxx b/include/cppcanvas/customsprite.hxx index 2b810ebfdaa7..f65943100df5 100644 --- a/include/cppcanvas/customsprite.hxx +++ b/include/cppcanvas/customsprite.hxx @@ -21,11 +21,9 @@ #define INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX #include <sal/types.h> - -#include <boost/shared_ptr.hpp> #include <cppcanvas/sprite.hxx> #include <cppcanvas/canvas.hxx> - +#include <memory> /* Definition of CustomSprite class */ @@ -39,7 +37,7 @@ namespace cppcanvas virtual CanvasSharedPtr getContentCanvas() const = 0; }; - typedef ::boost::shared_ptr< ::cppcanvas::CustomSprite > CustomSpriteSharedPtr; + typedef std::shared_ptr< ::cppcanvas::CustomSprite > CustomSpriteSharedPtr; } #endif // INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX diff --git a/include/cppcanvas/font.hxx b/include/cppcanvas/font.hxx index cbe30123f924..4aa786c33702 100644 --- a/include/cppcanvas/font.hxx +++ b/include/cppcanvas/font.hxx @@ -21,9 +21,7 @@ #define INCLUDED_CPPCANVAS_FONT_HXX #include <com/sun/star/uno/Reference.hxx> - -#include <boost/shared_ptr.hpp> - +#include <memory> namespace com { namespace sun { namespace star { namespace rendering { @@ -41,7 +39,7 @@ namespace cppcanvas virtual ~Font() {} }; - typedef ::boost::shared_ptr< ::cppcanvas::Font > FontSharedPtr; + typedef std::shared_ptr< ::cppcanvas::Font > FontSharedPtr; } #endif // INCLUDED_CPPCANVAS_FONT_HXX diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx index d8a2876522dd..e902a1fd952d 100644 --- a/include/cppcanvas/polypolygon.hxx +++ b/include/cppcanvas/polypolygon.hxx @@ -21,9 +21,8 @@ #define INCLUDED_CPPCANVAS_POLYPOLYGON_HXX #include <com/sun/star/uno/Reference.hxx> - -#include <boost/shared_ptr.hpp> #include <cppcanvas/canvasgraphic.hxx> +#include <memory> namespace basegfx { @@ -74,7 +73,7 @@ namespace cppcanvas ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const = 0; }; - typedef ::boost::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr; + typedef std::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr; } #endif // INCLUDED_CPPCANVAS_POLYPOLYGON_HXX diff --git a/include/cppcanvas/renderer.hxx b/include/cppcanvas/renderer.hxx index 8d51071ba116..908c3d278d28 100644 --- a/include/cppcanvas/renderer.hxx +++ b/include/cppcanvas/renderer.hxx @@ -22,12 +22,11 @@ #include <sal/types.h> #include <rtl/ustring.hxx> - -#include <boost/shared_ptr.hpp> #include <boost/optional.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> #include <cppcanvas/canvasgraphic.hxx> #include <cppcanvas/color.hxx> +#include <memory> namespace basegfx { @@ -136,7 +135,7 @@ namespace cppcanvas }; }; - typedef ::boost::shared_ptr< ::cppcanvas::Renderer > RendererSharedPtr; + typedef std::shared_ptr< ::cppcanvas::Renderer > RendererSharedPtr; } #endif // INCLUDED_CPPCANVAS_RENDERER_HXX diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx index 3074ab515cce..867d13e75fb6 100644 --- a/include/cppcanvas/sprite.hxx +++ b/include/cppcanvas/sprite.hxx @@ -21,8 +21,7 @@ #define INCLUDED_CPPCANVAS_SPRITE_HXX #include <com/sun/star/uno/Reference.hxx> - -#include <boost/shared_ptr.hpp> +#include <memory> namespace basegfx { @@ -102,7 +101,7 @@ namespace cppcanvas ::com::sun::star::rendering::XSprite > getUNOSprite() const = 0; }; - typedef ::boost::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr; + typedef std::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr; } #endif // INCLUDED_CPPCANVAS_SPRITE_HXX diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx index 1ac219e7a86f..c4152fbe498a 100644 --- a/include/cppcanvas/spritecanvas.hxx +++ b/include/cppcanvas/spritecanvas.hxx @@ -23,14 +23,11 @@ #include <sal/types.h> #include <osl/diagnose.h> #include <basegfx/vector/b2dsize.hxx> - -#include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> - - #include <cppcanvas/canvas.hxx> #include <cppcanvas/sprite.hxx> #include <cppcanvas/customsprite.hxx> +#include <boost/noncopyable.hpp> +#include <memory> namespace com { namespace sun { namespace star { namespace rendering { @@ -45,7 +42,7 @@ namespace cppcanvas class SpriteCanvas; // forward declaration, since cloneSpriteCanvas() also references SpriteCanvas - typedef ::boost::shared_ptr< ::cppcanvas::SpriteCanvas > SpriteCanvasSharedPtr; + typedef std::shared_ptr< ::cppcanvas::SpriteCanvas > SpriteCanvasSharedPtr; /** SpriteCanvas interface */ diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx index 8b9773d26863..6ccc3224c78a 100644 --- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -27,8 +27,6 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/color/bcolormodifier.hxx> #include <svtools/optionsdrawinglayer.hxx> -#include <boost/shared_ptr.hpp> - // predefines @@ -88,10 +86,10 @@ namespace drawinglayer basegfx::BColorModifierStack maBColorModifierStack; /// the current active texture - boost::shared_ptr< texture::GeoTexSvx > mpGeoTexSvx; + std::shared_ptr< texture::GeoTexSvx > mpGeoTexSvx; /// the current active transparence texture - boost::shared_ptr< texture::GeoTexSvx > mpTransparenceGeoTexSvx; + std::shared_ptr< texture::GeoTexSvx > mpTransparenceGeoTexSvx; /// SvtOptionsDrawinglayer incarnation to react on diverse settings const SvtOptionsDrawinglayer maDrawinglayerOpt; @@ -138,8 +136,8 @@ namespace drawinglayer /// data read access renderer stuff const basegfx::BColorModifierStack& getBColorModifierStack() const { return maBColorModifierStack; } - const boost::shared_ptr< texture::GeoTexSvx >& getGeoTexSvx() const { return mpGeoTexSvx; } - const boost::shared_ptr< texture::GeoTexSvx >& getTransparenceGeoTexSvx() const { return mpTransparenceGeoTexSvx; } + const std::shared_ptr< texture::GeoTexSvx >& getGeoTexSvx() const { return mpGeoTexSvx; } + const std::shared_ptr< texture::GeoTexSvx >& getTransparenceGeoTexSvx() const { return mpTransparenceGeoTexSvx; } sal_uInt32 getTransparenceCounter() const { return mnTransparenceCounter; } bool getModulate() const { return mbModulate; } bool getFilter() const { return mbFilter; } diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx index 75ecbc85a606..04fe1e3725e7 100644 --- a/include/opencl/openclwrapper.hxx +++ b/include/opencl/openclwrapper.hxx @@ -15,7 +15,6 @@ #include <cassert> #include <vector> -#include <boost/shared_ptr.hpp> #include <clew/clew.h> #include <sal/detail/log.h> diff --git a/include/sfx2/sidebar/DeckDescriptor.hxx b/include/sfx2/sidebar/DeckDescriptor.hxx index a0980c6bde78..f3e7cd6c41d2 100644 --- a/include/sfx2/sidebar/DeckDescriptor.hxx +++ b/include/sfx2/sidebar/DeckDescriptor.hxx @@ -21,7 +21,6 @@ #include <sfx2/sidebar/EnumContext.hxx> #include "ContextList.hxx" -#include <boost/shared_ptr.hpp> #include <sfx2/sidebar/Deck.hxx> diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index b42dbc9779f0..a73edd598cb4 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -27,8 +27,6 @@ #include <com/sun/star/ui/XSidebarPanel.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> #include <vector> namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/PanelDescriptor.hxx b/include/sfx2/sidebar/PanelDescriptor.hxx index fa490b9ec0f0..1578bfd245cf 100644 --- a/include/sfx2/sidebar/PanelDescriptor.hxx +++ b/include/sfx2/sidebar/PanelDescriptor.hxx @@ -21,7 +21,6 @@ #include <sfx2/sidebar/EnumContext.hxx> #include <sfx2/sidebar/ContextList.hxx> -#include <boost/shared_ptr.hpp> namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx index 8708707b7c01..275737dd531e 100644 --- a/include/sfx2/sidebar/ResourceManager.hxx +++ b/include/sfx2/sidebar/ResourceManager.hxx @@ -25,7 +25,6 @@ #include <unotools/confignode.hxx> #include <com/sun/star/frame/XController.hpp> #include <set> -#include <boost/shared_ptr.hpp> #include <svtools/miscopt.hxx> namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index bf363edf415e..450190382b08 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -229,7 +229,7 @@ private: void ShowPopupMenu ( const Rectangle& rButtonBox, const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; - ::boost::shared_ptr<PopupMenu> CreatePopupMenu ( + std::shared_ptr<PopupMenu> CreatePopupMenu ( const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool); void BroadcastPropertyChange(); diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 036f149d8637..1620f5da3a35 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <boost/tuple/tuple.hpp> -#include <boost/scoped_ptr.hpp> #include <functional> diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index 9cb75241032a..3ebbfec6d9f4 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -28,8 +28,6 @@ #include <tools/wintypes.hxx> #include <vcl/window.hxx> -#include <boost/scoped_ptr.hpp> - class ExtMultiLineEdit; class SvtDocInfoTable_Impl; @@ -58,7 +56,7 @@ public: private: VclPtr<ExtMultiLineEdit> m_pEditWin; - boost::scoped_ptr< SvtDocInfoTable_Impl > m_xInfoTable; + std::unique_ptr< SvtDocInfoTable_Impl > m_xInfoTable; LanguageTag m_aLanguageTag; void insertEntry(OUString const & title, OUString const & value); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index c57cf37ea8ff..61ec8120a342 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -23,7 +23,6 @@ #include <vcl/metric.hxx> #include <vcl/scrbar.hxx> #include <vcl/vclptr.hxx> -#include <boost/shared_ptr.hpp> #include <map> #include <memory> #include <svx/svxdllapi.h> diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index b14099897111..7ba3b025350b 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -24,7 +24,6 @@ #include <sfx2/tbxctrl.hxx> #include <svx/svxdllapi.h> #include <com/sun/star/drawing/FillStyle.hpp> -#include <boost/scoped_ptr.hpp> class XFillStyleItem; class XFillColorItem; @@ -45,11 +44,11 @@ class ListBox; class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFillToolBoxControl : public SfxToolBoxControl { private: - boost::scoped_ptr< XFillStyleItem > mpStyleItem; - boost::scoped_ptr< XFillColorItem > mpColorItem; - boost::scoped_ptr< XFillGradientItem > mpFillGradientItem; - boost::scoped_ptr< XFillHatchItem > mpHatchItem; - boost::scoped_ptr< XFillBitmapItem > mpBitmapItem; + std::unique_ptr< XFillStyleItem > mpStyleItem; + std::unique_ptr< XFillColorItem > mpColorItem; + std::unique_ptr< XFillGradientItem > mpFillGradientItem; + std::unique_ptr< XFillHatchItem > mpHatchItem; + std::unique_ptr< XFillBitmapItem > mpBitmapItem; VclPtr<FillControl> mpFillControl; VclPtr<SvxFillTypeBox> mpLbFillType; diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index 47fd4b4b9efd..0d1faf0cb632 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -41,7 +41,6 @@ #include <vcl/vclptr.hxx> #include <svl/intitem.hxx> #include <com/sun/star/ui/XUIElement.hpp> -#include <boost/scoped_ptr.hpp> #include <svx/svxdllapi.h> class XFillFloatTransparenceItem; @@ -138,11 +137,11 @@ protected: VclPtr<MetricField> mpMTRAngle; VclPtr<ListBox> mpGradientStyle; - ::boost::scoped_ptr< XFillStyleItem > mpStyleItem; - ::boost::scoped_ptr< XFillColorItem > mpColorItem; - ::boost::scoped_ptr< XFillGradientItem > mpFillGradientItem; - ::boost::scoped_ptr< XFillHatchItem > mpHatchItem; - ::boost::scoped_ptr< XFillBitmapItem > mpBitmapItem; + std::unique_ptr< XFillStyleItem > mpStyleItem; + std::unique_ptr< XFillColorItem > mpColorItem; + std::unique_ptr< XFillGradientItem > mpFillGradientItem; + std::unique_ptr< XFillHatchItem > mpHatchItem; + std::unique_ptr< XFillBitmapItem > mpBitmapItem; Image maImgAxial; Image maImgElli; @@ -153,8 +152,8 @@ protected: AreaTransparencyGradientPopup maTrGrPopup; - ::boost::scoped_ptr< XFillFloatTransparenceItem > mpFloatTransparenceItem; - ::boost::scoped_ptr< SfxUInt16Item > mpTransparanceItem; + std::unique_ptr< XFillFloatTransparenceItem > mpFloatTransparenceItem; + std::unique_ptr< SfxUInt16Item > mpTransparanceItem; css::uno::Reference<css::frame::XFrame> mxFrame; diff --git a/opencl/source/opencl_device.cxx b/opencl/source/opencl_device.cxx index 646bbb93cfb1..491323db15dc 100644 --- a/opencl/source/opencl_device.cxx +++ b/opencl/source/opencl_device.cxx @@ -21,10 +21,9 @@ #include <float.h> #include <iostream> #include <sstream> +#include <memory> #include <vector> -#include <boost/scoped_ptr.hpp> - #include <comphelper/random.hxx> #include <opencl/openclconfig.hxx> #include <opencl/openclwrapper.hxx> @@ -517,7 +516,7 @@ ds_device getDeviceSelection(const char* sProfilePath, bool bForceSelection) } /* Populate input data for micro-benchmark */ - boost::scoped_ptr<LibreOfficeDeviceEvaluationIO> testData(new LibreOfficeDeviceEvaluationIO); + std::unique_ptr<LibreOfficeDeviceEvaluationIO> testData(new LibreOfficeDeviceEvaluationIO); testData->inputSize = INPUTSIZE; testData->outputSize = OUTPUTSIZE; testData->input0.resize(testData->inputSize); diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx index 688dab17bf5f..3c5dde5a0417 100644 --- a/opencl/source/openclconfig.cxx +++ b/opencl/source/openclconfig.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <boost/shared_ptr.hpp> #include <unicode/regex.h> #include <comphelper/configuration.hxx> diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index d6041e6c850b..ea0f3f864053 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -136,11 +136,11 @@ OString createFileName(cl_device_id deviceId, const char* clFileName) aHash + ".bin"; } -std::vector<boost::shared_ptr<osl::File> > binaryGenerated( const char * clFileName, cl_context context ) +std::vector<std::shared_ptr<osl::File> > binaryGenerated( const char * clFileName, cl_context context ) { size_t numDevices=0; - std::vector<boost::shared_ptr<osl::File> > aGeneratedFiles; + std::vector<std::shared_ptr<osl::File> > aGeneratedFiles; cl_int clStatus = clGetContextInfo( context, CL_CONTEXT_DEVICES, 0, NULL, &numDevices ); numDevices /= sizeof(numDevices); @@ -164,7 +164,7 @@ std::vector<boost::shared_ptr<osl::File> > binaryGenerated( const char * clFileN osl::File* pNewFile = new osl::File(rtl::OStringToOUString(fileName, RTL_TEXTENCODING_UTF8)); if(pNewFile->open(osl_File_OpenFlag_Read) == osl::FileBase::E_None) { - aGeneratedFiles.push_back(boost::shared_ptr<osl::File>(pNewFile)); + aGeneratedFiles.push_back(std::shared_ptr<osl::File>(pNewFile)); SAL_INFO("opencl.file", "Opening binary file '" << fileName << "' for reading: success"); } else @@ -397,7 +397,7 @@ bool buildProgramFromBinary(const char* buildOption, GPUEnv* gpuInfo, const char numDevices /= sizeof(numDevices); CHECK_OPENCL( clStatus, "clGetContextInfo" ); - std::vector<boost::shared_ptr<osl::File> > aGeneratedFiles = binaryGenerated( + std::vector<std::shared_ptr<osl::File> > aGeneratedFiles = binaryGenerated( filename, gpuInfo->mpContext ); if (aGeneratedFiles.size() == numDevices) diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 7d68b37b2348..08279d741c23 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -885,7 +885,7 @@ void SidebarController::ShowPopupMenu ( const Rectangle& rButtonBox, const ::std::vector<TabBar::DeckMenuData>& rMenuData) const { - ::boost::shared_ptr<PopupMenu> pMenu = CreatePopupMenu(rMenuData); + std::shared_ptr<PopupMenu> pMenu = CreatePopupMenu(rMenuData); pMenu->SetSelectHdl(LINK(const_cast<SidebarController*>(this), SidebarController, OnMenuItemSelected)); // pass toolbox button rect so the menu can stay open on button up @@ -894,11 +894,11 @@ void SidebarController::ShowPopupMenu ( pMenu->Execute(mpParentWindow, aBox, PopupMenuFlags::ExecuteDown); } -::boost::shared_ptr<PopupMenu> SidebarController::CreatePopupMenu ( +std::shared_ptr<PopupMenu> SidebarController::CreatePopupMenu ( const ::std::vector<TabBar::DeckMenuData>& rMenuData) const { // Create the top level popup menu. - ::boost::shared_ptr<PopupMenu> pMenu (new PopupMenu()); + std::shared_ptr<PopupMenu> pMenu (new PopupMenu()); FloatingWindow* pMenuWindow = dynamic_cast<FloatingWindow*>(pMenu->GetWindow()); if (pMenuWindow != NULL) { diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index 5009dbe62681..dab919003daa 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -26,8 +26,8 @@ #include "activity.hxx" #include "activitiesqueue.hxx" -#include <boost/shared_ptr.hpp> #include <algorithm> +#include <memory> using namespace ::com::sun::star; @@ -37,7 +37,7 @@ namespace slideshow namespace internal { ActivitiesQueue::ActivitiesQueue( - const ::boost::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ) : + const std::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ) : mpTimer( pPresTimer ), maCurrentActivitiesWaiting(), maCurrentActivitiesReinsert(), diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 77a23336e238..b69f0d8d2183 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -27,8 +27,8 @@ #include <eventqueue.hxx> #include <slideshowexceptions.hxx> -#include <boost/shared_ptr.hpp> #include <limits> +#include <memory> using namespace ::com::sun::star; @@ -46,7 +46,7 @@ namespace slideshow EventQueue::EventQueue( - boost::shared_ptr<canvas::tools::ElapsedTime> const & pPresTimer ) + std::shared_ptr<canvas::tools::ElapsedTime> const & pPresTimer ) : maMutex(), maEvents(), maNextEvents(), diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index a5103c0bec6f..47f18e94a52d 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -59,7 +59,7 @@ class RehearseTimingsActivity::WakeupEvent : public Event, private ::boost::noncopyable { public: - WakeupEvent( boost::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase, + WakeupEvent( std::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase, ActivitySharedPtr const& rActivity, ActivitiesQueue & rActivityQueue ) : Event("WakeupEvent"), diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx index f35b735e04dd..79f01f45f4a8 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.hxx +++ b/slideshow/source/engine/rehearsetimingsactivity.hxx @@ -97,9 +97,9 @@ private: class MouseHandler; friend class MouseHandler; - typedef ::std::vector< - ::std::pair<UnoViewSharedPtr, - boost::shared_ptr<cppcanvas::CustomSprite> > > ViewsVecT; + typedef std::vector< + std::pair<UnoViewSharedPtr, + std::shared_ptr<cppcanvas::CustomSprite> > > ViewsVecT; template <typename func_type> void for_each_sprite( func_type const & func ) const diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 65d22e8c8e0d..f15cc842b726 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -87,10 +87,10 @@ namespace slideshow ENSURE_OR_THROW( mpViewLayer->getCanvas(), "ViewMediaShape::ViewMediaShape(): Invalid ViewLayer canvas" ); ENSURE_OR_THROW( mxComponentContext.is(), "ViewMediaShape::ViewMediaShape(): Invalid component context" ); - UnoViewSharedPtr pUnoView (::boost::dynamic_pointer_cast<UnoView>(rViewLayer)); - if (pUnoView) + UnoViewSharedPtr xUnoView(std::dynamic_pointer_cast<UnoView>(rViewLayer)); + if (xUnoView) { - mbIsSoundEnabled = pUnoView->isSoundEnabled(); + mbIsSoundEnabled = xUnoView->isSoundEnabled(); } } diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index fa739429b9d8..2c78e7866d6c 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -557,7 +557,7 @@ namespace slideshow { } - virtual bool isOnView(boost::shared_ptr<View> const& /*rView*/) const SAL_OVERRIDE + virtual bool isOnView(std::shared_ptr<View> const& /*rView*/) const SAL_OVERRIDE { return true; // visible on all views } diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 99e34530dd31..9a145ddf8f13 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -445,7 +445,7 @@ private: boost::optional<sal_Int32> maEraseInk; //end changed - boost::shared_ptr<canvas::tools::ElapsedTime> mpPresTimer; + std::shared_ptr<canvas::tools::ElapsedTime> mpPresTimer; ScreenUpdater maScreenUpdater; EventQueue maEventQueue; EventMultiplexer maEventMultiplexer; @@ -2005,7 +2005,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) //Get a shared-ptr that outlives the scope-guard which will //ensure that the pointed-to-item exists in the case of a //::dispose clearing mpPresTimer - boost::shared_ptr<canvas::tools::ElapsedTime> xTimer(mpPresTimer); + std::shared_ptr<canvas::tools::ElapsedTime> xTimer(mpPresTimer); comphelper::ScopeGuard scopeGuard( boost::bind( &canvas::tools::ElapsedTime::releaseTimer, boost::cref(xTimer) ) ); diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index e3c00ea6d9c1..4aa348f60e98 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -84,7 +84,7 @@ struct SpriteEntry return mnPriority < rRHS.mnPriority; } - boost::weak_ptr< cppcanvas::CustomSprite > mpSprite; + std::weak_ptr< cppcanvas::CustomSprite > mpSprite; double mnPriority; }; @@ -570,7 +570,7 @@ private: basegfx::B2IRange(0,0,rSpriteSize.getX(),rSpriteSize.getY())); } - virtual bool isOnView(boost::shared_ptr<View> const& rView) const SAL_OVERRIDE + virtual bool isOnView(std::shared_ptr<View> const& rView) const SAL_OVERRIDE { return rView.get() == mpParentView; } @@ -692,7 +692,7 @@ private: virtual void setCursorShape( sal_Int16 nPointerShape ) SAL_OVERRIDE; // ViewLayer interface - virtual bool isOnView(boost::shared_ptr<View> const& rView) const SAL_OVERRIDE; + virtual bool isOnView(std::shared_ptr<View> const& rView) const SAL_OVERRIDE; virtual void clear() const SAL_OVERRIDE; virtual void clearAll() const SAL_OVERRIDE; virtual cppcanvas::CanvasSharedPtr getCanvas() const SAL_OVERRIDE; @@ -727,7 +727,7 @@ private: void updateClip(); private: - typedef std::vector< boost::weak_ptr<SlideViewLayer> > ViewLayerVector; + typedef std::vector< std::weak_ptr<SlideViewLayer> > ViewLayerVector; /// Prune viewlayers from deceased ones, optionally update them void pruneLayers( bool bWithViewLayerUpdate=false ) const; @@ -833,14 +833,14 @@ ViewLayerSharedPtr SlideView::createViewLayer( const basegfx::B2DRange& rLayerBo if( nNumLayers > LAYER_ULLAGE ) pruneLayers(); - boost::shared_ptr<SlideViewLayer> pViewLayer( new SlideViewLayer(mpCanvas, + std::shared_ptr<SlideViewLayer> xViewLayer( new SlideViewLayer(mpCanvas, getTransformation(), rLayerBounds, maUserSize, this) ); - maViewLayers.push_back( pViewLayer ); + maViewLayers.push_back(xViewLayer); - return pViewLayer; + return xViewLayer; } bool SlideView::updateScreen() const @@ -915,7 +915,7 @@ void SlideView::setCursorShape( sal_Int16 nPointerShape ) mxView->setMouseCursor( nPointerShape ); } -bool SlideView::isOnView(boost::shared_ptr<View> const& rView) const +bool SlideView::isOnView(std::shared_ptr<View> const& rView) const { return rView.get() == this; } @@ -1145,14 +1145,14 @@ void SlideView::pruneLayers( bool bWithViewLayerUpdate ) const // check all layers for validity, and retain only the live ones for( const auto& rViewLayer : maViewLayers ) { - boost::shared_ptr< SlideViewLayer > pCurrLayer( rViewLayer.lock() ); + std::shared_ptr< SlideViewLayer > xCurrLayer( rViewLayer.lock() ); - if( pCurrLayer ) + if (xCurrLayer) { - aValidLayers.push_back( pCurrLayer ); + aValidLayers.push_back(xCurrLayer); if( bWithViewLayerUpdate ) - pCurrLayer->updateView( rCurrTransform, + xCurrLayer->updateView( rCurrTransform, maUserSize ); } } @@ -1167,7 +1167,7 @@ UnoViewSharedPtr createSlideView( uno::Reference< presentation::XSlideShowView> EventQueue& rEventQueue, EventMultiplexer& rEventMultiplexer ) { - boost::shared_ptr<SlideView> const that( + std::shared_ptr<SlideView> const that( comphelper::make_shared_from_UNO( new SlideView(xView, rEventQueue, diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index a39d40162147..a029608ebef5 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -358,7 +358,7 @@ bool SlideChangeBase::operator()( double nValue ) void SlideChangeBase::prepareForRun( const ViewEntry& /* rViewEntry */, - const boost::shared_ptr<cppcanvas::Canvas>& /* rDestinationCanvas */ ) + const std::shared_ptr<cppcanvas::Canvas>& /* rDestinationCanvas */ ) { } diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index 7860150b30f0..5eb268b5ebaa 100644 --- a/slideshow/source/engine/transitions/slidechangebase.hxx +++ b/slideshow/source/engine/transitions/slidechangebase.hxx @@ -98,9 +98,9 @@ protected: /// The view this entry is for UnoViewSharedPtr mpView; /// outgoing slide sprite - boost::shared_ptr<cppcanvas::CustomSprite> mpOutSprite; + std::shared_ptr<cppcanvas::CustomSprite> mpOutSprite; /// incoming slide sprite - boost::shared_ptr<cppcanvas::CustomSprite> mpInSprite; + std::shared_ptr<cppcanvas::CustomSprite> mpInSprite; /// outgoing slide bitmap mutable SlideBitmapSharedPtr mpLeavingBitmap; /// incoming slide bitmap @@ -124,7 +124,7 @@ protected: ::basegfx::B2ISize getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const; static void renderBitmap( SlideBitmapSharedPtr const& pSlideBitmap, - boost::shared_ptr<cppcanvas::Canvas> const& pCanvas ); + std::shared_ptr<cppcanvas::Canvas> const& pCanvas ); /** Called on derived classes to perform actions before first run. @@ -150,9 +150,9 @@ protected: Current parameter value */ virtual void performIn( - const boost::shared_ptr<cppcanvas::CustomSprite>& rSprite, + const std::shared_ptr<cppcanvas::CustomSprite>& rSprite, const ViewEntry& rViewEntry, - const boost::shared_ptr<cppcanvas::Canvas>& rDestinationCanvas, + const std::shared_ptr<cppcanvas::Canvas>& rDestinationCanvas, double t ); /** Called on derived classes to implement actual slide change. @@ -167,16 +167,16 @@ protected: Current parameter value */ virtual void performOut( - const boost::shared_ptr<cppcanvas::CustomSprite>& rSprite, + const std::shared_ptr<cppcanvas::CustomSprite>& rSprite, const ViewEntry& rViewEntry, - const boost::shared_ptr<cppcanvas::Canvas>& rDestinationCanvas, + const std::shared_ptr<cppcanvas::Canvas>& rDestinationCanvas, double t ); ScreenUpdater& getScreenUpdater() const { return mrScreenUpdater; } private: - boost::shared_ptr<cppcanvas::CustomSprite> createSprite( + std::shared_ptr<cppcanvas::CustomSprite> createSprite( UnoViewSharedPtr const & pView, ::basegfx::B2DSize const & rSpriteSize, double nPrio ) const; diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx index 35c13963403d..5479d103516d 100644 --- a/slideshow/source/engine/wakeupevent.cxx +++ b/slideshow/source/engine/wakeupevent.cxx @@ -26,7 +26,7 @@ namespace slideshow namespace internal { WakeupEvent::WakeupEvent( - boost::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase, + std::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase, ActivitiesQueue& rActivityQueue ) : Event("WakeupEvent"), maTimer(pTimeBase), diff --git a/slideshow/source/inc/activitiesqueue.hxx b/slideshow/source/inc/activitiesqueue.hxx index 78057f02faa0..24a0031208b1 100644 --- a/slideshow/source/inc/activitiesqueue.hxx +++ b/slideshow/source/inc/activitiesqueue.hxx @@ -52,7 +52,7 @@ namespace slideshow adjusting and holding global presentation time. */ ActivitiesQueue( - const ::boost::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ); + const std::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ); ~ActivitiesQueue(); /** Add the given activity to the queue. @@ -83,11 +83,11 @@ namespace slideshow /** Gets the queue's timer object. */ - ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const & + std::shared_ptr< ::canvas::tools::ElapsedTime > const & getTimer() const { return mpTimer; } private: - ::boost::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer; + std::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer; typedef ::std::deque< ActivitySharedPtr > ActivityQueue; diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx index c014ff36be5b..d3f5bebc4201 100644 --- a/slideshow/source/inc/eventqueue.hxx +++ b/slideshow/source/inc/eventqueue.hxx @@ -44,7 +44,7 @@ namespace slideshow { public: EventQueue( - ::boost::shared_ptr< ::canvas::tools::ElapsedTime > + std::shared_ptr< ::canvas::tools::ElapsedTime > const & pPresTimer ); ~EventQueue(); @@ -113,7 +113,7 @@ namespace slideshow /** Gets the queue's timer object. */ - ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const & + std::shared_ptr< ::canvas::tools::ElapsedTime > const & getTimer() const { return mpTimer; } private: @@ -140,7 +140,7 @@ namespace slideshow // perform timing of events via relative time // measurements. The world time starts, when the // EventQueue object is created - ::boost::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer; + std::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer; }; } diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx index 203530fbd853..f05e4a01fba5 100644 --- a/slideshow/source/inc/shapeimporter.hxx +++ b/slideshow/source/inc/shapeimporter.hxx @@ -35,9 +35,9 @@ namespace internal { struct SlideShowContext; -typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector; -typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr; -typedef ::std::vector< UnoViewSharedPtr > UnoViewVector; +typedef std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector; +typedef std::shared_ptr< UnoView > UnoViewSharedPtr; +typedef std::vector< UnoViewSharedPtr > UnoViewVector; /** This class imports all shapes from a given XShapes object */ diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index e1eefd7f1923..bd6a4ea7ccbe 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -281,13 +281,13 @@ namespace slideshow /** Fill a plain rectangle on the given canvas with the given color */ - void fillRect( const boost::shared_ptr< cppcanvas::Canvas >& rCanvas, + void fillRect( const std::shared_ptr< cppcanvas::Canvas >& rCanvas, const basegfx::B2DRange& rRect, cppcanvas::Color::IntSRGBA aFillColor ); /** Init canvas with default background (white) */ - void initSlideBackground( const boost::shared_ptr< cppcanvas::Canvas >& rCanvas, + void initSlideBackground( const std::shared_ptr< cppcanvas::Canvas >& rCanvas, const basegfx::B2IVector& rSize ); /// Gets a random ordinal [0,n) @@ -389,7 +389,7 @@ namespace slideshow */ basegfx::B2IVector getSlideSizePixel( const basegfx::B2DVector& rSize, - const boost::shared_ptr<UnoView>& pView ); + const std::shared_ptr<UnoView>& pView ); } // TODO(Q1): this could possibly be implemented with a somewhat diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx index 81ad021dcdad..84b8655b1dec 100644 --- a/slideshow/source/inc/unoview.hxx +++ b/slideshow/source/inc/unoview.hxx @@ -69,8 +69,8 @@ namespace slideshow virtual void setIsSoundEnabled (const bool bValue) = 0; }; - typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr; - typedef ::std::vector< UnoViewSharedPtr > UnoViewVector; + typedef std::shared_ptr< UnoView > UnoViewSharedPtr; + typedef std::vector< UnoViewSharedPtr > UnoViewVector; } } diff --git a/slideshow/source/inc/view.hxx b/slideshow/source/inc/view.hxx index f83ae3423e54..5264640d5993 100644 --- a/slideshow/source/inc/view.hxx +++ b/slideshow/source/inc/view.hxx @@ -79,8 +79,8 @@ namespace slideshow virtual void setCursorShape( sal_Int16 nPointerShape ) = 0; }; - typedef ::boost::shared_ptr< View > ViewSharedPtr; - typedef ::std::vector< ViewSharedPtr > ViewVector; + typedef std::shared_ptr< View > ViewSharedPtr; + typedef std::vector< ViewSharedPtr > ViewVector; } } diff --git a/slideshow/source/inc/viewlayer.hxx b/slideshow/source/inc/viewlayer.hxx index a30d210820a5..5fa1cdb49a96 100644 --- a/slideshow/source/inc/viewlayer.hxx +++ b/slideshow/source/inc/viewlayer.hxx @@ -57,14 +57,14 @@ namespace slideshow @return true, if this layer displays on the given view. */ - virtual bool isOnView(boost::shared_ptr<View> const& rView) const = 0; + virtual bool isOnView(std::shared_ptr<View> const& rView) const = 0; /** Get the associated canvas of this layer. The canvas returned by this method must not change, as long as this object is alive. */ - virtual boost::shared_ptr< cppcanvas::Canvas > getCanvas() const = 0; + virtual std::shared_ptr< cppcanvas::Canvas > getCanvas() const = 0; /** Clear the clipped view layer area @@ -99,7 +99,7 @@ namespace slideshow @return the sprite, or NULL on failure (or if this canvas does not support sprites). */ - virtual boost::shared_ptr< cppcanvas::CustomSprite > + virtual std::shared_ptr< cppcanvas::CustomSprite > createSprite( const basegfx::B2DVector& rSpriteSizePixel, double nPriority ) const = 0; @@ -163,7 +163,7 @@ namespace slideshow }; - typedef boost::shared_ptr< ViewLayer > ViewLayerSharedPtr; + typedef std::shared_ptr< ViewLayer > ViewLayerSharedPtr; } } diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx index 4819d42af3f9..9751006fb89c 100644 --- a/slideshow/source/inc/wakeupevent.hxx +++ b/slideshow/source/inc/wakeupevent.hxx @@ -42,7 +42,7 @@ class WakeupEvent : public Event, { public: WakeupEvent( - ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase, + std::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase, ActivitiesQueue & rActivityQueue ); virtual void dispose() SAL_OVERRIDE; |