[Libreoffice-commits] core.git: include/svtools svtools/source svx/source

[Noel Grandin]

 include/svtools/ruler.hxx        |    9 ++++-----
 svtools/source/control/ruler.cxx |    6 +++---
 svx/source/dialog/svxruler.cxx   |    6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit adcd59aebbdeba925eb5c5c4b74a90855bca286f
Author: Noel Grandin <noel at peralex.com>
Date:   Wed May 11 10:39:29 2016 +0200

    Convert RulerExtra to scoped enum
    
    Change-Id: I81f5380e27a741ab6049bcec6b4136d8f2d1169a
    Reviewed-on: https://gerrit.libreoffice.org/24878
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index f7708ba..d18ae42 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -370,9 +370,9 @@ that can be used to handle specific actions.
         With this method, it can be defined what should be displayed in
         the extra field.
             - ExtraType         what should be displayed in the extra field
-                                RULER_EXTRA_DONTKNOW        (nothing)
-                                RULER_EXTRA_NULLOFFSET      (coordinate axes)
-                                RULER_EXTRA_TAB             (Tab)
+                                RulerExtra::DontKnow        (nothing)
+                                RulerExtra::NullOffset      (coordinate axes)
+                                RulerExtra::Tab             (Tab)
             - sal_uInt16 nStyle     bit field as style:
                                     RULER_STYLE_HIGHLIGHT   (selected)
                                     RULER_TAB_...           (a Tab style)
@@ -466,8 +466,7 @@ enum RulerType { RULER_TYPE_DONTKNOW, RULER_TYPE_OUTSIDE,
                  RULER_TYPE_MARGIN1, RULER_TYPE_MARGIN2,
                  RULER_TYPE_BORDER, RULER_TYPE_INDENT, RULER_TYPE_TAB };
 
-enum RulerExtra { RULER_EXTRA_DONTKNOW,
-                  RULER_EXTRA_NULLOFFSET, RULER_EXTRA_TAB };
+enum class RulerExtra { DontKnow, NullOffset, Tab };
 
 #define RULER_STYLE_HIGHLIGHT   ((sal_uInt16)0x8000)
 #define RULER_STYLE_DONTKNOW    ((sal_uInt16)0x4000)
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 5022bc3..2c9abac 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -253,7 +253,7 @@ void Ruler::ImplInit( WinBits nWinBits )
     mbActive        = true;                 // Is ruler active
     mnUpdateFlags   = 0;                    // What needs to be updated
     mpData          = mpSaveData;           // Pointer to normal data
-    meExtraType     = RULER_EXTRA_DONTKNOW; // What is in extra field
+    meExtraType     = RulerExtra::DontKnow; // What is in extra field
     meDragType      = RULER_TYPE_DONTKNOW;  // Which element is dragged
 
     // Initialize Units
@@ -1416,7 +1416,7 @@ void Ruler::ImplDrawExtra(vcl::RenderContext& rRenderContext)
     }
 
     // output content
-    if (meExtraType == RULER_EXTRA_NULLOFFSET)
+    if (meExtraType == RulerExtra::NullOffset)
     {
         rRenderContext.SetLineColor(rStyleSettings.GetButtonTextColor());
         rRenderContext.DrawLine(Point(aRect.Left() + 1, aRect.Top() + 4),
@@ -1424,7 +1424,7 @@ void Ruler::ImplDrawExtra(vcl::RenderContext& rRenderContext)
         rRenderContext.DrawLine(Point(aRect.Left() + 4, aRect.Top() + 1),
                                 Point(aRect.Left() + 4, aRect.Bottom() - 1));
     }
-    else if (meExtraType == RULER_EXTRA_TAB)
+    else if (meExtraType == RulerExtra::Tab)
     {
         sal_uInt16 nTabStyle = mnExtraStyle & RULER_TAB_STYLE;
         if (mpData->bTextRTL)
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 91bf433..cce37b1 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -278,7 +278,7 @@ SvxRuler::SvxRuler(
     {
         sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
         pCtrlItems[i++].reset(new SvxRulerItem(nTabStopId, *this, rBindings));
-        SetExtraType(RULER_EXTRA_TAB, nDefTabType);
+        SetExtraType(RulerExtra::Tab, nDefTabType);
     }
 
     if(nFlags & (SvxRulerSupportFlags::PARAGRAPH_MARGINS |SvxRulerSupportFlags::PARAGRAPH_MARGINS_VERTICAL))
@@ -328,7 +328,7 @@ SvxRuler::SvxRuler(
     mxRulerImpl->nControlerItems=i;
 
     if( (nFlags & SvxRulerSupportFlags::SET_NULLOFFSET) == SvxRulerSupportFlags::SET_NULLOFFSET )
-        SetExtraType(RULER_EXTRA_NULLOFFSET);
+        SetExtraType(RulerExtra::NullOffset);
 
     rBindings.LeaveRegistrations();
 
@@ -3323,7 +3323,7 @@ void SvxRuler::ExtraDown()
         ++nDefTabType;
         if(RULER_TAB_DEFAULT == nDefTabType)
             nDefTabType = RULER_TAB_LEFT;
-        SetExtraType(RULER_EXTRA_TAB, nDefTabType);
+        SetExtraType(RulerExtra::Tab, nDefTabType);
     }
     Ruler::ExtraDown();
 }