diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-14 10:39:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-14 12:00:40 +0200 |
commit | 741d9990bf9d9dfcba1166a12ffb1d846c912181 (patch) | |
tree | da1b7e64be04904ce98ab143b47022125e14041d /sc | |
parent | f30ce25c3c5954eb90e126dd4904eee5454f044c (diff) |
convert QUICKHELP constants to scoped enum
Change-Id: Ie7302c909feb2e83b8b5e62a5e6a1f901783fb49
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/app/inputwin.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/hdrcont.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/tabview.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/tabview4.cxx | 8 | ||||
-rw-r--r-- | sc/workben/test.cxx | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index d15a66153f6a..2b6be65a197a 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1006,7 +1006,7 @@ void ScInputHandler::ShowTip( const OUString& rText ) aPos = pTipVisibleParent->OutputToScreenPixel( aPos ); Rectangle aRect( aPos, aPos ); - sal_uInt16 nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM; + QuickHelpFlags nAlign = QuickHelpFlags::Left|QuickHelpFlags::Bottom; nTipVisible = Help::ShowTip(pTipVisibleParent, aRect, rText, nAlign); pTipVisibleParent->AddEventListener( LINK( this, ScInputHandler, ShowHideTipVisibleParentListener ) ); } @@ -1030,7 +1030,7 @@ void ScInputHandler::ShowTipBelow( const OUString& rText ) } aPos = pTipVisibleSecParent->OutputToScreenPixel( aPos ); Rectangle aRect( aPos, aPos ); - sal_uInt16 nAlign = QUICKHELP_LEFT | QUICKHELP_TOP | QUICKHELP_NOEVADEPOINTER; + QuickHelpFlags nAlign = QuickHelpFlags::Left | QuickHelpFlags::Top | QuickHelpFlags::NoEvadePointer; nTipVisibleSec = Help::ShowTip(pTipVisibleSecParent, aRect, rText, nAlign); pTipVisibleSecParent->AddEventListener( LINK( this, ScInputHandler, ShowHideTipVisibleSecParentListener ) ); } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 8b84cc632116..a9cd2b60be21 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2365,7 +2365,7 @@ void ScPosWnd::Modify() Rectangle aRect( aPos, aPos ); OUString aText = ScGlobal::GetRscString( nStrId ); - sal_uInt16 nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM; + QuickHelpFlags nAlign = QuickHelpFlags::Left|QuickHelpFlags::Bottom; nTipVisible = Help::ShowTip(pWin, aRect, aText, nAlign); } } diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 15407ea88133..fe37b96044fa 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -900,20 +900,20 @@ void ScHeaderControl::ShowDragHelp() Point aMousePos = OutputToScreenPixel(GetPointerPosPixel()); Rectangle aRect; - sal_uInt16 nAlign; + QuickHelpFlags nAlign; if (!bVertical) { // above aRect.Left() = aMousePos.X(); aRect.Top() = aPos.Y() - 4; - nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; + nAlign = QuickHelpFlags::Bottom|QuickHelpFlags::Center; } else { // top right aRect.Left() = aPos.X() + aSize.Width() + 8; aRect.Top() = aMousePos.Y() - 2; - nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM; + nAlign = QuickHelpFlags::Left|QuickHelpFlags::Bottom; } aRect.Right() = aRect.Left(); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 7b72aba9a170..e0e05990006b 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -446,7 +446,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) Point aPos = pScroll->GetParent()->OutputToNormalizedScreenPixel( pScroll->GetPosPixel() ); OUString aHelpStr; Rectangle aRect; - sal_uInt16 nAlign; + QuickHelpFlags nAlign; if( nDelta < 0 ) { @@ -474,7 +474,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) aRect.Top() = aMousePos.Y(); aRect.Right() = aRect.Left(); aRect.Bottom() = aRect.Top(); - nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; + nAlign = QuickHelpFlags::Bottom|QuickHelpFlags::Center; Help::ShowQuickHelp( pScroll->GetParent(), aRect, aHelpStr, nAlign ); } } diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 587ff94feca9..75cb5c4be2c8 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -1084,7 +1084,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) OUString aHelpStr; Rectangle aRect; - sal_uInt16 nAlign; + QuickHelpFlags nAlign; if (bHoriz) { aHelpStr = ScGlobal::GetRscString(STR_COLUMN) + @@ -1092,7 +1092,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) aRect.Left() = aMousePos.X(); aRect.Top() = aPos.Y() - 4; - nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; + nAlign = QuickHelpFlags::Bottom|QuickHelpFlags::Center; } else { @@ -1102,7 +1102,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) // show quicktext always inside sheet area aRect.Left() = bLayoutRTL ? (aPos.X() + aSize.Width() + 8) : (aPos.X() - 8); aRect.Top() = aMousePos.Y(); - nAlign = (bLayoutRTL ? QUICKHELP_LEFT : QUICKHELP_RIGHT) | QUICKHELP_VCENTER; + nAlign = (bLayoutRTL ? QuickHelpFlags::Left : QuickHelpFlags::Right) | QuickHelpFlags::VCenter; } aRect.Right() = aRect.Left(); aRect.Bottom() = aRect.Top(); diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 8d21f9cd66bc..3c47c9bd7f89 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -75,8 +75,8 @@ void ScTabView::ShowRefTip() Point aPos( bLeft ? aStart.X() : ( aEnd.X() + 3 ), bTop ? aStart.Y() : ( aEnd.Y() + 3 ) ); - sal_uInt16 nFlags = ( bLeft ? QUICKHELP_RIGHT : QUICKHELP_LEFT ) | - ( bTop ? QUICKHELP_BOTTOM : QUICKHELP_TOP ); + QuickHelpFlags nFlags = ( bLeft ? QuickHelpFlags::Right : QuickHelpFlags::Left ) | + ( bTop ? QuickHelpFlags::Bottom : QuickHelpFlags::Top ); // nicht ueber die editierte Formel if ( !bTop && aViewData.HasEditView( eWhich ) && @@ -84,7 +84,7 @@ void ScTabView::ShowRefTip() { // dann an der oberen Kante der editierten Zelle ausrichten aPos.Y() -= 2; // die 3 von oben - nFlags = ( nFlags & ~QUICKHELP_TOP ) | QUICKHELP_BOTTOM; + nFlags = ( nFlags & ~QuickHelpFlags::Top ) | QuickHelpFlags::Bottom; } Rectangle aRect( pWin->OutputToScreenPixel( aPos ), Size(1,1) ); @@ -275,7 +275,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) aPos.Y() += 4; aPos = pWin->OutputToScreenPixel( aPos ); Rectangle aRect( aPos, aPos ); - sal_uInt16 nAlign = QUICKHELP_LEFT|QUICKHELP_TOP; + QuickHelpFlags nAlign = QuickHelpFlags::Left|QuickHelpFlags::Top; Help::ShowQuickHelp(pWin, aRect, aHelpStr, nAlign); } } diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 7e6688c01b22..f6b32ad1f5e3 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -170,7 +170,7 @@ void MyFixedText::RequestHelp( const HelpEvent& rHEvt ) Point aShowPoint= OutputToScreenPixel(Point(0,0)); if ( ( rHEvt.GetMode() & HELPMODE_QUICK ) == HELPMODE_QUICK && aTxtSize.Width()>GetSizePixel().Width()) - Help::ShowQuickHelp( Rectangle(aShowPoint,aTxtSize), aTxtStr, QUICKHELP_TOP|QUICKHELP_LEFT ); + Help::ShowQuickHelp( Rectangle(aShowPoint,aTxtSize), aTxtStr, QuickHelpFlags::Top|QuickHelpFlags::Left ); else FixedText::RequestHelp( rHEvt ); } |