diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-26 09:50:41 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-27 10:14:46 +0100 |
commit | 40c487469b0dcd367ca76a2407f5ef08287dbabb (patch) | |
tree | a3c4f2e6d1a81b5e5cd5e057497b38e6bf6b45cb /vcl/source/window | |
parent | ba51e421670c6710f1ed13e38aab8646c1ec8ce9 (diff) |
remove unused HelpEventMode enum value
Change-Id: I0fffa7b02ac61ef009e566d04b903cc02e9b4b3d
Reviewed-on: https://gerrit.libreoffice.org/64062
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/window')
-rw-r--r-- | vcl/source/window/menubarwindow.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menuwindow.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/status.cxx | 19 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 19 |
5 files changed, 3 insertions, 41 deletions
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index a4c33051046b..290c6ab65ffa 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -1017,7 +1017,7 @@ sal_uInt16 MenuBarWindow::ImplFindEntry( const Point& rMousePos ) const void MenuBarWindow::RequestHelp( const HelpEvent& rHEvt ) { sal_uInt16 nId = nHighlightedItem; - if ( rHEvt.GetMode() & (HelpEventMode::CONTEXT | HelpEventMode::EXTENDED) ) + if ( rHEvt.GetMode() & HelpEventMode::CONTEXT ) ChangeHighlightItem( ITEMPOS_INVALID, true ); tools::Rectangle aHighlightRect( ImplGetItemRect( nHighlightedItem ) ); diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index ac79b1f0c510..9574457e9151 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -1257,7 +1257,7 @@ void MenuFloatingWindow::RequestHelp( const HelpEvent& rHEvt ) // #102618# Get item rect before destroying the window in EndExecute() call tools::Rectangle aHighlightRect( ImplGetItemRect( nHighlightedItem ) ); - if ( rHEvt.GetMode() & (HelpEventMode::CONTEXT | HelpEventMode::EXTENDED) ) + if ( rHEvt.GetMode() & HelpEventMode::CONTEXT ) { nHighlightedItem = ITEMPOS_INVALID; EndExecute(); diff --git a/vcl/source/window/menuwindow.cxx b/vcl/source/window/menuwindow.cxx index 2244a84ddeb0..92ba8c7ab171 100644 --- a/vcl/source/window/menuwindow.cxx +++ b/vcl/source/window/menuwindow.cxx @@ -86,7 +86,7 @@ bool MenuWindow::ImplHandleHelpEvent(vcl::Window* pMenuWindow, Menu const * pMen ImplChangeTipTimeout( oldTimeout, pMenuWindow ); bDone = true; } - else if ( rHEvt.GetMode() & (HelpEventMode::CONTEXT | HelpEventMode::EXTENDED) ) + else if ( rHEvt.GetMode() & HelpEventMode::CONTEXT ) { // is help in the application selected Help* pHelp = Application::GetHelp(); diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index b0ce426a53c6..12bc7cbc3039 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -801,25 +801,6 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) return; } } - else if ( rHEvt.GetMode() & HelpEventMode::EXTENDED ) - { - OUString aCommand = GetItemCommand( nItemId ); - OString aHelpId( GetHelpId( nItemId ) ); - - if ( !aCommand.isEmpty() || !aHelpId.isEmpty() ) - { - // show help text if there is one - Help* pHelp = Application::GetHelp(); - if ( pHelp ) - { - if ( !aCommand.isEmpty() ) - pHelp->Start( aCommand, this ); - else if ( !aHelpId.isEmpty() ) - pHelp->Start( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); - } - return; - } - } } Window::RequestHelp( rHEvt ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 649e4970708d..824f216ccf0c 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -3864,25 +3864,6 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) Help::ShowQuickHelp( this, aTempRect, aStr, rHelpStr, QuickHelpFlags::CtrlText ); return; } - else if ( rHEvt.GetMode() & HelpEventMode::EXTENDED ) - { - OUString aCommand = GetItemCommand( nItemId ); - OString aHelpId( GetHelpId( nItemId ) ); - - if ( !aCommand.isEmpty() || !aHelpId.isEmpty() ) - { - // If help is available then trigger it - Help* pHelp = Application::GetHelp(); - if ( pHelp ) - { - if ( !aCommand.isEmpty() ) - pHelp->Start( aCommand, this ); - else if ( !aHelpId.isEmpty() ) - pHelp->Start( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); - } - return; - } - } } DockingWindow::RequestHelp( rHEvt ); |