diff options
Diffstat (limited to 'canvas/source/directx')
-rw-r--r-- | canvas/source/directx/dx_bitmap.hxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_bitmapprovider.hxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_canvasbitmap.hxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_canvasfont.hxx | 6 | ||||
-rw-r--r-- | canvas/source/directx/dx_canvashelper_texturefill.cxx | 3 | ||||
-rw-r--r-- | canvas/source/directx/dx_gdiplususer.hxx | 5 | ||||
-rw-r--r-- | canvas/source/directx/dx_graphicsprovider.hxx | 5 | ||||
-rw-r--r-- | canvas/source/directx/dx_ibitmap.hxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_impltools.hxx | 6 | ||||
-rw-r--r-- | canvas/source/directx/dx_rendermodule.hxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_surfacebitmap.hxx | 2 | ||||
-rw-r--r-- | canvas/source/directx/dx_textlayout_drawhelper.hxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_vcltools.cxx | 8 | ||||
-rw-r--r-- | canvas/source/directx/dx_vcltools.hxx | 8 | ||||
-rw-r--r-- | canvas/source/directx/dx_winstuff.hxx | 17 |
15 files changed, 37 insertions, 47 deletions
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 |