From 9f0827d5824f1418bd3e26bb3ac9458179898e9c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 5 Sep 2016 18:03:58 +0100 Subject: SalI18NImeStatus is stubbed the same way for everyone except... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the gen vclplug, which is then unused for the gtk/gtk3 case so only possible to use in gen/kde. Make the default impl the no-op case and override just in gen Change-Id: Id0dd3fe4ae4e5b94bfc56219defab56905ec710a Reviewed-on: https://gerrit.libreoffice.org/28675 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/inc/headless/svpdummies.hxx | 10 ---------- vcl/inc/headless/svpinst.hxx | 2 -- vcl/inc/osx/salinst.h | 1 - vcl/inc/salimestatus.hxx | 4 ++-- vcl/inc/salinst.hxx | 2 +- vcl/inc/win/salinst.h | 1 - 6 files changed, 3 insertions(+), 17 deletions(-) (limited to 'vcl/inc') diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index e0625a36f560..688b6715242b 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -48,16 +48,6 @@ public: virtual const SystemEnvData* GetSystemData() const override; }; -class VCL_DLLPUBLIC SvpImeStatus : public SalI18NImeStatus -{ - public: - SvpImeStatus() {} - virtual ~SvpImeStatus(); - - virtual bool canToggle() override; - virtual void toggle() override; -}; - class VCL_DLLPUBLIC SvpSalSystem : public SalGenericSystem { public: diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index 7f241948a99f..f101bf1f22e6 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -147,8 +147,6 @@ public: // SalTimer virtual SalTimer* CreateSalTimer() override; - // SalI18NImeStatus - virtual SalI18NImeStatus* CreateI18NImeStatus() override; // SalSystem virtual SalSystem* CreateSalSystem() override; // SalBitmap diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h index 805ce3a0f083..fbc43194c000 100644 --- a/vcl/inc/osx/salinst.h +++ b/vcl/inc/osx/salinst.h @@ -101,7 +101,6 @@ public: virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) override; virtual OUString GetDefaultPrinter() override; virtual SalTimer* CreateSalTimer() override; - virtual SalI18NImeStatus* CreateI18NImeStatus() override; virtual SalSystem* CreateSalSystem() override; virtual SalBitmap* CreateSalBitmap() override; virtual comphelper::SolarMutex* GetYieldMutex() override; diff --git a/vcl/inc/salimestatus.hxx b/vcl/inc/salimestatus.hxx index bf3488fd2511..1b97d5d48da1 100644 --- a/vcl/inc/salimestatus.hxx +++ b/vcl/inc/salimestatus.hxx @@ -30,8 +30,8 @@ public: // asks whether there is a status window available // to toggle into menubar - virtual bool canToggle() = 0; - virtual void toggle() = 0; + virtual bool canToggle() { return false; } + virtual void toggle() {} }; #endif diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index bd407234f1f7..da8b6dea8412 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -114,7 +114,7 @@ public: virtual SalTimer* CreateSalTimer() = 0; // SalI18NImeStatus virtual SalI18NImeStatus* - CreateI18NImeStatus() = 0; + CreateI18NImeStatus(); // SalSystem virtual SalSystem* CreateSalSystem() = 0; // SalBitmap diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h index 23c0de7c9568..60e404baae82 100644 --- a/vcl/inc/win/salinst.h +++ b/vcl/inc/win/salinst.h @@ -56,7 +56,6 @@ public: virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) override; virtual OUString GetDefaultPrinter() override; virtual SalTimer* CreateSalTimer() override; - virtual SalI18NImeStatus* CreateI18NImeStatus() override; virtual SalSystem* CreateSalSystem() override; virtual SalBitmap* CreateSalBitmap() override; virtual comphelper::SolarMutex* GetYieldMutex() override; -- cgit v1.2.3