diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-08 13:32:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-09 13:11:47 +0200 |
commit | 6d008c9e1dbe4240a10c8789860dc30b0cb0b2d5 (patch) | |
tree | 25330d9240ea3ef0687809ab8286c1e2c4b1c75f /vcl/unx/generic/print | |
parent | 84efebb5304b2ebbc03e7743b131ce4d5ad10c03 (diff) |
hold and return SalPrinter with std::unique_ptr
and remove DestroyPrinter, doesn't not anything beyond delete'ing the
object
Change-Id: I25e14b962e65a0e131fae3ff5771c82920a4e375
Reviewed-on: https://gerrit.libreoffice.org/55498
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx/generic/print')
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index dc1d4ebf54cd..7a36e3196b9a 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -392,19 +392,14 @@ void SalGenericInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter ) delete pPrinter; } -SalPrinter* SalGenericInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) +std::unique_ptr<SalPrinter> SalGenericInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) { mbPrinterInit = true; // create and initialize SalPrinter PspSalPrinter* pPrinter = new PspSalPrinter( pInfoPrinter ); pPrinter->m_aJobData = static_cast<PspSalInfoPrinter*>(pInfoPrinter)->m_aJobData; - return pPrinter; -} - -void SalGenericInstance::DestroyPrinter( SalPrinter* pPrinter ) -{ - delete pPrinter; + return std::unique_ptr<SalPrinter>(pPrinter); } void SalGenericInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) |