Convert SvxPraVertAlignItem::Align to scoped enum

Change-Id: I2f73a200b04322dd65e0758f4238347bfea832fb

13 files changed, 63 insertions, 58 deletions

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 33bda89f5dd1..66921fe0195f 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1153,7 +1153,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet )
     }
     if(m_pVertAlignLB->IsValueChangedFromSaved())
     {
-        rOutSet->Put(SvxParaVertAlignItem(m_pVertAlignLB->GetSelectEntryPos(), GetWhich( SID_PARA_VERTALIGN )));
+        rOutSet->Put(SvxParaVertAlignItem((SvxParaVertAlignItem::Align)m_pVertAlignLB->GetSelectEntryPos(), GetWhich( SID_PARA_VERTALIGN )));
         bModified = true;
     }
 
@@ -1242,7 +1242,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
 
         const SvxParaVertAlignItem& rAlign = static_cast<const SvxParaVertAlignItem&>(rSet->Get( _nWhich ));
 
-        m_pVertAlignLB->SelectEntryPos(rAlign.GetValue());
+        m_pVertAlignLB->SelectEntryPos((sal_Int32)rAlign.GetValue());
     }
 
     _nWhich = GetWhich( SID_ATTR_FRAMEDIRECTION );
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 1eba1968fc71..dce9a3ecc066 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -64,7 +64,7 @@ SfxPoolItem* SvxPageModelItem::CreateDefault() { return new  SvxPageModelItem(0)
 SfxPoolItem* SvxScriptSpaceItem::CreateDefault() { return new  SvxScriptSpaceItem(false, 0);}
 SfxPoolItem* SvxHangingPunctuationItem::CreateDefault() { return new  SvxHangingPunctuationItem(false, 0);}
 SfxPoolItem* SvxForbiddenRuleItem::CreateDefault() { return new  SvxForbiddenRuleItem(false, 0);}
-SfxPoolItem* SvxParaVertAlignItem::CreateDefault() { return new  SvxParaVertAlignItem(0, 0);}
+SfxPoolItem* SvxParaVertAlignItem::CreateDefault() { return new  SvxParaVertAlignItem(Align::Automatic, 0);}
 SfxPoolItem* SvxParaGridItem::CreateDefault() { return new  SvxParaGridItem(true, 0);}
 
 
@@ -1383,9 +1383,9 @@ bool SvxForbiddenRuleItem::GetPresentation(
 |*    class SvxParaVertAlignItem
 *************************************************************************/
 
-SvxParaVertAlignItem::SvxParaVertAlignItem( sal_uInt16 nValue,
+SvxParaVertAlignItem::SvxParaVertAlignItem( Align nValue,
     const sal_uInt16 nW )
-    : SfxUInt16Item( nW, nValue )
+    : SfxUInt16Item( nW, (sal_uInt16)nValue )
 {
 }
 
@@ -1398,12 +1398,12 @@ SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
     rStrm.ReadUInt16( nVal );
-    return new SvxParaVertAlignItem( nVal, Which() );
+    return new SvxParaVertAlignItem( (Align)nVal, Which() );
 }
 
 SvStream& SvxParaVertAlignItem::Store( SvStream & rStrm, sal_uInt16 ) const
 {
-    rStrm.WriteUInt16( GetValue() );
+    rStrm.WriteUInt16( (sal_uInt16)GetValue() );
     return rStrm;
 }
 
@@ -1420,10 +1420,10 @@ bool SvxParaVertAlignItem::GetPresentation(
     sal_uInt16 nTmp;
     switch( GetValue() )
     {
-        case AUTOMATIC: nTmp = RID_SVXITEMS_PARAVERTALIGN_AUTO; break;
-        case TOP:       nTmp = RID_SVXITEMS_PARAVERTALIGN_TOP; break;
-        case CENTER:    nTmp = RID_SVXITEMS_PARAVERTALIGN_CENTER; break;
-        case BOTTOM:    nTmp = RID_SVXITEMS_PARAVERTALIGN_BOTTOM; break;
+        case Align::Automatic: nTmp = RID_SVXITEMS_PARAVERTALIGN_AUTO; break;
+        case Align::Top:       nTmp = RID_SVXITEMS_PARAVERTALIGN_TOP; break;
+        case Align::Center:    nTmp = RID_SVXITEMS_PARAVERTALIGN_CENTER; break;
+        case Align::Bottom:    nTmp = RID_SVXITEMS_PARAVERTALIGN_BOTTOM; break;
         default:    nTmp = RID_SVXITEMS_PARAVERTALIGN_BASELINE; break;
     }
     rText = EE_RESSTR( nTmp );
@@ -1441,9 +1441,9 @@ bool SvxParaVertAlignItem::PutValue( const css::uno::Any& rVal,
                                          sal_uInt8 /*nMemberId*/ )
 {
     sal_Int16 nVal = sal_Int16();
-    if((rVal >>= nVal) && nVal >=0 && nVal <= BOTTOM )
+    if((rVal >>= nVal) && nVal >=0 && nVal <= (sal_uInt16)Align::Bottom )
     {
-        SetValue( (sal_uInt16)nVal );
+        SetValue( (Align)nVal );
         return true;
     }
     else
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index f6e0691facbe..202578aa98e5 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -210,7 +210,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
     FontEmphasisMark eEmphasis;
     bPardTokenRead = false;
     RTF_CharTypeDef eCharType = NOTDEF_CHARTYPE;
-    sal_uInt16 nFontAlign;
+    SvxParaVertAlignItem::Align nFontAlign;
 
     bool bChkStkPos = !bNewGroup && !aAttrStack.empty();
 
@@ -517,15 +517,15 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 break;
 
             case RTF_FAFIXED:
-            case RTF_FAAUTO:    nFontAlign = SvxParaVertAlignItem::AUTOMATIC;
+            case RTF_FAAUTO:    nFontAlign = SvxParaVertAlignItem::Align::Automatic;
                                 goto SET_FONTALIGNMENT;
-            case RTF_FAHANG:    nFontAlign = SvxParaVertAlignItem::TOP;
+            case RTF_FAHANG:    nFontAlign = SvxParaVertAlignItem::Align::Top;
                                 goto SET_FONTALIGNMENT;
-            case RTF_FAVAR:     nFontAlign = SvxParaVertAlignItem::BOTTOM;
+            case RTF_FAVAR:     nFontAlign = SvxParaVertAlignItem::Align::Bottom;
                                 goto SET_FONTALIGNMENT;
-            case RTF_FACENTER:  nFontAlign = SvxParaVertAlignItem::CENTER;
+            case RTF_FACENTER:  nFontAlign = SvxParaVertAlignItem::Align::Center;
                                 goto SET_FONTALIGNMENT;
-            case RTF_FAROMAN:   nFontAlign = SvxParaVertAlignItem::BASELINE;
+            case RTF_FAROMAN:   nFontAlign = SvxParaVertAlignItem::Align::Baseline;
                                 goto SET_FONTALIGNMENT;
 SET_FONTALIGNMENT:
             if( aPardMap.nFontAlign )
diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx
index 2a8b25cdbbde..68fdcabb9ff6 100644
--- a/include/editeng/paravertalignitem.hxx
+++ b/include/editeng/paravertalignitem.hxx
@@ -34,10 +34,10 @@
 class EDITENG_DLLPUBLIC SvxParaVertAlignItem : public SfxUInt16Item
 {
 public:
-    enum { AUTOMATIC, BASELINE, TOP, CENTER, BOTTOM };
+    enum class Align { Automatic, Baseline, Top, Center, Bottom };
     static SfxPoolItem* CreateDefault();
 
-    SvxParaVertAlignItem( sal_uInt16 nValue /*= 0*/,
+    SvxParaVertAlignItem( Align nValue /*= 0*/,
                        const sal_uInt16 nId  );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -54,6 +54,9 @@ public:
     virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
+    Align                   GetValue() const { return (Align) SfxUInt16Item::GetValue(); }
+    void                    SetValue(Align n) { SfxUInt16Item::SetValue((sal_uInt16)n); }
+
     inline SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem )
     {
         SetValue( rItem.GetValue() );
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index fd3b63135752..9341cfb2a1fe 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -558,7 +558,7 @@ void InitCore()
     aAttrTab[ RES_PARATR_SCRIPTSPACE - POOLATTR_BEGIN ] =   new SvxScriptSpaceItem( true, RES_PARATR_SCRIPTSPACE );
     aAttrTab[ RES_PARATR_HANGINGPUNCTUATION - POOLATTR_BEGIN ] = new SvxHangingPunctuationItem( true, RES_PARATR_HANGINGPUNCTUATION );
     aAttrTab[ RES_PARATR_FORBIDDEN_RULES - POOLATTR_BEGIN ] = new SvxForbiddenRuleItem( true, RES_PARATR_FORBIDDEN_RULES );
-    aAttrTab[ RES_PARATR_VERTALIGN - POOLATTR_BEGIN ] =     new SvxParaVertAlignItem( 0, RES_PARATR_VERTALIGN );
+    aAttrTab[ RES_PARATR_VERTALIGN - POOLATTR_BEGIN ] =     new SvxParaVertAlignItem( SvxParaVertAlignItem::Align::Automatic, RES_PARATR_VERTALIGN );
     aAttrTab[ RES_PARATR_SNAPTOGRID - POOLATTR_BEGIN ] =    new SvxParaGridItem( true, RES_PARATR_SNAPTOGRID );
     aAttrTab[ RES_PARATR_CONNECT_BORDER - POOLATTR_BEGIN ] = new SwParaConnectBorderItem;
 
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 344c94aaa37e..527e23f6e74e 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -88,7 +88,7 @@ using namespace ::com::sun::star::beans;
 SwLineInfo::SwLineInfo()
     : pRuler( nullptr ),
       pSpace( nullptr ),
-      nVertAlign( 0 ),
+      nVertAlign( SvxParaVertAlignItem::Align::Automatic ),
       nDefTabStop( 0 ),
       bListTabStopIncluded( false ),
       nListTabStopPosition( 0 )
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 0fb3c581962b..c473980bc5ec 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -75,7 +75,7 @@ class SwLineInfo
 
     SvxTabStopItem* pRuler;
     const SvxLineSpacingItem *pSpace;
-    sal_uInt16 nVertAlign;
+    SvxParaVertAlignItem::Align nVertAlign;
     sal_uInt16 nDefTabStop;
     bool bListTabStopIncluded;
     long nListTabStopPosition;
@@ -95,12 +95,12 @@ public:
         { const_cast<SwLineInfo*>(this)->nDefTabStop = nNew; }
 
     // vertical alignment
-    inline sal_uInt16 GetVertAlign() const { return nVertAlign; }
+    inline SvxParaVertAlignItem::Align GetVertAlign() const { return nVertAlign; }
     inline bool HasSpecialAlign( bool bVert ) const
         { return bVert ?
-                 ( SvxParaVertAlignItem::BASELINE  != nVertAlign ) :
-                 ( SvxParaVertAlignItem::BASELINE  != nVertAlign &&
-                   SvxParaVertAlignItem::AUTOMATIC != nVertAlign ); }
+                 ( SvxParaVertAlignItem::Align::Baseline  != nVertAlign ) :
+                 ( SvxParaVertAlignItem::Align::Baseline  != nVertAlign &&
+                   SvxParaVertAlignItem::Align::Automatic != nVertAlign ); }
 
     sal_uInt16 NumberOfTabStops() const;
 
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 3f8acaa4fb91..53b3c903a2d9 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -831,7 +831,7 @@ void SwTextCursor::GetCharRect_( SwRect* pOrig, const sal_Int32 nOfst,
                                 // correct for reverse (270 degree) portions
                                 if( static_cast<SwMultiPortion*>(pPor)->IsRevers() )
                                 {
-                                    if ( SvxParaVertAlignItem::AUTOMATIC ==
+                                    if ( SvxParaVertAlignItem::Align::Automatic ==
                                          GetLineInfo().GetVertAlign() )
                                         // if vertical alignment is set to auto,
                                         // we switch from base line alignment
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 0c174ee2ee3a..0f0951a46252 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -261,17 +261,17 @@ sal_uInt16 SwTextCursor::AdjustBaseLine( const SwLineLayout& rLine,
     else
     {
         switch ( GetLineInfo().GetVertAlign() ) {
-            case SvxParaVertAlignItem::TOP :
+            case SvxParaVertAlignItem::Align::Top :
                 nOfst = nOfst + nPorAscent;
                 break;
-            case SvxParaVertAlignItem::CENTER :
+            case SvxParaVertAlignItem::Align::Center :
                 OSL_ENSURE( rLine.Height() >= nPorHeight, "Portion height > Line height");
                 nOfst += ( rLine.Height() - nPorHeight ) / 2 + nPorAscent;
                 break;
-            case SvxParaVertAlignItem::BOTTOM :
+            case SvxParaVertAlignItem::Align::Bottom :
                 nOfst += rLine.Height() - nPorHeight + nPorAscent;
                 break;
-            case SvxParaVertAlignItem::AUTOMATIC :
+            case SvxParaVertAlignItem::Align::Automatic :
                 if ( bAutoToCentered || GetInfo().GetTextFrame()->IsVertical() )
                 {
                     if( GetInfo().GetTextFrame()->IsVertLR() )
@@ -281,7 +281,7 @@ sal_uInt16 SwTextCursor::AdjustBaseLine( const SwLineLayout& rLine,
                     break;
                 }
                 SAL_FALLTHROUGH;
-            case SvxParaVertAlignItem::BASELINE :
+            case SvxParaVertAlignItem::Align::Baseline :
                 // base line
                 nOfst = nOfst + rLine.GetAscent();
                 break;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9e40395a5c63..ff44d436dc74 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4046,7 +4046,7 @@ void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem& rHt)
             bMustWrite = !static_cast< const SfxBoolItem& >(rHt).GetValue();
             break;
         case RES_PARATR_VERTALIGN:
-            bMustWrite = static_cast< const SvxParaVertAlignItem& >(rHt).GetValue() != SvxParaVertAlignItem::AUTOMATIC;
+            bMustWrite = static_cast< const SvxParaVertAlignItem& >(rHt).GetValue() != SvxParaVertAlignItem::Align::Automatic;
             break;
         case RES_PARATR_SNAPTOGRID:
             bMustWrite = !static_cast< const SvxParaGridItem& >(rHt).GetValue();
@@ -7187,19 +7187,19 @@ void DocxAttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign
 
     switch ( rAlign.GetValue() )
     {
-        case SvxParaVertAlignItem::BASELINE:
+        case SvxParaVertAlignItem::Align::Baseline:
             pAlignString = "baseline";
             break;
-        case SvxParaVertAlignItem::TOP:
+        case SvxParaVertAlignItem::Align::Top:
             pAlignString = "top";
             break;
-        case SvxParaVertAlignItem::CENTER:
+        case SvxParaVertAlignItem::Align::Center:
             pAlignString = "center";
             break;
-        case SvxParaVertAlignItem::BOTTOM:
+        case SvxParaVertAlignItem::Align::Bottom:
             pAlignString = "bottom";
             break;
-        case SvxParaVertAlignItem::AUTOMATIC:
+        case SvxParaVertAlignItem::Align::Automatic:
             pAlignString = "auto";
             break;
         default:
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 7fbcee28b5c8..a0da23528869 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2898,16 +2898,16 @@ void RtfAttributeOutput::ParaVerticalAlign(const SvxParaVertAlignItem& rAlign)
     const char* pStr;
     switch (rAlign.GetValue())
     {
-    case SvxParaVertAlignItem::TOP:
+    case SvxParaVertAlignItem::Align::Top:
         pStr = OOO_STRING_SVTOOLS_RTF_FAHANG;
         break;
-    case SvxParaVertAlignItem::BOTTOM:
+    case SvxParaVertAlignItem::Align::Bottom:
         pStr = OOO_STRING_SVTOOLS_RTF_FAVAR;
         break;
-    case SvxParaVertAlignItem::CENTER:
+    case SvxParaVertAlignItem::Align::Center:
         pStr = OOO_STRING_SVTOOLS_RTF_FACENTER;
         break;
-    case SvxParaVertAlignItem::BASELINE:
+    case SvxParaVertAlignItem::Align::Baseline:
         pStr = OOO_STRING_SVTOOLS_RTF_FAROMAN;
         break;
 
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index d904b5661cb6..7efb44de269d 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2979,22 +2979,23 @@ void WW8AttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
 
     m_rWW8Export.InsUInt16( NS_sprm::LN_PWAlignFont );
 
-    sal_Int16 nVal = rAlign.GetValue();
-    switch ( nVal )
+    SvxParaVertAlignItem::Align nAlign = rAlign.GetValue();
+    sal_uInt16 nVal;
+    switch ( nAlign )
     {
-        case SvxParaVertAlignItem::BASELINE:
+        case SvxParaVertAlignItem::Align::Baseline:
             nVal = 2;
             break;
-        case SvxParaVertAlignItem::TOP:
+        case SvxParaVertAlignItem::Align::Top:
             nVal = 0;
             break;
-        case SvxParaVertAlignItem::CENTER:
+        case SvxParaVertAlignItem::Align::Center:
             nVal = 1;
             break;
-        case SvxParaVertAlignItem::BOTTOM:
+        case SvxParaVertAlignItem::Align::Bottom:
             nVal = 3;
             break;
-        case SvxParaVertAlignItem::AUTOMATIC:
+        case SvxParaVertAlignItem::Align::Automatic:
             nVal = 4;
             break;
         default:
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c50d6d789674..0f6328798d2b 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4921,29 +4921,30 @@ void SwWW8ImplReader::Read_AlignFont( sal_uInt16, const sal_uInt8* pData, short
     else
     {
         sal_uInt16 nVal = SVBT16ToShort( pData );
+        SvxParaVertAlignItem::Align nAlign;
         switch (nVal)
         {
             case 0:
-                nVal = SvxParaVertAlignItem::TOP;
+                nAlign = SvxParaVertAlignItem::Align::Top;
                 break;
             case 1:
-                nVal = SvxParaVertAlignItem::CENTER;
+                nAlign = SvxParaVertAlignItem::Align::Center;
                 break;
             case 2:
-                nVal = SvxParaVertAlignItem::BASELINE;
+                nAlign = SvxParaVertAlignItem::Align::Baseline;
                 break;
             case 3:
-                nVal = SvxParaVertAlignItem::BOTTOM;
+                nAlign = SvxParaVertAlignItem::Align::Bottom;
                 break;
             case 4:
-                nVal = SvxParaVertAlignItem::AUTOMATIC;
+                nAlign = SvxParaVertAlignItem::Align::Automatic;
                 break;
             default:
-                nVal = SvxParaVertAlignItem::AUTOMATIC;
+                nAlign = SvxParaVertAlignItem::Align::Automatic;
                 OSL_ENSURE(false,"Unknown paragraph vertical align");
                 break;
         }
-        NewAttr( SvxParaVertAlignItem( nVal, RES_PARATR_VERTALIGN ) );
+        NewAttr( SvxParaVertAlignItem( nAlign, RES_PARATR_VERTALIGN ) );
     }
 }