mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SalI18NImeStatus is stubbed the same way for everyone except...

Browse Source 
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2016-09-05 18:03:58 +01:00
parent 12c11e6578
commit 9f0827d582
11 changed files with 8 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vcl/headless/svpdummies.cxx
View File

@@ -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() {}

5
vcl/headless/svpinst.cxx
View File

@@ -293,11 +293,6 @@ SalTimer* SvpSalInstance::CreateSalTimer()
return new SvpSalTimer( this );
}
SalI18NImeStatus* SvpSalInstance::CreateI18NImeStatus()
{
return new SvpImeStatus();
}
SalSystem* SvpSalInstance::CreateSalSystem()
{
return new SvpSalSystem();

10
vcl/inc/headless/svpdummies.hxx
View File

@@ -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:

2
vcl/inc/headless/svpinst.hxx
View File

@@ -147,8 +147,6 @@ public:
// SalTimer
virtual SalTimer* CreateSalTimer() override;
// SalI18NImeStatus
virtual SalI18NImeStatus* CreateI18NImeStatus() override;
// SalSystem
virtual SalSystem* CreateSalSystem() override;
// SalBitmap

1
vcl/inc/osx/salinst.h
View File

@@ -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;

4
vcl/inc/salimestatus.hxx
View File

@@ -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

2
vcl/inc/salinst.hxx
View File

@@ -114,7 +114,7 @@ public:
virtual SalTimer* CreateSalTimer() = 0;
// SalI18NImeStatus
virtual SalI18NImeStatus*
CreateI18NImeStatus() = 0;
CreateI18NImeStatus();
// SalSystem
virtual SalSystem* CreateSalSystem() = 0;
// SalBitmap

1
vcl/inc/win/salinst.h
View File

@@ -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;

17
vcl/osx/salinst.cxx
View File

@@ -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 )
{

5
vcl/source/app/salvtables.cxx
View File

@@ -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()
{
}

17
vcl/win/app/salinst.cxx
View File

@@ -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" );