summaryrefslogtreecommitdiff
path: root/svtools/source/contnr
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-18 15:41:24 +0200
committerNoel Grandin <noel@peralex.com>2015-05-20 09:52:08 +0200
commitdcefc97c8bd5be9ba229098c32d2a5c73d084163 (patch)
tree860caac40b5c15ddb3cd1297316975d7034b260e /svtools/source/contnr
parent953f327818f565969b8de5d9b956bd6b9a7c64b2 (diff)
convert IMAGE_DRAW_ constants to scoped enum
Change-Id: I75619eeb902af4953a5ac1525605cf3f0f15e2c0
Diffstat (limited to 'svtools/source/contnr')
-rw-r--r--svtools/source/contnr/svlbitm.cxx10
-rw-r--r--svtools/source/contnr/treelistbox.cxx4
2 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 371b407c9d61..2721d27e7a89 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -273,7 +273,7 @@ void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
void SvLBoxBmp::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
{
- sal_uInt16 nStyle = rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
+ DrawImageFlags nStyle = rDev.IsEnabled() ? DrawImageFlags::NONE : DrawImageFlags::Disable;
rRenderContext.DrawImage(rPos, aBmp ,nStyle);
}
@@ -341,7 +341,7 @@ void SvLBoxButton::Paint(
const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
{
SvBmp nIndex = eKind == SvLBoxButtonKind_staticImage ? SvBmp::STATICIMAGE : SvLBoxButtonData::GetIndex(nItemFlags);
- sal_uInt16 nStyle = eKind != SvLBoxButtonKind_disabledCheckbox && rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
+ DrawImageFlags nStyle = eKind != SvLBoxButtonKind_disabledCheckbox && rDev.IsEnabled() ? DrawImageFlags::NONE : DrawImageFlags::Disable;
//Native drawing
bool bNativeOK = false;
@@ -358,7 +358,7 @@ void SvLBoxButton::Paint(
//states ControlState::DEFAULT, ControlState::PRESSED and ControlState::ROLLOVER are not implemented
if (IsStateHilighted())
nState |= ControlState::FOCUSED;
- if (nStyle != IMAGE_DRAW_DISABLE)
+ if (nStyle != DrawImageFlags::Disable)
nState |= ControlState::ENABLED;
if (IsStateChecked())
aControlValue.setTristateVal(BUTTONVALUE_ON);
@@ -514,9 +514,9 @@ void SvLBoxContextBmp::Paint(
bool _bSemiTransparent = pEntry && bool( SvTLEntryFlags::SEMITRANSPARENT & pEntry->GetFlags( ) );
// draw
- sal_uInt16 nStyle = _rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
+ DrawImageFlags nStyle = _rDev.IsEnabled() ? DrawImageFlags::NONE : DrawImageFlags::Disable;
if (_bSemiTransparent)
- nStyle |= IMAGE_DRAW_SEMITRANSPARENT;
+ nStyle |= DrawImageFlags::SemiTransparent;
rRenderContext.DrawImage(_rPos, rImage, nStyle);
}
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index bdf372cfdd02..efb9b936e54b 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -3141,9 +3141,9 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry, long nLine, vcl::Render
}
aPos.Y() += (nTempEntryHeight - pImg->GetSizePixel().Height()) / 2;
- sal_uInt16 nStyle = 0;
+ DrawImageFlags nStyle = DrawImageFlags::NONE;
if (!IsEnabled())
- nStyle |= IMAGE_DRAW_DISABLE;
+ nStyle |= DrawImageFlags::Disable;
//native
bool bNativeOK = false;
ss='decoration'>Andrea Gelmini 2017-09-08oovbaapi: create XOval and XLine shape typesTamas Bunth 2017-08-17Fix typosAndrea Gelmini 2017-07-25fix some "deffer" spellingNoel Grandin 2017-07-14implement Application.FileDialog attributeTamas Bunth 2017-06-30oovbaapi: add Borders.TintAndShade PropertyTamas Bunth 2017-06-24oovbaapi: add Application.OperatingSystem propertyTamas Bunth 2017-06-08oovbaapi: add Interior.PatternTintAndShade Property (Excel)Miklos Vajna 2017-06-08oovbaapi: add Interior.TintAndShade Property (Excel)Miklos Vajna 2017-06-08oovbaapi: add XlThemeColor Enumeration (Excel)Miklos Vajna 2017-05-03remove empty commentsNoel Grandin 2014-09-02coverity#707022 Uncaught exceptionCaolán McNamara 2014-09-02coverity#707382 Uncaught exceptionCaolán McNamara 2014-09-02coverity#707409 Uncaught exceptionCaolán McNamara 2014-07-14coverity#707036 Uncaught exceptionCaolán McNamara 2014-07-10coverity#1224987 Uncaught exceptionCaolán McNamara 2014-07-10coverity#707401 Uncaught exceptionCaolán McNamara 2014-07-03coverity#707193 Uncaught exceptionCaolán McNamara 2014-06-13coverity#707393 Uncaught exceptionCaolán McNamara 2014-06-13coverity#707016 Uncaught exceptionCaolán McNamara