diff options
author | Noel Grandin <noel@peralex.com> | 2015-12-11 11:49:25 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-12-15 09:18:04 +0200 |
commit | d59f411bf2920626c4d55b0477bd7bb3db8dae51 (patch) | |
tree | beb79473cc6266e8f96d147e58913af20f36a604 | |
parent | 2c0a010b19cd2f1f7cf976b3fe7129dc9bd9e69c (diff) |
loplugin:constantfunction
Change-Id: Id72123039409b7559fb4fdfe5f29bf1bb83ac23f
10 files changed, 2 insertions, 110 deletions
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index b315e4c0273b..cb973bc6957a 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -46,7 +46,7 @@ namespace extensions { namespace resource /** returns the RESOURCE_TYPE associated with this instance */ - static RESOURCE_TYPE getResourceType(); + static RESOURCE_TYPE getResourceType() { return RSC_STRING; } /** reads a single resource from the given resource manager @param _resourceManager the resource manager to read from @@ -65,11 +65,6 @@ namespace extensions { namespace resource { } - RESOURCE_TYPE StringResourceAccess::getResourceType() - { - return RSC_STRING; - } - Any StringResourceAccess::getResource( SimpleResMgr& _resourceManager, sal_Int32 _resourceId ) { OSL_PRECOND( _resourceManager.IsAvailable( getResourceType(), _resourceId ), "StringResourceAccess::getResource: precondition not met!" ); diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index a96e3bed8544..3c32442bb91a 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -50,9 +50,7 @@ class ComboboxToolbarController : public ComplexToolbarController // called from ComboBoxControl void Select(); - void DoubleClick(); void Modify(); - void KeyInput( const KeyEvent& rKEvt ); void GetFocus(); void LoseFocus(); bool PreNotify( NotifyEvent& rNEvt ); diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index e661d7974128..f47cf21a8065 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -52,10 +52,8 @@ class DropdownToolbarController : public ComplexToolbarController // called from ListBoxControl void Select(); - void DoubleClick(); void GetFocus(); void LoseFocus(); - bool PreNotify( NotifyEvent& rNEvt ); protected: virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override; diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index dba12c1aeab0..639bed84c144 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -51,7 +51,6 @@ class EditToolbarController : public ComplexToolbarController // called from EditControl void Modify(); - void KeyInput( const KeyEvent& rKEvt ); void GetFocus(); void LoseFocus(); bool PreNotify( NotifyEvent& rNEvt ); diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 8d25ef88f9ae..58f77e8bc933 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -55,11 +55,8 @@ class SpinfieldToolbarController : public ComplexToolbarController void Down(); void First(); void Last(); - void KeyInput( const KeyEvent& rKEvt ); void Modify(); void GetFocus(); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); bool PreNotify( NotifyEvent& rNEvt ); protected: diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 808fddad43e8..c0953b223ea1 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -58,9 +58,7 @@ class ComboBoxControl : public ComboBox virtual void dispose() override; virtual void Select() override; - virtual void DoubleClick() override; virtual void Modify() override; - virtual void KeyInput( const ::KeyEvent& rKEvt ) override; virtual void GetFocus() override; virtual void LoseFocus() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; @@ -93,13 +91,6 @@ void ComboBoxControl::Select() m_pComboboxToolbarController->Select(); } -void ComboBoxControl::DoubleClick() -{ - ComboBox::DoubleClick(); - if ( m_pComboboxToolbarController ) - m_pComboboxToolbarController->DoubleClick(); -} - void ComboBoxControl::Modify() { ComboBox::Modify(); @@ -107,13 +98,6 @@ void ComboBoxControl::Modify() m_pComboboxToolbarController->Modify(); } -void ComboBoxControl::KeyInput( const ::KeyEvent& rKEvt ) -{ - ComboBox::KeyInput( rKEvt ); - if ( m_pComboboxToolbarController ) - m_pComboboxToolbarController->KeyInput( rKEvt ); -} - void ComboBoxControl::GetFocus() { ComboBox::GetFocus(); @@ -200,19 +184,11 @@ void ComboboxToolbarController::Select() } } -void ComboboxToolbarController::DoubleClick() -{ -} - void ComboboxToolbarController::Modify() { notifyTextChanged( m_pComboBox->GetText() ); } -void ComboboxToolbarController::KeyInput( const ::KeyEvent& ) -{ -} - void ComboboxToolbarController::GetFocus() { notifyFocusGet(); diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 2dd8223f774c..48b9c386895c 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -57,7 +57,6 @@ class ListBoxControl : public ListBox virtual void dispose() override; virtual void Select() override; - virtual void DoubleClick() override; virtual void GetFocus() override; virtual void LoseFocus() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; @@ -90,13 +89,6 @@ void ListBoxControl::Select() m_pListBoxListener->Select(); } -void ListBoxControl::DoubleClick() -{ - ListBox::DoubleClick(); - if ( m_pListBoxListener ) - m_pListBoxListener->DoubleClick(); -} - void ListBoxControl::GetFocus() { ListBox::GetFocus(); @@ -115,7 +107,7 @@ bool ListBoxControl::PreNotify( NotifyEvent& rNEvt ) { bool bRet = false; if ( m_pListBoxListener ) - bRet = m_pListBoxListener->PreNotify( rNEvt ); + bRet = false; if ( !bRet ) bRet = ListBox::PreNotify( rNEvt ); @@ -184,10 +176,6 @@ void DropdownToolbarController::Select() } } -void DropdownToolbarController::DoubleClick() -{ -} - void DropdownToolbarController::GetFocus() { notifyFocusGet(); @@ -198,11 +186,6 @@ void DropdownToolbarController::LoseFocus() notifyFocusLost(); } -bool DropdownToolbarController::PreNotify( NotifyEvent& /*rNEvt*/ ) -{ - return false; -} - void DropdownToolbarController::executeControlCommand( const css::frame::ControlCommand& rControlCommand ) { if ( rControlCommand.Command == "SetList" ) diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 0ffc7455826e..d860d1f65f16 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -56,7 +56,6 @@ class EditControl : public Edit virtual void dispose() override; virtual void Modify() override; - virtual void KeyInput( const ::KeyEvent& rKEvt ) override; virtual void GetFocus() override; virtual void LoseFocus() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; @@ -89,13 +88,6 @@ void EditControl::Modify() m_pEditToolbarController->Modify(); } -void EditControl::KeyInput( const ::KeyEvent& rKEvt ) -{ - Edit::KeyInput( rKEvt ); - if ( m_pEditToolbarController ) - m_pEditToolbarController->KeyInput( rKEvt ); -} - void EditControl::GetFocus() { Edit::GetFocus(); @@ -175,10 +167,6 @@ void EditToolbarController::Modify() notifyTextChanged( m_pEditControl->GetText() ); } -void EditToolbarController::KeyInput( const ::KeyEvent& /*rKEvt*/ ) -{ -} - void EditToolbarController::GetFocus() { notifyFocusGet(); diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index c190d77f9303..430597624689 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -64,12 +64,9 @@ class SpinfieldControl : public SpinField virtual void Down() override; virtual void First() override; virtual void Last() override; - virtual void KeyInput( const ::KeyEvent& rKEvt ) override; virtual void Modify() override; virtual void GetFocus() override; virtual void LoseFocus() override; - virtual void StateChanged( StateChangedType nType ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; private: @@ -121,13 +118,6 @@ void SpinfieldControl::Last() m_pSpinfieldToolbarController->Last(); } -void SpinfieldControl::KeyInput( const ::KeyEvent& rKEvt ) -{ - SpinField::KeyInput( rKEvt ); - if ( m_pSpinfieldToolbarController ) - m_pSpinfieldToolbarController->KeyInput( rKEvt ); -} - void SpinfieldControl::Modify() { SpinField::Modify(); @@ -149,20 +139,6 @@ void SpinfieldControl::LoseFocus() m_pSpinfieldToolbarController->GetFocus(); } -void SpinfieldControl::StateChanged( StateChangedType nType ) -{ - SpinField::StateChanged( nType ); - if ( m_pSpinfieldToolbarController ) - m_pSpinfieldToolbarController->StateChanged( nType ); -} - -void SpinfieldControl::DataChanged( const DataChangedEvent& rDCEvt ) -{ - SpinField::DataChanged( rDCEvt ); - if ( m_pSpinfieldToolbarController ) - m_pSpinfieldToolbarController->DataChanged( rDCEvt ); -} - bool SpinfieldControl::PreNotify( NotifyEvent& rNEvt ) { bool bRet = false; @@ -288,23 +264,11 @@ void SpinfieldToolbarController::Modify() notifyTextChanged( m_pSpinfieldControl->GetText() ); } -void SpinfieldToolbarController::KeyInput( const ::KeyEvent& /*rKEvt*/ ) -{ -} - void SpinfieldToolbarController::GetFocus() { notifyFocusGet(); } -void SpinfieldToolbarController::StateChanged( StateChangedType /*nType*/ ) -{ -} - -void SpinfieldToolbarController::DataChanged( const DataChangedEvent& /*rDCEvt*/ ) -{ -} - bool SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 981fccffc063..74683008d1cd 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1367,18 +1367,12 @@ void GtkSalFrame::SetDefaultSize() gtk_window_maximize( GTK_WINDOW(m_pWindow) ); } -static void initClientId() -{ - // No session management support for gtk3+ - this is now legacy. -} - void GtkSalFrame::Show( bool bVisible, bool bNoActivate ) { if( m_pWindow ) { if( bVisible ) { - initClientId(); getDisplay()->startupNotificationCompleted(); if( m_bDefaultPos ) |