diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-22 12:56:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-22 17:54:21 +0000 |
| commit | bc9459f095c55609f4d90533c0f11f17922ebb34 (patch) | |
| tree | 0b07fbdd09445d47352d7563b06917e3d8fc6603 | |
| parent | 7e55fbab6348c2a844fc7ecca8de61416db8fdae (diff) | |
Convert BreakupUnit to scoped enum
Change-Id: Icda4584c79a8af2c2e5fc5a29c498f7869641aa5
Reviewed-on: https://gerrit.libreoffice.org/25299
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
3 files changed, 10 insertions, 10 deletions
diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx index 49a2f11b2f8f..91cde4f9c346 100644 --- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx +++ b/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); diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index d8d2f9a26f08..cefbbb827c2f 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/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()) { diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx index 702d5bf29abe..73a57f7f2640 100644 --- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx +++ b/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 |