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 /sc/source | |
| 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 'sc/source')
| -rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 1b74471c2cdc..a38c85f6f406 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1153,7 +1153,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJus pDlg->ShowExtras( SfxShowExtras::CONFIRM ); if ( pDlg->Execute() == RET_OK ) aPassword = pDlg->GetPassword(); - pDlg.reset(); + pDlg.disposeAndClear(); if (!aPassword.isEmpty()) { diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 6faf516234ff..72c6202e32e2 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -496,7 +496,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod // #i45033# For OLE inplace editing with different zoom factors, // use a virtual device with 1/100th mm as text formatting reference - xFmtVirtDev.reset( VclPtr<VirtualDevice>::Create() ); + xFmtVirtDev.disposeAndReset( VclPtr<VirtualDevice>::Create() ); xFmtVirtDev->SetMapMode( MAP_100TH_MM ); aOutputData.SetFmtDevice( xFmtVirtDev.get() ); |