diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-11 09:52:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-11 10:02:21 +0000 |
| commit | 8e4a113229298b4fa5bddd6cf71715d1fb87c3ef (patch) | |
| tree | e4287eee9ad21ff504e324b30cb003349beebe0b /svx/source/dialog | |
| parent | a4f9fce47bffdda69c81ef64805e441610fca5b1 (diff) | |
Convert RULER_MARGIN to scoped enum
Change-Id: Ia8711614fdb9090faeebfe294cbb064ded20b5fb
Reviewed-on: https://gerrit.libreoffice.org/24874
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/svxruler.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 5994360f2b3d..91bf4339236f 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -495,10 +495,10 @@ inline sal_uInt16 SvxRuler::GetObjectBordersOff(sal_uInt16 nIdx) const */ void SvxRuler::UpdateFrame() { - const sal_uInt16 nMarginStyle = + const RulerMarginStyle nMarginStyle = ( mxRulerImpl->aProtectItem.IsSizeProtected() || mxRulerImpl->aProtectItem.IsPosProtected() ) ? - 0 : RULER_MARGIN_SIZEABLE; + RulerMarginStyle::NONE : RulerMarginStyle::Sizeable; if(mxLRSpaceItem.get() && mxPagePosItem.get()) { @@ -1398,8 +1398,8 @@ void SvxRuler::AdjustMargin1(long lInputDiff) mxRulerImpl->aProtectItem.IsSizeProtected() || mxRulerImpl->aProtectItem.IsPosProtected(); - const sal_uInt16 nMarginStyle = - bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE; + const RulerMarginStyle nMarginStyle = + bProtectColumns ? RulerMarginStyle::NONE : RulerMarginStyle::Sizeable; if(!bAppSetNullOffset) { @@ -1527,7 +1527,7 @@ void SvxRuler::DragMargin2() mxRulerImpl->aProtectItem.IsSizeProtected() || mxRulerImpl->aProtectItem.IsPosProtected(); - const sal_uInt16 nMarginStyle = bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE; + const RulerMarginStyle nMarginStyle = bProtectColumns ? RulerMarginStyle::NONE : RulerMarginStyle::Sizeable; SetMargin2( aDragPosition, nMarginStyle ); @@ -1882,7 +1882,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mxRulerImpl->lLastLMargin)) //otherwise the right borders are moved for(int i = mxColumnItem->Count() - 1; i > nIndex; --i) mpBorders[i].nPos += lDiff; - SetMargin2( GetMargin2() + lDiff, 0 ); + SetMargin2( GetMargin2() + lDiff, RulerMarginStyle::NONE ); } } } @@ -1918,7 +1918,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mxRulerImpl->lLastLMargin)) { mpBorders[i].nPos += lDiff; } - SetMargin2( GetMargin2() + lDiff, 0 ); + SetMargin2( GetMargin2() + lDiff, RulerMarginStyle::NONE ); } } else |