From 77e39d55457385eb1585034e8e461ad9ba77e707 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 6 Sep 2019 13:38:47 +0200 Subject: use unique_ptr in CreatePrintGraphics Change-Id: Ib9ca0173f3b5bb090ae71f8622fef717a47e8a2b Reviewed-on: https://gerrit.libreoffice.org/78704 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/inc/headless/svpinst.hxx | 2 +- vcl/inc/qt5/Qt5Instance.hxx | 2 +- vcl/inc/unx/geninst.h | 2 +- vcl/inc/unx/genprn.h | 2 +- vcl/inc/unx/gtk/gtkinst.hxx | 2 +- vcl/inc/unx/salinst.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'vcl/inc') diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index 546a374750c6..04e4de84cad7 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -176,7 +176,7 @@ public: virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override; - virtual GenPspGraphics *CreatePrintGraphics() override; + virtual std::unique_ptr CreatePrintGraphics() override; }; inline void SvpSalInstance::registerFrame( SalFrame* pFrame ) diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx index e6a80728b596..361eca0fc519 100644 --- a/vcl/inc/qt5/Qt5Instance.hxx +++ b/vcl/inc/qt5/Qt5Instance.hxx @@ -135,7 +135,7 @@ public: virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override; - virtual GenPspGraphics* CreatePrintGraphics() override; + virtual std::unique_ptr CreatePrintGraphics() override; virtual bool IsMainThread() const override; diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h index 95992ec383fc..dcd8bdd6fe95 100644 --- a/vcl/inc/unx/geninst.h +++ b/vcl/inc/unx/geninst.h @@ -61,7 +61,7 @@ public: virtual void jobStartedPrinterUpdate() override; virtual void jobEndedPrinterUpdate() override; bool isPrinterInit() const { return mbPrinterInit; } - virtual GenPspGraphics *CreatePrintGraphics() = 0; + virtual std::unique_ptr CreatePrintGraphics() = 0; virtual OUString getOSVersion() override; diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index 9f382e178a20..00e174932851 100644 --- a/vcl/inc/unx/genprn.h +++ b/vcl/inc/unx/genprn.h @@ -59,7 +59,7 @@ public: OUString m_aFileName; OUString m_aTmpFile; SalInfoPrinter* m_pInfoPrinter; - GenPspGraphics* m_pGraphics; + std::unique_ptr m_xGraphics; psp::PrinterJob m_aPrintJob; psp::JobData m_aJobData; psp::PrinterGfx m_aPrinterGfx; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index e7543c52d0ff..65caa384c0ae 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -224,7 +224,7 @@ public: // impossible to handle correctly, as "main thread" depends on the dispatch mutex virtual bool IsMainThread() const override { return false; } - virtual GenPspGraphics *CreatePrintGraphics() override; + virtual std::unique_ptr CreatePrintGraphics() override; virtual bool hasNativeFileSelection() const override { return true; } diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index e91e179f069a..bd28d6895f78 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -64,7 +64,7 @@ public: long &nDX, long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData = nullptr ) override; virtual void PostPrintersChanged() override; - virtual GenPspGraphics *CreatePrintGraphics() override; + virtual std::unique_ptr CreatePrintGraphics() override; virtual SalTimer* CreateSalTimer() override; virtual SalSystem* CreateSalSystem() override; -- cgit