diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-27 09:37:41 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-27 11:14:26 +0200 |
commit | 66854d697f973f36e1b878080999901e0936dae6 (patch) | |
tree | 118776c3cda5bbeb59ece7d9b33686a5a4163fc6 /svtools | |
parent | 9e3b1236b68069016d646b5682ce541335b5340c (diff) |
convert WINDOW_DRAW flags to scoped enum
Change-Id: I9400a286fab18d683b4c109007961685f01b6da3
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/brwbox/brwbox2.cxx | 6 | ||||
-rw-r--r-- | svtools/source/brwbox/ebbcontrols.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/filectrl.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/headbar.cxx | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 1fa03aa9f59d..ff53f441b32a 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -701,9 +701,9 @@ void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect -void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) +void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) { - bool bDrawSelection = (nFlags & WINDOW_DRAW_NOSELECTION) == 0; + bool bDrawSelection = !(nFlags & DrawFlags::NoSelection); // we need pixel coordinates Size aRealSize = pDev->LogicToPixel(rSize); @@ -815,7 +815,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->SetClipRegion( pDev->PixelToLogic( aRegion ) ); // do we have to paint the background - bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && GetDataWindow().IsControlBackground(); + bool bBackground = !(nFlags & DrawFlags::NoBackground) && GetDataWindow().IsControlBackground(); if ( bBackground ) { Rectangle aRect( aRealPos, aRealSize ); diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index a23e325f1bcb..e55b90d0c123 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -288,7 +288,7 @@ namespace svt } - void CheckBoxControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) + void CheckBoxControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) { pBox->Draw(pDev,rPos,rSize,nFlags); } diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index ab07a4a7b688..ab520bf4730b 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -205,7 +205,7 @@ void FileControl::SetEditModifyHdl( const Link<>& rLink ) maEdit->SetModifyHdl(rLink); } -void FileControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) +void FileControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) { WinBits nOldEditStyle = GetEdit().GetStyle(); if ( GetStyle() & WB_BORDER ) diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 87e9f5831455..68a435e001c5 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -278,7 +278,7 @@ void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ) } void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh, bool bDrag, - const Rectangle& rItemRect, const Rectangle* pRect, sal_uLong ) + const Rectangle& rItemRect, const Rectangle* pRect, DrawFlags ) { ImplControlValue aControlValue(0); Rectangle aCtrlRegion; @@ -619,7 +619,7 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos bool bHigh, bool bDrag, const Rectangle* pRect ) { Rectangle aRect = ImplGetItemRect(nPos); - ImplDrawItem(rRenderContext, nPos, bHigh, bDrag, aRect, pRect, 0 ); + ImplDrawItem(rRenderContext, nPos, bHigh, bDrag, aRect, pRect, DrawFlags::NONE ); } void HeaderBar::ImplUpdate(sal_uInt16 nPos, bool bEnd, bool /*bDirect*/) @@ -947,7 +947,7 @@ void HeaderBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect } void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uLong nFlags ) + DrawFlags nFlags ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); @@ -957,13 +957,13 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Push(); pDev->SetMapMode(); pDev->SetFont( aFont ); - if ( nFlags & WINDOW_DRAW_MONO ) + if ( nFlags & DrawFlags::Mono ) pDev->SetTextColor( Color( COL_BLACK ) ); else pDev->SetTextColor( GetTextColor() ); pDev->SetTextFillColor(); - if ( !(nFlags & WINDOW_DRAW_NOBACKGROUND) ) + if ( !(nFlags & DrawFlags::NoBackground) ) { pDev->DrawWallpaper( aRect, GetBackground() ); if ( mnBorderOff1 || mnBorderOff2 ) |