Convert BreakupUnit to scoped enum

Change-Id: Icda4584c79a8af2c2e5fc5a29c498f7869641aa5
Reviewed-on: https://gerrit.libreoffice.org/25299Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

drawinglayer/source/primitive2d/textbreakuphelper.cxx

@@ -152,7 +152,7 @@ namespace drawinglayer
                                 pTextDecoratedPortionPrimitive2D->getUnderlineAbove(),
                                 pTextDecoratedPortionPrimitive2D->getTextStrikeout(),
 
-                                // reset WordLineMode when BreakupUnit_word is executed; else copy original
+                                // reset WordLineMode when BreakupUnit::Word is executed; else copy original
                                 !bWordLineMode && pTextDecoratedPortionPrimitive2D->getWordLineMode(),
 
                                 pTextDecoratedPortionPrimitive2D->getTextEmphasisMark(),
@@ -205,7 +205,7 @@ namespace drawinglayer
 
                 switch(aBreakupUnit)
                 {
-                    case BreakupUnit_character:
+                    case BreakupUnit::Character:
                     {
                         sal_Int32 nDone;
                         sal_Int32 nNextCellBreak(xBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, css::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone));
@@ -224,7 +224,7 @@ namespace drawinglayer
                         breakupPortion(aTempResult, nCurrent, a - nCurrent, false);
                         break;
                     }
-                    case BreakupUnit_word:
+                    case BreakupUnit::Word:
                     {
                         css::i18n::Boundary nNextWordBoundary(xBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, css::i18n::WordType::ANY_WORD, true));
                         sal_Int32 a(nTextPosition);
@@ -260,7 +260,7 @@ namespace drawinglayer
                         }
                         break;
                     }
-                    case BreakupUnit_sentence:
+                    case BreakupUnit::Sentence:
                     {
                         sal_Int32 nNextSentenceBreak(xBreakIterator->endOfSentence(rTxt, nTextPosition, rLocale));
                         sal_Int32 a(nTextPosition);

drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx

@@ -161,7 +161,7 @@ namespace drawinglayer
                 // support for single word mode; split to single word primitives
                 // using TextBreakupHelper
                 const TextBreakupHelper aTextBreakupHelper(*this);
-                const Primitive2DContainer& aBroken(aTextBreakupHelper.getResult(BreakupUnit_word));
+                const Primitive2DContainer& aBroken(aTextBreakupHelper.getResult(BreakupUnit::Word));
 
                 if(!aBroken.empty())
                 {

include/drawinglayer/primitive2d/textbreakuphelper.hxx

@@ -30,11 +30,11 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        enum BreakupUnit
+        enum class BreakupUnit
         {
-            BreakupUnit_character,
-            BreakupUnit_word,
-            BreakupUnit_sentence
+            Character,
+            Word,
+            Sentence
         };
 
         class DRAWINGLAYER_DLLPUBLIC TextBreakupHelper
@@ -69,7 +69,7 @@ namespace drawinglayer
             virtual ~TextBreakupHelper();
 
             /// get result
-            const Primitive2DContainer& getResult(BreakupUnit aBreakupUnit = BreakupUnit_character) const;
+            const Primitive2DContainer& getResult(BreakupUnit aBreakupUnit = BreakupUnit::Character) const;
         };
 
     } // end of namespace primitive2d