diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-18 15:41:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-20 09:52:08 +0200 |
| commit | dcefc97c8bd5be9ba229098c32d2a5c73d084163 (patch) | |
| tree | 860caac40b5c15ddb3cd1297316975d7034b260e /svtools/source/control | |
| parent | 953f327818f565969b8de5d9b956bd6b9a7c64b2 (diff) | |
convert IMAGE_DRAW_ constants to scoped enum
Change-Id: I75619eeb902af4953a5ac1525605cf3f0f15e2c0
Diffstat (limited to 'svtools/source/control')
| -rw-r--r-- | svtools/source/control/headbar.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/valueset.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 3207e998dc29..8bde905c7857 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -529,9 +529,9 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos } if (nImagePos + aImageSize.Width() <= aRect.Right()) { - sal_uInt16 nStyle = 0; + DrawImageFlags nStyle = DrawImageFlags::NONE; if (!IsEnabled()) - nStyle |= IMAGE_DRAW_DISABLE; + nStyle |= DrawImageFlags::Disable; rRenderContext.DrawImage(Point(nImagePos, nImagePosY), pItem->maImage, nStyle); } } diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 8490cadd4680..79d60caedf8d 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -1331,13 +1331,13 @@ void ToolbarMenu::implPaint(vcl::RenderContext& rRenderContext, ToolbarMenuEntry DrawTextFlags nTextStyle = DrawTextFlags::NONE; DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE; - sal_uInt16 nImageStyle = 0; + DrawImageFlags nImageStyle = DrawImageFlags::NONE; if (!pEntry->mbEnabled) { nTextStyle |= DrawTextFlags::Disable; nSymbolStyle |= DrawSymbolFlags::Disable; - nImageStyle |= IMAGE_DRAW_DISABLE; + nImageStyle |= DrawImageFlags::Disable; } Rectangle aOuterCheckRect(Point(aPos.X() + mpImpl->mnCheckPos, aPos.Y()), diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index a3398c9d9689..c0c8446189bc 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -310,9 +310,9 @@ void ValueSet::ImplFormatItem(vcl::RenderContext& rRenderContext, ValueSetItem* aPos.X() += (aRectSize.Width() - aImageSize.Width()) / 2; aPos.Y() += (aRectSize.Height() - aImageSize.Height()) / 2; - sal_uInt16 nImageStyle = 0; + DrawImageFlags nImageStyle = DrawImageFlags::NONE; if (!IsEnabled()) - nImageStyle |= IMAGE_DRAW_DISABLE; + nImageStyle |= DrawImageFlags::Disable; if (aImageSize.Width() > aRectSize.Width() || aImageSize.Height() > aRectSize.Height()) |