diff options
author | Mark Page <aptitude@btconnect.com> | 2016-12-05 14:03:12 +0000 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-06 18:17:56 +0000 |
commit | d08db164dcac8f6aa88158b2848abb5ad66a4052 (patch) | |
tree | bacb0e7b183115e3b00bd4c375b37908264f0f87 /svx/source/svdraw/svdfmtf.cxx | |
parent | 0c6c37cb01c242ad9324bc91ac15c974529086c5 (diff) |
Change Read/Write access to Scoped Read/Write access
Change-Id: Idbe8e393b64f2a151e20c1851d7c14fa161acf97
Reviewed-on: https://gerrit.libreoffice.org/31635
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/svdraw/svdfmtf.cxx')
-rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index a19a53422688..52a11eceb751 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1595,7 +1595,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct) aOldMask = aBitmapEx.GetBitmap().CreateMask(aBitmapEx.GetTransparentColor()); } - BitmapWriteAccess* pOld = aOldMask.AcquireWriteAccess(); + AlphaMask::ScopedWriteAccess pOld(aOldMask); if(pOld) { @@ -1618,7 +1618,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct) } else { - BitmapReadAccess* pNew = aNewMask.AcquireReadAccess(); + AlphaMask::ScopedReadAccess pNew(aNewMask); if(pNew) { @@ -1641,7 +1641,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct) OSL_ENSURE(false, "Alpha masks have different sizes (!)"); } - aNewMask.ReleaseAccess(pNew); + pNew.reset(); } else { @@ -1649,7 +1649,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct) } } - aOldMask.ReleaseAccess(pOld); + pOld.reset(); } else { |