vcl/headless/svpdummies.cxx | 5 ----- vcl/headless/svpinst.cxx | 5 ----- 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 - vcl/osx/salinst.cxx | 17 ----------------- vcl/source/app/salvtables.cxx | 5 +++++ vcl/win/app/salinst.cxx | 17 ----------------- 11 files changed, 8 insertions(+), 61 deletions(-)
New commits: commit 9f0827d5824f1418bd3e26bb3ac9458179898e9c Author: Caolán McNamara <[email protected]> Date: Mon Sep 5 18:03:58 2016 +0100 SalI18NImeStatus is stubbed the same way for everyone except... 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 <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx index 0c1b8c3..1a3eefb 100644 --- a/vcl/headless/svpdummies.cxx +++ b/vcl/headless/svpdummies.cxx @@ -42,11 +42,6 @@ void SvpSalObject::SetPosSize( long, long, long, long ) {} void SvpSalObject::Show( bool ) {} const SystemEnvData* SvpSalObject::GetSystemData() const { return &m_aSystemChildData; } -// SalI18NImeStatus -SvpImeStatus::~SvpImeStatus() {} -bool SvpImeStatus::canToggle() { return false; } -void SvpImeStatus::toggle() {} - // SalSystem SvpSalSystem::~SvpSalSystem() {} diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 77b9ba5..53072d6 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -293,11 +293,6 @@ SalTimer* SvpSalInstance::CreateSalTimer() return new SvpSalTimer( this ); } -SalI18NImeStatus* SvpSalInstance::CreateI18NImeStatus() -{ - return new SvpImeStatus(); -} - SalSystem* SvpSalInstance::CreateSalSystem() { return new SvpSalSystem(); diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index e0625a3..688b671 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 7f24194..f101bf1 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 805ce3a..fbc4319 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 bf3488f..1b97d5d 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 bd40723..da8b6de 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 23c0de7..60e404b 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; diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index bff09a5..5cf3832 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -991,23 +991,6 @@ OUString AquaSalInstance::getOSVersion() return aVersion; } -class MacImeStatus : public SalI18NImeStatus -{ -public: - MacImeStatus() {} - virtual ~MacImeStatus() {} - - // asks whether there is a status window available - // to toggle into menubar - virtual bool canToggle() override { return false; } - virtual void toggle() override {} -}; - -SalI18NImeStatus* AquaSalInstance::CreateI18NImeStatus() -{ - return new MacImeStatus(); -} - // YieldMutexReleaser YieldMutexReleaser::YieldMutexReleaser() : mnCount( 0 ) { diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 15ba4dc..3748eb2 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -93,6 +93,11 @@ bool SalInstance::CallEventCallback( void* pEvent, int nBytes ) return m_pEventInst.is() && m_pEventInst->dispatchEvent( pEvent, nBytes ); } +SalI18NImeStatus* SalInstance::CreateI18NImeStatus() +{ + return new SalI18NImeStatus; +} + SalTimer::~SalTimer() { } diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 906129f..de58bd9 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -1019,23 +1019,6 @@ SalBitmap* WinSalInstance::CreateSalBitmap() return new WinSalBitmap(); } -class WinImeStatus : public SalI18NImeStatus -{ - public: - WinImeStatus() {} - virtual ~WinImeStatus() {} - - // asks whether there is a status window available - // to toggle into menubar - virtual bool canToggle() { return false; } - virtual void toggle() {} -}; - -SalI18NImeStatus* WinSalInstance::CreateI18NImeStatus() -{ - return new WinImeStatus(); -} - const OUString& SalGetDesktopEnvironment() { static OUString aDesktopEnvironment( "Windows" );
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
