diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/headless/svpvd.cxx | 4 | ||||
| -rw-r--r-- | vcl/inc/headless/svpvd.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/salvd.hxx | 5 | ||||
| -rw-r--r-- | vcl/source/gdi/virdev.cxx | 10 |
4 files changed, 11 insertions, 10 deletions
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index c2dbbb7c81a3..1711f396cac5 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -51,11 +51,11 @@ void SvpSalVirtualDevice::ReleaseGraphics( SalGraphics* pGraphics ) bool SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY ) { - return SetSizeUsingBuffer(nNewDX, nNewDY, boost::shared_array<sal_uInt8>()); + return SetSizeUsingBuffer(nNewDX, nNewDY, std::shared_ptr<sal_uInt8>()); } bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, - const boost::shared_array<sal_uInt8> &pBuffer ) + const std::shared_ptr<sal_uInt8> &pBuffer ) { B2IVector aDevSize( nNewDX, nNewDY ); if( aDevSize.getX() == 0 ) diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx index 967dc0fad7bb..9807c78c65e0 100644 --- a/vcl/inc/headless/svpvd.hxx +++ b/vcl/inc/headless/svpvd.hxx @@ -47,7 +47,7 @@ public: virtual bool SetSize( long nNewDX, long nNewDY ) override; virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, - const boost::shared_array<sal_uInt8> &pBuffer + const std::shared_ptr<sal_uInt8> &pBuffer ) override; // SalGeometryProvider diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx index 4500cd9748c4..d3874c110399 100644 --- a/vcl/inc/salvd.hxx +++ b/vcl/inc/salvd.hxx @@ -22,7 +22,8 @@ #include <vcl/dllapi.h> #include <salgeom.hxx> -#include <boost/shared_array.hpp> + +#include <memory> class SalGraphics; @@ -47,7 +48,7 @@ public: // Set new size using a buffer at the given address virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, - const boost::shared_array<sal_uInt8> & /* pBuffer */ ) + const std::shared_ptr<sal_uInt8> & /* pBuffer */ ) { // Only the headless virtual device has an implementation that uses // pBuffer (and bTopDown). diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 0b00b4c2a2a3..bd7adffd43a3 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -280,7 +280,7 @@ void VirtualDevice::dispose() } bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase, - const boost::shared_array<sal_uInt8> &pBuffer ) + const std::shared_ptr<sal_uInt8> &pBuffer ) { SAL_INFO( "vcl.gdi", "VirtualDevice::InnerImplSetOutputSizePixel( " << rNewSize.Width() << ", " @@ -386,7 +386,7 @@ void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect ) } bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, - const boost::shared_array<sal_uInt8> &pBuffer ) + const std::shared_ptr<sal_uInt8> &pBuffer ) { if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) ) { @@ -402,7 +402,7 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, { mpAlphaVDev = VclPtr<VirtualDevice>::Create(*this, meAlphaFormat); mpAlphaVDev->InnerImplSetOutputSizePixel(rNewSize, bErase, - boost::shared_array<sal_uInt8>()); + std::shared_ptr<sal_uInt8>()); } // TODO: copy full outdev state to new one, here. Also needed in outdev2.cxx:DrawOutDev @@ -435,12 +435,12 @@ void VirtualDevice::EnableRTL( bool bEnable ) bool VirtualDevice::SetOutputSizePixel( const Size& rNewSize, bool bErase ) { - return ImplSetOutputSizePixel(rNewSize, bErase, boost::shared_array<sal_uInt8>()); + return ImplSetOutputSizePixel(rNewSize, bErase, std::shared_ptr<sal_uInt8>()); } bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, - const boost::shared_array<sal_uInt8> &pBuffer ) + const std::shared_ptr<sal_uInt8> &pBuffer ) { if (pBuffer) { MapMode mm = GetMapMode(); |