From 3e5bca1893f08b9372c1e0ab96a32aabf989acd4 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 2 Apr 2017 15:21:38 +1000 Subject: vcl: PrinterInfoManager no longer a singleton Let's just create the PrinterInfoManager via the SalData constructor. There is no real need to lazy-load this, so the singleton is sort of pointless. This allows more RAII-type behaviour. Change-Id: Id860a40e92eea36b1aeb4da646f1134e8a4d70aa --- vcl/inc/unx/cupsmgr.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/inc/unx/cupsmgr.hxx') diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx index 8a7025dd78e3..3d71f5085487 100644 --- a/vcl/inc/unx/cupsmgr.hxx +++ b/vcl/inc/unx/cupsmgr.hxx @@ -63,11 +63,11 @@ class CUPSManager : public PrinterInfoManager CUPSManager(); virtual ~CUPSManager() override; - virtual void initialize() override; - static void getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions ); void runDests(); OString threadedCupsGetPPD(const char* pPrinter); + + virtual void initialize() override; public: static void runDestThread(void* pMgr); -- cgit v1.2.3