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/ios | |
| 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/ios')
| -rw-r--r-- | vcl/ios/dummies.cxx | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx index ff8991dfacfa..641b0db2d6bf 100644 --- a/vcl/ios/dummies.cxx +++ b/vcl/ios/dummies.cxx @@ -24,9 +24,9 @@ #include "unx/gendata.hxx" -SalPrinter* SvpSalInstance::CreatePrinter( SalInfoPrinter* /* pInfoPrinter */ ) +std::unique_ptr<SalPrinter> SvpSalInstance::CreatePrinter( SalInfoPrinter* /* pInfoPrinter */ ) { - return NULL; + return nullptr; } OUString SvpSalInstance::GetDefaultPrinter() @@ -39,11 +39,6 @@ GenPspGraphics *SvpSalInstance::CreatePrintGraphics() return NULL; } -void SvpSalInstance::DestroyPrinter( SalPrinter* pPrinter ) -{ - delete pPrinter; -} - void SvpSalInstance::PostPrintersChanged() { } @@ -72,9 +67,9 @@ void SvpSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) delete pInfo; } -SalPrinter* SalGenericInstance::CreatePrinter( SalInfoPrinter* /* pInfoPrinter */ ) +std::unique_ptr<SalPrinter> SalGenericInstance::CreatePrinter( SalInfoPrinter* /* pInfoPrinter */ ) { - return NULL; + return nullptr; } OUString SalGenericInstance::GetDefaultPrinter() @@ -82,11 +77,6 @@ OUString SalGenericInstance::GetDefaultPrinter() return OUString(); } -void SalGenericInstance::DestroyPrinter( SalPrinter* pPrinter ) -{ - delete pPrinter; -} - void SalGenericInstance::PostPrintersChanged() { } |