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/inc/unx | |
| 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/inc/unx')
| -rw-r--r-- | vcl/inc/unx/geninst.h | 3 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h index af97a2d9ba83..3b9b7b79ca82 100644 --- a/vcl/inc/unx/geninst.h +++ b/vcl/inc/unx/geninst.h @@ -60,8 +60,7 @@ public: virtual SalInfoPrinter* CreateInfoPrinter ( SalPrinterQueueInfo* pQueueInfo, ImplJobSetup* pSetupData ) override; virtual void DestroyInfoPrinter ( SalInfoPrinter* pPrinter ) override; - virtual SalPrinter* CreatePrinter ( SalInfoPrinter* pInfoPrinter ) override; - virtual void DestroyPrinter ( SalPrinter* pPrinter ) override; + virtual std::unique_ptr<SalPrinter> CreatePrinter ( SalInfoPrinter* pInfoPrinter ) override; virtual void GetPrinterQueueInfo ( ImplPrnQueueList* pList ) override; virtual void GetPrinterQueueState ( SalPrinterQueueInfo* pInfo ) override; virtual void DeletePrinterQueueInfo ( SalPrinterQueueInfo* pInfo ) override; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index aea9e0223fe6..25d3ff020886 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -197,7 +197,7 @@ public: #endif virtual SalSystem* CreateSalSystem() override; virtual SalInfoPrinter* CreateInfoPrinter(SalPrinterQueueInfo* pPrinterQueueInfo, ImplJobSetup* pJobSetup) override; - virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) override; + virtual std::unique_ptr<SalPrinter> CreatePrinter( SalInfoPrinter* pInfoPrinter ) override; virtual SalMenu* CreateMenu( bool, Menu* ) override; virtual void DestroyMenu( SalMenu* pMenu ) override; virtual SalMenuItem* CreateMenuItem( const SalItemParams* ) override; |