summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-10 15:38:49 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-11 06:58:44 +0000
commit2d21ec205d1eca652fd501790d9d86a3336d6074 (patch)
tree9532a54032825ce6c836a62a2cca59a3c26247a7 /svx
parentdc29492cd77a10163f004836afffdf8bd3c381d1 (diff)
Convert RULER_BORDER to scoped enum
Change-Id: Ia8dcffe817e6f7a5f8470ce08c25103c527d221d Reviewed-on: https://gerrit.libreoffice.org/24854 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/svxruler.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 5695a3c10022..5994360f2b3d 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -319,7 +319,7 @@ SvxRuler::SvxRuler(
{
mpObjectBorders[nBorder].nPos = 0;
mpObjectBorders[nBorder].nWidth = 0;
- mpObjectBorders[nBorder].nStyle = RULER_BORDER_MOVEABLE;
+ mpObjectBorders[nBorder].nStyle = RulerBorderStyle::Moveable;
}
}
@@ -796,19 +796,19 @@ void SvxRuler::UpdateColumns()
{
mpBorders.resize(mxColumnItem->Count());
- sal_uInt16 nStyleFlags = RULER_BORDER_VARIABLE;
+ RulerBorderStyle nStyleFlags = RulerBorderStyle::Variable;
bool bProtectColumns =
mxRulerImpl->aProtectItem.IsSizeProtected() ||
mxRulerImpl->aProtectItem.IsPosProtected();
if( !bProtectColumns )
- nStyleFlags |= RULER_BORDER_MOVEABLE;
+ nStyleFlags |= RulerBorderStyle::Moveable;
if( mxColumnItem->IsTable() )
- nStyleFlags |= RULER_BORDER_TABLE;
+ nStyleFlags |= RulerBorderStyle::Table;
else if ( !bProtectColumns )
- nStyleFlags |= RULER_BORDER_SIZEABLE;
+ nStyleFlags |= RulerBorderStyle::Sizeable;
sal_uInt16 nBorders = mxColumnItem->Count();
@@ -819,7 +819,7 @@ void SvxRuler::UpdateColumns()
{
mpBorders[i].nStyle = nStyleFlags;
if(!mxColumnItem->At(i).bVisible)
- mpBorders[i].nStyle |= RULER_STYLE_INVISIBLE;
+ mpBorders[i].nStyle |= RulerBorderStyle::Invisible;
mpBorders[i].nPos = ConvertPosPixel(mxColumnItem->At(i).nEnd + lAppNullOffset);