diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-21 13:37:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-21 19:34:16 +0000 |
| commit | 599fab44ad2ca626f046b9e9e4924110950a897c (patch) | |
| tree | 4304f1e7f0ab68f88b105f5779b8ec619e176c12 /sd | |
| parent | da4c217ac49ff05e352c0e6e46a46a4e9a0b78cc (diff) | |
hide ScopedPtr::reset and add disposeAndClear
Change-Id: I55d6e789abd408b8478a2b9ae141d8899af2c309
Reviewed-on: https://gerrit.libreoffice.org/18745
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index f385ae549ff0..697b8d478b46 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -388,7 +388,7 @@ void Layer::Initialize (sd::Window *pTargetWindow) #else if ( ! mpLayerDevice) { - mpLayerDevice.reset(VclPtr<VirtualDevice>::Create(*pTargetWindow)); + mpLayerDevice.disposeAndReset(VclPtr<VirtualDevice>::Create(*pTargetWindow)); mpLayerDevice->SetOutputSizePixel(pTargetWindow->GetSizePixel()); } #endif diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 91b7e8ef3346..a2c8e4643eba 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -162,9 +162,9 @@ Bitmap PageObjectPainter::CreateMarkedPreview ( { ScopedVclPtr<VirtualDevice> pDevice; if (pReferenceDevice != NULL) - pDevice.reset(VclPtr<VirtualDevice>::Create(*pReferenceDevice)); + pDevice.disposeAndReset(VclPtr<VirtualDevice>::Create(*pReferenceDevice)); else - pDevice.reset(VclPtr<VirtualDevice>::Create()); + pDevice.disposeAndReset(VclPtr<VirtualDevice>::Create()); pDevice->SetOutputSizePixel(rSize); pDevice->DrawBitmap(Point(0,0), rSize, rPreview); |