From 001feed29c881da5767dd2ae80127fb74926112e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 6 Mar 2017 10:02:19 +0200 Subject: convert SdrTextAniKind to scoped enum Change-Id: Ie79aaf96a0d89c96c4ecd4ee8ccb0eabd3456bd0 Reviewed-on: https://gerrit.libreoffice.org/34916 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/sdr/contact/viewcontactofsdrobj.cxx | 2 +- svx/source/sdr/primitive2d/sdrattributecreator.cxx | 4 ++-- svx/source/svdraw/svdibrow.cxx | 6 +++--- svx/source/svdraw/svdobj.cxx | 2 +- svx/source/svdraw/svdotext.cxx | 10 +++++----- svx/source/svdraw/svdotextdecomposition.cxx | 12 ++++++------ svx/source/svdraw/svdotxat.cxx | 2 +- svx/source/svdraw/svdotxed.cxx | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'svx/source') diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 7147bdd01702..a62241cc0f32 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -50,7 +50,7 @@ ViewObjectContact& ViewContactOfSdrObj::CreateObjectSpecificViewObjectContact(Ob ViewContactOfSdrObj::ViewContactOfSdrObj(SdrObject& rObj) : ViewContact(), mrObject(rObj), - meRememberedAnimationKind(SDRTEXTANI_NONE) + meRememberedAnimationKind(SdrTextAniKind::NONE) { // init AnimationKind if(dynamic_cast( &GetSdrObject() ) != nullptr) diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 1c5535c9f195..6bef1b477a4d 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -575,8 +575,8 @@ namespace drawinglayer rTextObj.IsFitToSize(), rTextObj.IsAutoFit(), static_cast(rSet.Get(XATTR_FORMTXTHIDEFORM)).GetValue(), - SDRTEXTANI_BLINK == eAniKind, - SDRTEXTANI_SCROLL == eAniKind || SDRTEXTANI_ALTERNATE == eAniKind || SDRTEXTANI_SLIDE == eAniKind, + SdrTextAniKind::Blink == eAniKind, + SdrTextAniKind::Scroll == eAniKind || SdrTextAniKind::Alternate == eAniKind || SdrTextAniKind::Slide == eAniKind, bInEditMode, static_cast(rSet.Get(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue(), bWrongSpell, diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 8f25fb3e6814..41407b648f61 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -811,9 +811,9 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_ANIKIND,pItem)) { SdrTextAniKind eAniKind=static_cast(pItem)->GetValue(); - if (eAniKind==SDRTEXTANI_NONE) return true; - if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return true; - if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return true; + if (eAniKind==SdrTextAniKind::NONE) return true; + if (eAniKind==SdrTextAniKind::Blink && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return true; + if (eAniKind==SdrTextAniKind::Slide && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return true; } } break; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 3c721d1b3c56..998158cbe68d 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1083,7 +1083,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const if(pTextObj) { // no text and no text animation - pClone->SetMergedItem(SdrTextAniKindItem(SDRTEXTANI_NONE)); + pClone->SetMergedItem(SdrTextAniKindItem(SdrTextAniKind::NONE)); pClone->SetOutlinerParaObject(nullptr); } diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 76e27c16d2b6..25b8d527ae63 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -292,7 +292,7 @@ bool SdrTextObj::IsAutoGrowHeight() const { SdrTextAniKind eAniKind = static_cast(rSet.Get(SDRATTR_TEXT_ANIKIND)).GetValue(); - if(eAniKind == SDRTEXTANI_SCROLL || eAniKind == SDRTEXTANI_ALTERNATE || eAniKind == SDRTEXTANI_SLIDE) + if(eAniKind == SdrTextAniKind::Scroll || eAniKind == SdrTextAniKind::Alternate || eAniKind == SdrTextAniKind::Slide) { SdrTextAniDirection eDirection = static_cast(rSet.Get(SDRATTR_TEXT_ANIDIRECTION)).GetValue(); @@ -319,7 +319,7 @@ bool SdrTextObj::IsAutoGrowWidth() const { SdrTextAniKind eAniKind = static_cast(rSet.Get(SDRATTR_TEXT_ANIKIND)).GetValue(); - if(eAniKind == SDRTEXTANI_SCROLL || eAniKind == SDRTEXTANI_ALTERNATE || eAniKind == SDRTEXTANI_SLIDE) + if(eAniKind == SdrTextAniKind::Scroll || eAniKind == SdrTextAniKind::Alternate || eAniKind == SdrTextAniKind::Slide) { SdrTextAniDirection eDirection = static_cast(rSet.Get(SDRATTR_TEXT_ANIDIRECTION)).GetValue(); @@ -350,7 +350,7 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co { SdrTextAniKind eAniKind = static_cast(rSet.Get(SDRATTR_TEXT_ANIKIND)).GetValue(); - if(eAniKind == SDRTEXTANI_SCROLL || eAniKind == SDRTEXTANI_ALTERNATE || eAniKind == SDRTEXTANI_SLIDE) + if(eAniKind == SdrTextAniKind::Scroll || eAniKind == SdrTextAniKind::Alternate || eAniKind == SdrTextAniKind::Slide) { SdrTextAniDirection eDirection = static_cast(rSet.Get(SDRATTR_TEXT_ANIDIRECTION)).GetValue(); @@ -383,7 +383,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons { SdrTextAniKind eAniKind = static_cast(rSet.Get(SDRATTR_TEXT_ANIKIND)).GetValue(); - if(eAniKind == SDRTEXTANI_SCROLL || eAniKind == SDRTEXTANI_ALTERNATE || eAniKind == SDRTEXTANI_SLIDE) + if(eAniKind == SdrTextAniKind::Scroll || eAniKind == SdrTextAniKind::Alternate || eAniKind == SdrTextAniKind::Slide) { SdrTextAniDirection eDirection = static_cast(rSet.Get(SDRATTR_TEXT_ANIDIRECTION)).GetValue(); @@ -713,7 +713,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo bool bInEditMode = IsInEditMode(); - if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) + if (!bInEditMode && (eAniKind==SdrTextAniKind::Scroll || eAniKind==SdrTextAniKind::Alternate || eAniKind==SdrTextAniKind::Slide)) { // unlimited paper size for ticker text if (eAniDirection==SdrTextAniDirection::Left || eAniDirection==SdrTextAniDirection::Right) nWdt=1000000; diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index c567477a0f1a..ce9d893971e6 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -1205,7 +1205,7 @@ void SdrTextObj::impDecomposeStretchTextPrimitive( void SdrTextObj::impGetBlinkTextTiming(drawinglayer::animation::AnimationEntryList& rAnimList) const { - if(SDRTEXTANI_BLINK == GetTextAniKind()) + if(SdrTextAniKind::Blink == GetTextAniKind()) { // get values const SfxItemSet& rSet = GetObjectItemSet(); @@ -1368,7 +1368,7 @@ void SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL { const SdrTextAniKind eAniKind(GetTextAniKind()); - if(SDRTEXTANI_SCROLL == eAniKind || SDRTEXTANI_ALTERNATE == eAniKind || SDRTEXTANI_SLIDE == eAniKind) + if(SdrTextAniKind::Scroll == eAniKind || SdrTextAniKind::Alternate == eAniKind || SdrTextAniKind::Slide == eAniKind) { // get data. Goal is to calculate fTimeFullPath which is the time needed to // move animation from (0.0) to (1.0) state @@ -1411,23 +1411,23 @@ void SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL switch(eAniKind) { - case SDRTEXTANI_SCROLL : + case SdrTextAniKind::Scroll : { impCreateScrollTiming(rSet, rAnimList, bForward, fTimeFullPath, fAnimationDelay); break; } - case SDRTEXTANI_ALTERNATE : + case SdrTextAniKind::Alternate : { double fRelativeTextLength(fTextLength / (fFrameLength + fTextLength)); impCreateAlternateTiming(rSet, rAnimList, fRelativeTextLength, bForward, fTimeFullPath, fAnimationDelay); break; } - case SDRTEXTANI_SLIDE : + case SdrTextAniKind::Slide : { impCreateSlideTiming(rSet, rAnimList, bForward, fTimeFullPath, fAnimationDelay); break; } - default : break; // SDRTEXTANI_NONE, SDRTEXTANI_BLINK + default : break; // SdrTextAniKind::NONE, SdrTextAniKind::Blink } } } diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 21ef7b94d9a4..8c6b575df6c4 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -83,7 +83,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight( Rectangle& rR, bool bHgt, bool b SdrTextAniKind eAniKind = GetTextAniKind(); SdrTextAniDirection eAniDir = GetTextAniDirection(); - bool bScroll = eAniKind == SDRTEXTANI_SCROLL || eAniKind == SDRTEXTANI_ALTERNATE || eAniKind == SDRTEXTANI_SLIDE; + bool bScroll = eAniKind == SdrTextAniKind::Scroll || eAniKind == SdrTextAniKind::Alternate || eAniKind == SdrTextAniKind::Slide; bool bHScroll = bScroll && (eAniDir == SdrTextAniDirection::Left || eAniDir == SdrTextAniDirection::Right); bool bVScroll = bScroll && (eAniDir == SdrTextAniDirection::Up || eAniDir == SdrTextAniDirection::Down); diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index b656fa7d7704..5368dc0c0e17 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -198,7 +198,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p bool bInEditMode = IsInEditMode(); - if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) + if (!bInEditMode && (eAniKind==SdrTextAniKind::Scroll || eAniKind==SdrTextAniKind::Alternate || eAniKind==SdrTextAniKind::Slide)) { // ticker text uses an unlimited paper size if (eAniDirection==SdrTextAniDirection::Left || eAniDirection==SdrTextAniDirection::Right) nMaxWdt=1000000; -- cgit