[Libreoffice-commits] core.git: cui/source include/svx sc/source svx/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Mar 6 10:43:04 UTC 2017
cui/source/tabpages/textanim.cxx | 20 +++++++-------
include/svx/sdtakitm.hxx | 30 ++++++++++-----------
include/svx/svddef.hxx | 2 -
sc/source/ui/drawfunc/futext.cxx | 4 +-
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 -
sw/source/core/draw/dcontact.cxx | 4 +-
sw/source/core/frmedt/feshview.cxx | 2 -
sw/source/filter/html/htmldrawreader.cxx | 12 ++++----
sw/source/filter/html/htmldrawwriter.cxx | 14 ++++-----
sw/source/uibase/ribbar/conrect.cxx | 2 -
17 files changed, 65 insertions(+), 65 deletions(-)
New commits:
commit 001feed29c881da5767dd2ae80127fb74926112e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Mar 6 10:02:19 2017 +0200
convert SdrTextAniKind to scoped enum
Change-Id: Ie79aaf96a0d89c96c4ecd4ee8ccb0eabd3456bd0
Reviewed-on: https://gerrit.libreoffice.org/34916
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 2dcc3d3..2e65fe8 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -95,7 +95,7 @@ SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemS
,"cui/ui/textanimtabpage.ui"
,&rInAttrs ),
rOutAttrs ( rInAttrs ),
- eAniKind ( SDRTEXTANI_NONE )
+ eAniKind ( SdrTextAniKind::NONE )
{
get(m_pLbEffect, "LB_EFFECT");
get(m_pBoxDirection,"boxDIRECTION");
@@ -251,7 +251,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs )
m_pNumFldCount->SetValue( nValue );
if( nValue == 0 )
{
- if( eAniKind == SDRTEXTANI_SLIDE )
+ if( eAniKind == SdrTextAniKind::Slide )
{
m_pTsbEndless->SetState( TRISTATE_FALSE );
m_pTsbEndless->Enable( false );
@@ -488,20 +488,20 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void)
eAniKind = (SdrTextAniKind) nPos;
switch( eAniKind )
{
- case SDRTEXTANI_NONE:
+ case SdrTextAniKind::NONE:
{
m_pBoxDirection->Disable();
m_pFlProperties->Disable();
}
break;
- case SDRTEXTANI_BLINK:
- case SDRTEXTANI_SCROLL:
- case SDRTEXTANI_ALTERNATE:
- case SDRTEXTANI_SLIDE:
+ case SdrTextAniKind::Blink:
+ case SdrTextAniKind::Scroll:
+ case SdrTextAniKind::Alternate:
+ case SdrTextAniKind::Slide:
{
m_pFlProperties->Enable();
- if( eAniKind == SDRTEXTANI_SLIDE )
+ if( eAniKind == SdrTextAniKind::Slide )
{
m_pTsbStartInside->Disable();
m_pTsbStopInside->Disable();
@@ -520,7 +520,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void)
m_pTsbAuto->Enable();
ClickAutoHdl_Impl( nullptr );
- if( eAniKind == SDRTEXTANI_BLINK )
+ if( eAniKind == SdrTextAniKind::Blink )
{
m_pBoxDirection->Disable();
m_pBoxCount->Disable();
@@ -540,7 +540,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void)
IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl, Button*, void)
{
- if( eAniKind != SDRTEXTANI_SLIDE )
+ if( eAniKind != SdrTextAniKind::Slide )
{
TriState eState = m_pTsbEndless->GetState();
if( eState != TRISTATE_FALSE )
diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index 9cac471..8d628ac 100644
--- a/include/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
@@ -26,22 +26,22 @@
/**
* Animation type for text frame.
*/
-enum SdrTextAniKind {
- SDRTEXTANI_NONE, /// no animation
- SDRTEXTANI_BLINK, /// blinking
- SDRTEXTANI_SCROLL, /// scroll through
- SDRTEXTANI_ALTERNATE, /// scroll back and forth
- SDRTEXTANI_SLIDE /// scroll in
+enum class SdrTextAniKind {
+ NONE, /// no animation
+ Blink, /// blinking
+ Scroll, /// scroll through
+ Alternate, /// scroll back and forth
+ Slide /// scroll in
};
-// - SDRTEXTANI_BLINK:
+// - SdrTextAniKind::Blink:
// Just blink. Direction and Amount don't effect things.
// Frequency delay: 0 = 0.5Hz (Delay = 250).
// Count = number of blinks. (0 = forever)
// start inside: sal_False = begin with the blinker off, sal_True = begin with the blinker on
// stop inside: sal_False = end with the blinker off, sal_True = end with the blinker on
// (Only if count! = 0)
-// - SDRTEXTANI_SCROLL:
+// - SdrTextAniKind::Scroll:
// Text just scrolls all the way through, and starts over when it is done.
// Delay in ms: (except delay = 0 means 50ms (20Hz) default)
@@ -55,15 +55,15 @@ enum SdrTextAniKind {
// (Only if count! = 0)
// Amount: Step size in logical units. Negative values = use Pixels instead
// of logical units. If Amount = 0, then default to 1 Pixel.
-// - SDRTEXTANI_ALTERNATE:
-// Like SDRTEXTANI_SCROLL, except don't scroll until all of the text is out,
+// - SdrTextAniKind::Alternate:
+// Like SdrTextAniKind::Scroll, except don't scroll until all of the text is out,
// but just until the last part is visible. Then, change direction and
// scroll the text the other way.
// Count = number of passes (number of direction changes minus 1)
-// If count = 1, this is the same as SDRTEXTANI_SCROLL
+// If count = 1, this is the same as SdrTextAniKind::Scroll
// Direction = the starting direction.
-// All Other Parameters: just like SDRTEXTANI_SCROLL
-// - SDRTEXTANI_SLIDE:
+// All Other Parameters: just like SdrTextAniKind::Scroll
+// - SdrTextAniKind::Slide:
// Text will slide in to the original position.
// -> same as SCROLL with StartInside = sal_False, StopInside = sal_True
// and Count = 1 (Count = 0 is interpreted as count = 1).
@@ -71,14 +71,14 @@ enum SdrTextAniKind {
// (much like ALTERNATE) and then slid back in again.
// StopInside is not evaluated, because inside is always stopped.
// StartInside is not evaluated, because outside is always started.
-// All other parameters are like SDRTEXTANI_SCROLL
+// All other parameters are like SdrTextAniKind::Scroll
// StartInside, StopInside: When sal_True, the starting / final position
// of the text depends on the anchor of the drawing object. This
// corresponds to the position of the text in normal Paint (without scrolling).
class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem<SdrTextAniKind> {
public:
- SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {}
+ SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {}
SdrTextAniKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIKIND, rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 0f93472..46bff46 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -99,7 +99,7 @@
#define SDRATTR_TEXT_MAXFRAMEWIDTH (SDRATTR_MISC_FIRST +11) /* 1108 */ /* 1108 */ /* 1091 long, def=0 - Pool V2 */
#define SDRATTR_TEXT_AUTOGROWWIDTH (SDRATTR_MISC_FIRST +12) /* 1109 */ /* 1109 */ /* 1092 sal_Bool, def=sal_False - Pool V2 */
#define SDRATTR_TEXT_HORZADJUST (SDRATTR_MISC_FIRST +13) /* 1110 */ /* 1110 */ /* 1093 enum, def=SDRTEXTHORZADJUST_LEFT */ /* Pool V2+ (04-12-1995) */
-#define SDRATTR_TEXT_ANIKIND (SDRATTR_MISC_FIRST +14) /* 1111 */ /* 1111 */ /* 1094 enum, def=SDRTEXTANI_NONE - Pool V2/V4 */
+#define SDRATTR_TEXT_ANIKIND (SDRATTR_MISC_FIRST +14) /* 1111 */ /* 1111 */ /* 1094 enum, def=SdrTextAniKind::NONE - Pool V2/V4 */
#define SDRATTR_TEXT_ANIDIRECTION (SDRATTR_MISC_FIRST +15) /* 1112 */ /* 1112 */ /* 1095 enum, def=SdrTextAniDirection::Left - Pool V2/V4 */
#define SDRATTR_TEXT_ANISTARTINSIDE (SDRATTR_MISC_FIRST +16) /* 1113 */ /* 1113 */ /* 1096 sal_Bool, def=sal_False - Pool V2/V4 */
#define SDRATTR_TEXT_ANISTOPINSIDE (SDRATTR_MISC_FIRST +17) /* 1114 */ /* 1114 */ /* 1097 sal_Bool, def=sal_False - Pool V2/V4 */
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index fc9095a..c4c426e 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -457,7 +457,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
aItemSet.Put( makeSdrTextAutoGrowWidthItem( false ) );
aItemSet.Put( makeSdrTextAutoGrowHeightItem( false ) );
- aItemSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) );
+ aItemSet.Put( SdrTextAniKindItem( SdrTextAniKind::Slide ) );
aItemSet.Put( SdrTextAniDirectionItem( SdrTextAniDirection::Left ) );
aItemSet.Put( SdrTextAniCountItem( 1 ) );
aItemSet.Put( SdrTextAniAmountItem(
@@ -761,7 +761,7 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR
aSet.Put( makeSdrTextAutoGrowWidthItem( false ) );
aSet.Put( makeSdrTextAutoGrowHeightItem( false ) );
- aSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) );
+ aSet.Put( SdrTextAniKindItem( SdrTextAniKind::Slide ) );
aSet.Put( SdrTextAniDirectionItem( SdrTextAniDirection::Left ) );
aSet.Put( SdrTextAniCountItem( 1 ) );
aSet.Put( SdrTextAniAmountItem( (sal_Int16)pWindow->PixelToLogic(Size(2,1)).Width()) );
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 7147bdd..a62241c 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<const SdrTextObj*>( &GetSdrObject() ) != nullptr)
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 1c5535c..6bef1b4 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<const XFormTextHideFormItem&>(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<const SdrTextFixedCellHeightItem&>(rSet.Get(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue(),
bWrongSpell,
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 8f25fb3..41407b6 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<const SdrTextAniKindItem*>(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 3c721d1..998158c 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 76e27c1..25b8d52 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<const SdrTextAniKindItem&>(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<const SdrTextAniDirectionItem&>(rSet.Get(SDRATTR_TEXT_ANIDIRECTION)).GetValue();
@@ -319,7 +319,7 @@ bool SdrTextObj::IsAutoGrowWidth() const
{
SdrTextAniKind eAniKind = static_cast<const SdrTextAniKindItem&>(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<const SdrTextAniDirectionItem&>(rSet.Get(SDRATTR_TEXT_ANIDIRECTION)).GetValue();
@@ -350,7 +350,7 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co
{
SdrTextAniKind eAniKind = static_cast<const SdrTextAniKindItem&>(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<const SdrTextAniDirectionItem&>(rSet.Get(SDRATTR_TEXT_ANIDIRECTION)).GetValue();
@@ -383,7 +383,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons
{
SdrTextAniKind eAniKind = static_cast<const SdrTextAniKindItem&>(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<const SdrTextAniDirectionItem&>(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 c567477..ce9d893 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 21ef7b9..8c6b575 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 b656fa7..5368dc0 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;
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index c41e52a..e2e67a0 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -180,8 +180,8 @@ bool IsMarqueeTextObj( const SdrObject& rObj )
SdrTextAniKind eTKind;
return SdrInventor::Default == rObj.GetObjInventor() &&
OBJ_TEXT == rObj.GetObjIdentifier() &&
- ( SDRTEXTANI_SCROLL == ( eTKind = static_cast<const SdrTextObj&>(rObj).GetTextAniKind())
- || SDRTEXTANI_ALTERNATE == eTKind || SDRTEXTANI_SLIDE == eTKind );
+ ( SdrTextAniKind::Scroll == ( eTKind = static_cast<const SdrTextObj&>(rObj).GetTextAniKind())
+ || SdrTextAniKind::Alternate == eTKind || SdrTextAniKind::Slide == eTKind );
}
SwContact::SwContact( SwFrameFormat *pToRegisterIn ) :
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 5af9a91..840c05d 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -3075,7 +3075,7 @@ long SwFEShell::GetSectionWidth( SwFormat const & rFormat ) const
SfxItemSet aSet(pDrawModel->GetItemPool(), SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
aSet.Put( makeSdrTextAutoGrowWidthItem( false ) );
aSet.Put( makeSdrTextAutoGrowHeightItem( false ) );
- aSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) );
+ aSet.Put( SdrTextAniKindItem( SdrTextAniKind::Slide ) );
aSet.Put( SdrTextAniDirectionItem( SdrTextAniDirection::Left ) );
aSet.Put( SdrTextAniCountItem( 1 ) );
aSet.Put( SdrTextAniAmountItem( (sal_Int16)GetWin()->PixelToLogic(Size(2,1)).Width()) );
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index a8c21ea..e7f4682 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -57,9 +57,9 @@ using namespace css;
static HTMLOptionEnum<SdrTextAniKind> aHTMLMarqBehaviorTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_BEHAV_scroll, SDRTEXTANI_SCROLL },
- { OOO_STRING_SVTOOLS_HTML_BEHAV_alternate, SDRTEXTANI_ALTERNATE },
- { OOO_STRING_SVTOOLS_HTML_BEHAV_slide, SDRTEXTANI_SLIDE },
+ { OOO_STRING_SVTOOLS_HTML_BEHAV_scroll, SdrTextAniKind::Scroll },
+ { OOO_STRING_SVTOOLS_HTML_BEHAV_alternate, SdrTextAniKind::Alternate },
+ { OOO_STRING_SVTOOLS_HTML_BEHAV_slide, SdrTextAniKind::Slide },
{ nullptr, (SdrTextAniKind)0 }
};
@@ -259,7 +259,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
Size aSpace( 0, 0 );
sal_Int16 eVertOri = text::VertOrientation::TOP;
sal_Int16 eHoriOri = text::HoriOrientation::NONE;
- SdrTextAniKind eAniKind = SDRTEXTANI_SCROLL;
+ SdrTextAniKind eAniKind = SdrTextAniKind::Scroll;
SdrTextAniDirection eAniDir = SdrTextAniDirection::Left;
sal_uInt16 nCount = 0, nDelay = 60;
sal_Int16 nAmount = -6;
@@ -365,7 +365,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
InsertBookmark( aId );
// (Nur) Alternate leueft per Default von links nach rechts
- if( SDRTEXTANI_ALTERNATE==eAniKind && !bDirection )
+ if( SdrTextAniKind::Alternate==eAniKind && !bDirection )
eAniDir = SdrTextAniDirection::Right;
// die fuer das Scrollen benoetigten Attribute umsetzen
@@ -381,7 +381,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
aItemSet.Put( SdrTextAniCountItem( nCount ) );
aItemSet.Put( SdrTextAniDelayItem( nDelay ) );
aItemSet.Put( SdrTextAniAmountItem( nAmount ) );
- if( SDRTEXTANI_ALTERNATE==eAniKind )
+ if( SdrTextAniKind::Alternate==eAniKind )
{
// (Nur) Alternate startet und stoppt per default Inside
aItemSet.Put( SdrTextAniStartInsideItem(true) );
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index 083f6a2..8bf97af 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -153,17 +153,17 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
// BEHAVIOUR
SdrTextAniKind eAniKind = pTextObj->GetTextAniKind();
- OSL_ENSURE( SDRTEXTANI_SCROLL==eAniKind ||
- SDRTEXTANI_ALTERNATE==eAniKind ||
- SDRTEXTANI_SLIDE==eAniKind,
+ OSL_ENSURE( SdrTextAniKind::Scroll==eAniKind ||
+ SdrTextAniKind::Alternate==eAniKind ||
+ SdrTextAniKind::Slide==eAniKind,
"Text-Draw-Objekt nicht fuer Marquee geeignet" );
const sal_Char *pStr = nullptr;
switch( eAniKind )
{
- case SDRTEXTANI_SCROLL: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_scroll; break;
- case SDRTEXTANI_SLIDE: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_slide; break;
- case SDRTEXTANI_ALTERNATE: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_alternate; break;
+ case SdrTextAniKind::Scroll: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_scroll; break;
+ case SdrTextAniKind::Slide: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_slide; break;
+ case SdrTextAniKind::Alternate: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_alternate; break;
default:
;
}
@@ -196,7 +196,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
static_cast<const SdrTextAniCountItem&>(rItemSet.Get( SDRATTR_TEXT_ANICOUNT ))
.GetValue();
if( 0==nCount )
- nCount = SDRTEXTANI_SLIDE==eAniKind ? 1 : -1;
+ nCount = SdrTextAniKind::Slide==eAniKind ? 1 : -1;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_loop).append("=\"").
append(nCount).append("\"");
diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx
index 39ccea5..7442679 100644
--- a/sw/source/uibase/ribbar/conrect.cxx
+++ b/sw/source/uibase/ribbar/conrect.cxx
@@ -99,7 +99,7 @@ bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
aItemSet.Put( makeSdrTextAutoGrowWidthItem( false ) );
aItemSet.Put( makeSdrTextAutoGrowHeightItem( false ) );
- aItemSet.Put( SdrTextAniKindItem( SDRTEXTANI_SCROLL ) );
+ aItemSet.Put( SdrTextAniKindItem( SdrTextAniKind::Scroll ) );
aItemSet.Put( SdrTextAniDirectionItem( SdrTextAniDirection::Left ) );
aItemSet.Put( SdrTextAniCountItem( 0 ) );
aItemSet.Put( SdrTextAniAmountItem(
More information about the Libreoffice-commits
mailing list