diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-03-24 23:04:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-29 10:08:34 +0000 |
| commit | 4b039f27a2fe85a76ac8ccbf882fe9aff6870b4c (patch) | |
| tree | 2005d2597cae73f49e88fccf3b4b2009d94248b4 | |
| parent | 017a864caf4c57f1dcff28fce824f2a41ea6e027 (diff) | |
vcl: replace boost::shared_array with std::shared_ptr
The boost::bind here looks totally pointless too.
No idea why this uses rtl_allocateMemory, let's keep that.
Change-Id: If51ba9837a318f11094ee39225233212a848a955
Reviewed-on: https://gerrit.libreoffice.org/23502
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/inc/osx/salprn.h | 5 | ||||
| -rw-r--r-- | vcl/osx/salprn.cxx | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index 363c137be121..bfedb08aa965 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -24,8 +24,7 @@ #include "salprn.hxx" -#include <boost/shared_array.hpp> - +#include <memory> class AquaSalGraphics; @@ -48,7 +47,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter /// graphics context for Quartz 2D CGContextRef mrContext; /// memory for graphics bitmap context for querying metrics - boost::shared_array< sal_uInt8 > maContextMemory; + std::shared_ptr<sal_uInt8> mpContextMemory; // since changes to NSPrintInfo during a job are ignored // we have to care for some settings ourselves diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index 3ec863109cae..af51e0544120 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <boost/bind.hpp> - #include "officecfg/Office/Common.hxx" #include <vcl/print.hxx> @@ -78,12 +76,14 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) : mpGraphics = new AquaSalGraphics(); const int nWidth = 100, nHeight = 100; - maContextMemory.reset( static_cast<sal_uInt8*>( rtl_allocateMemory( nWidth * 4 * nHeight ) ), - boost::bind( rtl_freeMemory, _1 ) ); + mpContextMemory.reset(static_cast<sal_uInt8*>(rtl_allocateMemory(nWidth * 4 * nHeight)), + &rtl_freeMemory); - if( maContextMemory ) + if (mpContextMemory) { - mrContext = CGBitmapContextCreate( maContextMemory.get(), nWidth, nHeight, 8, nWidth * 4, GetSalData()->mxRGBSpace, kCGImageAlphaNoneSkipFirst ); + mrContext = CGBitmapContextCreate(mpContextMemory.get(), + nWidth, nHeight, 8, nWidth * 4, + GetSalData()->mxRGBSpace, kCGImageAlphaNoneSkipFirst); if( mrContext ) SetupPrinterGraphics( mrContext ); } |