diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-08 13:05:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-09 09:52:43 +0200 |
| commit | 382aab381b3fbb97e64e5010fbce7f3793ff703a (patch) | |
| tree | 2e47f99e37535caf59f3541e6ad0dabaacfe90e2 /vcl/inc | |
| parent | 508175a8af0da217a4670558a2ef6b52a3f71ccb (diff) | |
hold and return SalI18NImeStatus using std::unique_ptr
Change-Id: I3657980045290a4d65b2944afac04d610c0a94fd
Reviewed-on: https://gerrit.libreoffice.org/55496
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/salinst.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/svdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/salinst.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index b4e8ed85e4d8..346352486b30 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -127,8 +127,8 @@ public: // SalTimer virtual SalTimer* CreateSalTimer() = 0; - // SalI18NImeStatus - virtual SalI18NImeStatus* + // interface to ime status window, only used by the X11 backend + virtual std::unique_ptr<SalI18NImeStatus> CreateI18NImeStatus(); // SalSystem virtual SalSystem* CreateSalSystem() = 0; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 09cd76695b62..233ff8add528 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -340,7 +340,7 @@ struct ImplSVData Application* mpApp = nullptr; // pApp VclPtr<WorkWindow> mpDefaultWin; // Default-Window bool mbDeInit = false; // Is VCL deinitializing - SalI18NImeStatus* mpImeStatus = nullptr; // interface to ime status window + std::unique_ptr<SalI18NImeStatus> mpImeStatus; // interface to ime status window, only used by the X11 backend SalSystem* mpSalSystem = nullptr; // SalSystem interface bool mbResLocaleSet = false; // SV-Resource-Manager std::locale maResLocale; // Resource locale diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 41ba5675df0b..aea9e0223fe6 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -193,7 +193,7 @@ public: virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override; virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) override; #if !GTK_CHECK_VERSION(3,0,0) - virtual SalI18NImeStatus* CreateI18NImeStatus() override; + virtual std::unique_ptr<SalI18NImeStatus> CreateI18NImeStatus() override; #endif virtual SalSystem* CreateSalSystem() override; virtual SalInfoPrinter* CreateInfoPrinter(SalPrinterQueueInfo* pPrinterQueueInfo, ImplJobSetup* pJobSetup) override; diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index a35c2755b5d8..2e404dbe76e8 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -69,7 +69,7 @@ public: virtual GenPspGraphics *CreatePrintGraphics() override; virtual SalTimer* CreateSalTimer() override; - virtual SalI18NImeStatus* CreateI18NImeStatus() override; + virtual std::unique_ptr<SalI18NImeStatus> CreateI18NImeStatus() override; virtual SalSystem* CreateSalSystem() override; virtual SalBitmap* CreateSalBitmap() override; virtual SalSession* CreateSalSession() override; |