diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-06-08 15:34:12 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-06-12 16:22:04 +0000 |
| commit | 93da9ecd9de9a1d0ae3aafaded815ee179fb0f30 (patch) | |
| tree | 7c3f6c18724c12a04ba7ce44bf2b97756861bb2d /sw/source/ui/envelp/labprt.cxx | |
| parent | fae87e03ea3829718ec0381ed3b04ceb52c23720 (diff) | |
Writer FrameControl lifecycle and management cleanup.
We can't derive from a VclPtr base-class, and also another base,
and then use boost::shared_ptr for that; re-factor to use a boost_ptr
to hold a VclPtr<> for now. Also fix leaking envelope dialog.
Change-Id: I2e1efbfaee3b6051e38ff7a14903a83ccd75136b
Reviewed-on: https://gerrit.libreoffice.org/16160
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sw/source/ui/envelp/labprt.cxx')
| -rw-r--r-- | sw/source/ui/envelp/labprt.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index ae81bbeac08d..59e3e06ed453 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -91,7 +91,7 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton ) VclPtrInstance< PrinterSetupDialog > pDlg(this); pDlg->SetPrinter(pPrinter); pDlg->Execute(); - pDlg.reset(); + pDlg.disposeAndClear(); GrabFocus(); m_pPrinterInfo->SetText(pPrinter->GetName()); return 0; |