diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-10 13:34:35 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-11-11 06:17:36 +0000 |
commit | a52f29216d2a70ea4a0a0347d71273cdbf8830e3 (patch) | |
tree | 3884a4aedca33777c43a18b40313ab125b1b4c30 /sw | |
parent | b7c4c78a097f76314982d8c1a9f2e58df95080a1 (diff) |
fdo#84938: replace HELPMODE_ constants with enum
Change-Id: I44be5567e84cdabd8b10771ea37e28b8a88cc23e
Reviewed-on: https://gerrit.libreoffice.org/12333
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/draw/dpage.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/fldui/FldRefTreeListBox.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/docvw/edtwin2.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/utlui/content.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/utlui/glbltree.cxx | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 78d3366cc7fb..0ae7f16329d6 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -124,7 +124,7 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, { bool bContinue = true; - if( rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON )) + if( rEvt.GetMode() & ( HelpEventMode::QUICK | HelpEventMode::BALLOON )) { Point aPos( rEvt.GetMousePosPixel() ); aPos = pWindow->ScreenToOutputPixel( aPos ); @@ -185,7 +185,7 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, sTxt = SwViewShell::GetShellRes()->aLinkClick + ": " + sTxt; } - if( rEvt.GetMode() & HELPMODE_BALLOON ) + if( rEvt.GetMode() & HelpEventMode::BALLOON ) { Help::ShowBalloon( pWindow, rEvt.GetMousePosPixel(), sTxt ); } diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 2a0d93f2ec73..c04603c02aa7 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -40,7 +40,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwFldRefTreeListBox(vc void SwFldRefTreeListBox::RequestHelp( const HelpEvent& rHEvt ) { bool bCallBase( true ); - if ( rHEvt.GetMode() & HELPMODE_QUICK ) + if ( rHEvt.GetMode() & HelpEventMode::QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); SvTreeListEntry* pEntry = GetEntry( aPos ); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 9d26b38d0f42..74e65638caec 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1685,7 +1685,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwIdxTreeListBox(vcl:: void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) { - if( rHEvt.GetMode() & HELPMODE_QUICK ) + if( rHEvt.GetMode() & HelpEventMode::QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); SvTreeListEntry* pEntry = GetEntry( aPos ); @@ -3290,7 +3290,7 @@ bool SwTokenWindow::CreateQuickHelp(Control* pCtrl, const HelpEvent& rHEvt) { bool bRet = false; - if( rHEvt.GetMode() & HELPMODE_QUICK ) + if( rHEvt.GetMode() & HelpEventMode::QUICK ) { bool bBalloon = Help::IsBalloonHelpEnabled(); OUString sEntry; diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index 9b887b17da6c..a0e87aa24fbc 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -108,14 +108,14 @@ OUString SwEditWin::ClipLongToolTip(const OUString& rTxt) void SwEditWin::RequestHelp(const HelpEvent &rEvt) { SwWrtShell &rSh = m_rView.GetWrtShell(); - bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON )); + bool bQuickBalloon = bool(rEvt.GetMode() & ( HelpEventMode::QUICK | HelpEventMode::BALLOON )); if(bQuickBalloon && !rSh.GetViewOptions()->IsShowContentTips()) return; bool bContinue = true; SET_CURR_SHELL(&rSh); OUString sTxt; Point aPos( PixelToLogic( ScreenToOutputPixel( rEvt.GetMousePosPixel() ) )); - bool bBalloon = static_cast< bool >(rEvt.GetMode() & HELPMODE_BALLOON); + bool bBalloon = bool(rEvt.GetMode() & HelpEventMode::BALLOON); SdrView *pSdrView = rSh.GetDrawView(); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index d00b0b9b360a..f1f96e04952d 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2753,7 +2753,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) { bool bCallBase = true; - if( rHEvt.GetMode() & HELPMODE_QUICK ) + if( rHEvt.GetMode() & HelpEventMode::QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); SvTreeListEntry* pEntry = GetEntry( aPos ); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index e3ac3aab85f9..5730f82c9ca4 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -453,7 +453,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) bool bParent = true; Update(true); Display(true); - if( rHEvt.GetMode() & HELPMODE_QUICK ) + if( rHEvt.GetMode() & HelpEventMode::QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); SvTreeListEntry* pEntry = GetEntry( aPos ); |