Kaydet (Commit) 474b4bbf authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in VCLXGraphics

Change-Id: If753b871831a9954048becd0aca73769e23163ec
üst fa286c89
......@@ -32,6 +32,7 @@
#include <vcl/vclenum.hxx>
#include <vcl/vclptr.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
class OutputDevice;
namespace vcl { class Region; }
......@@ -68,7 +69,7 @@ private:
Color maLineColor;
Color maFillColor;
RasterOp meRasterOp;
vcl::Region* mpClipRegion;
std::unique_ptr<vcl::Region> mpClipRegion;
void initAttrs();
......
......@@ -79,7 +79,7 @@ VCLXGraphics::~VCLXGraphics()
}
}
delete mpClipRegion;
mpClipRegion.reset();
SolarMutexGuard g;
mpOutputDevice.reset();
......@@ -227,11 +227,10 @@ void VCLXGraphics::setClipRegion( const uno::Reference< awt::XRegion >& rxRegion
{
SolarMutexGuard aGuard;
delete mpClipRegion;
if ( rxRegion.is() )
mpClipRegion = new vcl::Region( VCLUnoHelper::GetRegion( rxRegion ) );
mpClipRegion.reset( new vcl::Region( VCLUnoHelper::GetRegion( rxRegion ) ) );
else
mpClipRegion = nullptr;
mpClipRegion.reset();
}
void VCLXGraphics::intersectClipRegion( const uno::Reference< awt::XRegion >& rxRegion )
......@@ -242,7 +241,7 @@ void VCLXGraphics::intersectClipRegion( const uno::Reference< awt::XRegion >& rx
{
vcl::Region aRegion( VCLUnoHelper::GetRegion( rxRegion ) );
if ( !mpClipRegion )
mpClipRegion = new vcl::Region( aRegion );
mpClipRegion.reset( new vcl::Region( aRegion ) );
else
mpClipRegion->Intersect( aRegion );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment