diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-23 14:16:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-25 08:25:28 +0200 |
| commit | 182197448fc206649324fa15cf5aeaf7d01723ed (patch) | |
| tree | 54622b47cde68721a0fef01233f87b2708387352 /vcl/inc/unx | |
| parent | b84244378d411b83355b8763d3505031dd5ec324 (diff) | |
loplugin:useuniqueptr in VirtualDevice
Change-Id: I7c70f9c590dd63cca1dce16ce184fc7e14922de2
Reviewed-on: https://gerrit.libreoffice.org/53353
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/gtk/gtkinst.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/unx/salinst.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index e4cf68981392..62cf55d20ce3 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -204,7 +204,8 @@ public: virtual void DestroyMenuItem( SalMenuItem* pItem ) override; virtual SalTimer* CreateSalTimer() override; virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override; - virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics*, + virtual std::unique_ptr<SalVirtualDevice> + CreateVirtualDevice( SalGraphics*, long &nDX, long &nDY, DeviceFormat eFormat, const SystemGraphicsData* = nullptr ) override; diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index 2aed86924b68..a35c2755b5d8 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -58,10 +58,11 @@ public: virtual void DestroyObject( SalObject* pObject ) override; /// Gtk vclplug needs to pass GtkSalGraphics to X11SalVirtualDevice, so create it, and pass as pNewGraphics. - static SalVirtualDevice* CreateX11VirtualDevice(SalGraphics const * pGraphics, long &nDX, long &nDY, + static std::unique_ptr<SalVirtualDevice> CreateX11VirtualDevice(SalGraphics const * pGraphics, long &nDX, long &nDY, DeviceFormat eFormat, const SystemGraphicsData* pData, X11SalGraphics* pNewGraphics); - virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, + virtual std::unique_ptr<SalVirtualDevice> + CreateVirtualDevice( SalGraphics* pGraphics, long &nDX, long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData = nullptr ) override; virtual void PostPrintersChanged() override; |