Skip to content

C
core
Kaydet (Commit) d4ec2ed0 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert SdrMeasureTextVPos to scoped enum 

Change-Id: I89cc8bc2cfdd3fe059bb38216a10d36dcfea3953
üst d643cad3
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 49 deletions
cui/source/tabpages/measure.cxx
Dosyayı görüntüle @ d4ec2ed0
...@@ -352,7 +352,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) ...@@ -352,7 +352,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
RECT_POINT eRP = RP_MM; RECT_POINT eRP = RP_MM;
switch( eVPos ) switch( eVPos )
{ {
case SDRMEASURE_ABOVE: case SdrMeasureTextVPos::Above:
switch( eHPos ) switch( eHPos )
{ {
case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LT; break; case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LT; break;
...@@ -361,7 +361,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) ...@@ -361,7 +361,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
case SDRMEASURE_TEXTHAUTO: eRP = RP_MT; break; case SDRMEASURE_TEXTHAUTO: eRP = RP_MT; break;
} }
break; break;
case SDRMEASURETEXT_VERTICALCENTERED: case SdrMeasureTextVPos::VerticalCentered:
switch( eHPos ) switch( eHPos )
{ {
case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break;
...@@ -370,7 +370,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) ...@@ -370,7 +370,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break; case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break;
} }
break; break;
case SDRMEASURE_BELOW: case SdrMeasureTextVPos::Below:
switch( eHPos ) switch( eHPos )
{ {
case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LB; break; case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LB; break;
...@@ -379,7 +379,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) ...@@ -379,7 +379,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
case SDRMEASURE_TEXTHAUTO: eRP = RP_MB; break; case SDRMEASURE_TEXTHAUTO: eRP = RP_MB; break;
} }
break; break;
case SDRMEASURE_TEXTVAUTO: case SdrMeasureTextVPos::Auto:
switch( eHPos ) switch( eHPos )
{ {
case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break;
...@@ -399,7 +399,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) ...@@ -399,7 +399,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
nState = CTL_STATE::NOHORZ; nState = CTL_STATE::NOHORZ;
} }
if( eVPos == SDRMEASURE_TEXTVAUTO ) if( eVPos == SdrMeasureTextVPos::Auto )
{ {
m_pTsbAutoPosV->SetState( TRISTATE_TRUE ); m_pTsbAutoPosV->SetState( TRISTATE_TRUE );
nState |= CTL_STATE::NOVERT; nState |= CTL_STATE::NOVERT;
...@@ -525,30 +525,30 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs) ...@@ -525,30 +525,30 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
switch( eRP ) switch( eRP )
{ {
default: default:
case RP_LT: eVPos = SDRMEASURE_ABOVE; case RP_LT: eVPos = SdrMeasureTextVPos::Above;
eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
case RP_LM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; case RP_LM: eVPos = SdrMeasureTextVPos::VerticalCentered;
eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
case RP_LB: eVPos = SDRMEASURE_BELOW; case RP_LB: eVPos = SdrMeasureTextVPos::Below;
eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
case RP_MT: eVPos = SDRMEASURE_ABOVE; case RP_MT: eVPos = SdrMeasureTextVPos::Above;
eHPos = SDRMEASURE_TEXTINSIDE; break; eHPos = SDRMEASURE_TEXTINSIDE; break;
case RP_MM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; case RP_MM: eVPos = SdrMeasureTextVPos::VerticalCentered;
eHPos = SDRMEASURE_TEXTINSIDE; break; eHPos = SDRMEASURE_TEXTINSIDE; break;
case RP_MB: eVPos = SDRMEASURE_BELOW; case RP_MB: eVPos = SdrMeasureTextVPos::Below;
eHPos = SDRMEASURE_TEXTINSIDE; break; eHPos = SDRMEASURE_TEXTINSIDE; break;
case RP_RT: eVPos = SDRMEASURE_ABOVE; case RP_RT: eVPos = SdrMeasureTextVPos::Above;
eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
case RP_RM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; case RP_RM: eVPos = SdrMeasureTextVPos::VerticalCentered;
eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
case RP_RB: eVPos = SDRMEASURE_BELOW; case RP_RB: eVPos = SdrMeasureTextVPos::Below;
eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
} }
if( m_pTsbAutoPosH->GetState() == TRISTATE_TRUE ) if( m_pTsbAutoPosH->GetState() == TRISTATE_TRUE )
eHPos = SDRMEASURE_TEXTHAUTO; eHPos = SDRMEASURE_TEXTHAUTO;
if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE ) if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE )
eVPos = SDRMEASURE_TEXTVAUTO; eVPos = SdrMeasureTextVPos::Auto;
if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SfxItemState::DONTCARE ) if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SfxItemState::DONTCARE )
{ {
...@@ -754,23 +754,23 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p ) ...@@ -754,23 +754,23 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
switch( eRP ) switch( eRP )
{ {
default: default:
case RP_LT: eVPos = SDRMEASURE_ABOVE; case RP_LT: eVPos = SdrMeasureTextVPos::Above;
eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
case RP_LM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; case RP_LM: eVPos = SdrMeasureTextVPos::VerticalCentered;
eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
case RP_LB: eVPos = SDRMEASURE_BELOW; case RP_LB: eVPos = SdrMeasureTextVPos::Below;
eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
case RP_MT: eVPos = SDRMEASURE_ABOVE; case RP_MT: eVPos = SdrMeasureTextVPos::Above;
eHPos = SDRMEASURE_TEXTINSIDE; break; eHPos = SDRMEASURE_TEXTINSIDE; break;
case RP_MM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; case RP_MM: eVPos = SdrMeasureTextVPos::VerticalCentered;
eHPos = SDRMEASURE_TEXTINSIDE; break; eHPos = SDRMEASURE_TEXTINSIDE; break;
case RP_MB: eVPos = SDRMEASURE_BELOW; case RP_MB: eVPos = SdrMeasureTextVPos::Below;
eHPos = SDRMEASURE_TEXTINSIDE; break; eHPos = SDRMEASURE_TEXTINSIDE; break;
case RP_RT: eVPos = SDRMEASURE_ABOVE; case RP_RT: eVPos = SdrMeasureTextVPos::Above;
eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
case RP_RM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; case RP_RM: eVPos = SdrMeasureTextVPos::VerticalCentered;
eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
case RP_RB: eVPos = SDRMEASURE_BELOW; case RP_RB: eVPos = SdrMeasureTextVPos::Below;
eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
} }
...@@ -784,7 +784,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p ) ...@@ -784,7 +784,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE ) if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE )
{ {
eVPos = SDRMEASURE_TEXTVAUTO; eVPos = SdrMeasureTextVPos::Auto;
nState |= CTL_STATE::NOVERT; nState |= CTL_STATE::NOVERT;
} }
......
include/svx/sxmtpitm.hxx
Dosyayı görüntüle @ d4ec2ed0
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE};
enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BREAKEDLINE,SDRMEASURE_BELOW,SDRMEASURETEXT_VERTICALCENTERED}; enum class SdrMeasureTextVPos { Auto, Above, BreakedLine, Below, VerticalCentered };
// class SdrMeasureTextHPosItem // class SdrMeasureTextHPosItem
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem { class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem {
public: public:
SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SdrMeasureTextVPos::Auto): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn) {} SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
......
svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
Dosyayı görüntüle @ d4ec2ed0
...@@ -90,23 +90,23 @@ namespace sdr ...@@ -90,23 +90,23 @@ namespace sdr
switch(static_cast<const SdrMeasureTextVPosItem&>(rItemSet.Get(SDRATTR_MEASURETEXTVPOS)).GetValue()) switch(static_cast<const SdrMeasureTextVPosItem&>(rItemSet.Get(SDRATTR_MEASURETEXTVPOS)).GetValue())
{ {
case SDRMEASURE_ABOVE : case SdrMeasureTextVPos::Above :
{ {
aMTPVer = drawinglayer::primitive2d::MEASURETEXTPOSITION_NEGATIVE; aMTPVer = drawinglayer::primitive2d::MEASURETEXTPOSITION_NEGATIVE;
break; break;
} }
case SDRMEASURETEXT_BREAKEDLINE : case SdrMeasureTextVPos::BreakedLine :
case SDRMEASURETEXT_VERTICALCENTERED : case SdrMeasureTextVPos::VerticalCentered :
{ {
aMTPVer = drawinglayer::primitive2d::MEASURETEXTPOSITION_CENTERED; aMTPVer = drawinglayer::primitive2d::MEASURETEXTPOSITION_CENTERED;
break; break;
} }
case SDRMEASURE_BELOW : case SdrMeasureTextVPos::Below :
{ {
aMTPVer = drawinglayer::primitive2d::MEASURETEXTPOSITION_POSITIVE; aMTPVer = drawinglayer::primitive2d::MEASURETEXTPOSITION_POSITIVE;
break; break;
} }
default : // SDRMEASURE_TEXTVAUTO default : // SdrMeasureTextVPos::Auto
{ {
break; break;
} }
......
svx/source/svdraw/svdomeas.cxx
Dosyayı görüntüle @ d4ec2ed0
...@@ -412,9 +412,9 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& ...@@ -412,9 +412,9 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
rPol.eUsedTextHPos=rRec.eWantTextHPos; rPol.eUsedTextHPos=rRec.eWantTextHPos;
rPol.eUsedTextVPos=rRec.eWantTextVPos; rPol.eUsedTextVPos=rRec.eWantTextVPos;
if (rPol.eUsedTextVPos==SDRMEASURE_TEXTVAUTO) rPol.eUsedTextVPos=SDRMEASURE_ABOVE; if (rPol.eUsedTextVPos==SdrMeasureTextVPos::Auto) rPol.eUsedTextVPos=SdrMeasureTextVPos::Above;
bool bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE; bool bBrkLine=rPol.eUsedTextVPos==SdrMeasureTextVPos::BreakedLine;
if (rPol.eUsedTextVPos==SDRMEASURETEXT_VERTICALCENTERED) if (rPol.eUsedTextVPos==SdrMeasureTextVPos::VerticalCentered)
{ {
OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject(); OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject();
if (pOutlinerParaObject!=nullptr && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1) if (pOutlinerParaObject!=nullptr && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1)
...@@ -675,9 +675,9 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const ...@@ -675,9 +675,9 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
default: aTextPos.X()=aPt1b.X(); aTextSize2.Width()=nLen; default: aTextPos.X()=aPt1b.X(); aTextSize2.Width()=nLen;
} }
switch (eMV) { switch (eMV) {
case SDRMEASURETEXT_VERTICALCENTERED: case SdrMeasureTextVPos::VerticalCentered:
case SDRMEASURETEXT_BREAKEDLINE: aTextPos.Y()=aPt1b.Y()-aTextSize2.Height()/2; break; case SdrMeasureTextVPos::BreakedLine: aTextPos.Y()=aPt1b.Y()-aTextSize2.Height()/2; break;
case SDRMEASURE_BELOW: { case SdrMeasureTextVPos::Below: {
if (!bUpsideDown) aTextPos.Y()=aPt1b.Y()+nLWdt; if (!bUpsideDown) aTextPos.Y()=aPt1b.Y()+nLWdt;
else aTextPos.Y()=aPt1b.Y()-aTextSize2.Height()-nLWdt; else aTextPos.Y()=aPt1b.Y()-aTextSize2.Height()-nLWdt;
} break; } break;
...@@ -697,9 +697,9 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const ...@@ -697,9 +697,9 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
default: aTextPos.X()=aPt1b.X(); aTextSize2.Height()=nLen; default: aTextPos.X()=aPt1b.X(); aTextSize2.Height()=nLen;
} }
switch (eMV) { switch (eMV) {
case SDRMEASURETEXT_VERTICALCENTERED: case SdrMeasureTextVPos::VerticalCentered:
case SDRMEASURETEXT_BREAKEDLINE: aTextPos.Y()=aPt1b.Y()+aTextSize2.Width()/2; break; case SdrMeasureTextVPos::BreakedLine: aTextPos.Y()=aPt1b.Y()+aTextSize2.Width()/2; break;
case SDRMEASURE_BELOW: { case SdrMeasureTextVPos::Below: {
if (!bBelowRefEdge) aTextPos.Y()=aPt1b.Y()+aTextSize2.Width()+nLWdt; if (!bBelowRefEdge) aTextPos.Y()=aPt1b.Y()+aTextSize2.Width()+nLWdt;
else aTextPos.Y()=aPt1b.Y()-nLWdt; else aTextPos.Y()=aPt1b.Y()-nLWdt;
} break; } break;
...@@ -1333,21 +1333,21 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const ...@@ -1333,21 +1333,21 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const
if (eMH==SDRMEASURE_TEXTLEFTOUTSIDE) eTH=SDRTEXTHORZADJUST_RIGHT; if (eMH==SDRMEASURE_TEXTLEFTOUTSIDE) eTH=SDRTEXTHORZADJUST_RIGHT;
if (eMH==SDRMEASURE_TEXTRIGHTOUTSIDE) eTH=SDRTEXTHORZADJUST_LEFT; if (eMH==SDRMEASURE_TEXTRIGHTOUTSIDE) eTH=SDRTEXTHORZADJUST_LEFT;
// at eMH==SDRMEASURE_TEXTINSIDE we can anchor horizontally // at eMH==SDRMEASURE_TEXTINSIDE we can anchor horizontally
if (eMV==SDRMEASURE_ABOVE) eTV=SDRTEXTVERTADJUST_BOTTOM; if (eMV==SdrMeasureTextVPos::Above) eTV=SDRTEXTVERTADJUST_BOTTOM;
if (eMV==SDRMEASURE_BELOW) eTV=SDRTEXTVERTADJUST_TOP; if (eMV==SdrMeasureTextVPos::Below) eTV=SDRTEXTVERTADJUST_TOP;
if (eMV==SDRMEASURETEXT_BREAKEDLINE || eMV==SDRMEASURETEXT_VERTICALCENTERED) eTV=SDRTEXTVERTADJUST_CENTER; if (eMV==SdrMeasureTextVPos::BreakedLine || eMV==SdrMeasureTextVPos::VerticalCentered) eTV=SDRTEXTVERTADJUST_CENTER;
} else { } else {
if (eMH==SDRMEASURE_TEXTLEFTOUTSIDE) eTV=SDRTEXTVERTADJUST_BOTTOM; if (eMH==SDRMEASURE_TEXTLEFTOUTSIDE) eTV=SDRTEXTVERTADJUST_BOTTOM;
if (eMH==SDRMEASURE_TEXTRIGHTOUTSIDE) eTV=SDRTEXTVERTADJUST_TOP; if (eMH==SDRMEASURE_TEXTRIGHTOUTSIDE) eTV=SDRTEXTVERTADJUST_TOP;
// at eMH==SDRMEASURE_TEXTINSIDE we can anchor vertically // at eMH==SDRMEASURE_TEXTINSIDE we can anchor vertically
if (!bBelowRefEdge) { if (!bBelowRefEdge) {
if (eMV==SDRMEASURE_ABOVE) eTH=SDRTEXTHORZADJUST_LEFT; if (eMV==SdrMeasureTextVPos::Above) eTH=SDRTEXTHORZADJUST_LEFT;
if (eMV==SDRMEASURE_BELOW) eTH=SDRTEXTHORZADJUST_RIGHT; if (eMV==SdrMeasureTextVPos::Below) eTH=SDRTEXTHORZADJUST_RIGHT;
} else { } else {
if (eMV==SDRMEASURE_ABOVE) eTH=SDRTEXTHORZADJUST_RIGHT; if (eMV==SdrMeasureTextVPos::Above) eTH=SDRTEXTHORZADJUST_RIGHT;
if (eMV==SDRMEASURE_BELOW) eTH=SDRTEXTHORZADJUST_LEFT; if (eMV==SdrMeasureTextVPos::Below) eTH=SDRTEXTHORZADJUST_LEFT;
} }
if (eMV==SDRMEASURETEXT_BREAKEDLINE || eMV==SDRMEASURETEXT_VERTICALCENTERED) eTH=SDRTEXTHORZADJUST_CENTER; if (eMV==SdrMeasureTextVPos::BreakedLine || eMV==SdrMeasureTextVPos::VerticalCentered) eTH=SDRTEXTHORZADJUST_CENTER;
} }
EVAnchorMode eRet=ANCHOR_BOTTOM_HCENTER; EVAnchorMode eRet=ANCHOR_BOTTOM_HCENTER;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment