convert SvxTabAdjust to scoped enum

Change-Id: I29a33b8ea5daaa4b9059d024ffa4a99ca924f7ef

5 files changed, 37 insertions, 37 deletions

diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 1ae6ff31fabc..0f4a018696b9 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1535,7 +1535,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
             if ( rLRSpace.GetTextLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) )
             {
                 const SvxTabStopItem& rTabs = static_cast<const SvxTabStopItem&>(rC.GetParaAttribs().Get(EE_PARA_TABS));
-                SvxTabStopItem aNewTabs( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS );
+                SvxTabStopItem aNewTabs( 0, 0, SvxTabAdjust::Left, EE_PARA_TABS );
                 for ( sal_uInt16 t = 0; t < rTabs.Count(); t++ )
                 {
                     const SvxTabStop& rT = rTabs[ t ];
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index a6e79f48ec97..f1bf58cd07c1 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -120,7 +120,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
         ppDefItems[12] = new SvxULSpaceItem( EE_PARA_ULSPACE );
         ppDefItems[13] = new SvxLineSpacingItem( 0, EE_PARA_SBL );
         ppDefItems[14] = new SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST );
-        ppDefItems[15] = new SvxTabStopItem( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS );
+        ppDefItems[15] = new SvxTabStopItem( 0, 0, SvxTabAdjust::Left, EE_PARA_TABS );
         ppDefItems[16] = new SvxJustifyMethodItem( SvxCellJustifyMethod::Auto, EE_PARA_JUST_METHOD );
         ppDefItems[17] = new SvxVerJustifyItem( SVX_VER_JUSTIFY_STANDARD, EE_PARA_VER_JUST );
 
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index ff612cb13d01..f8917685c583 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -945,15 +945,15 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
                         // Switch direction in R2L para...
                         if ( bRightToLeftPara )
                         {
-                            if ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_RIGHT )
-                                aCurrentTab.aTabStop.GetAdjustment() = SVX_TAB_ADJUST_LEFT;
-                            else if ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_LEFT )
-                                aCurrentTab.aTabStop.GetAdjustment() = SVX_TAB_ADJUST_RIGHT;
+                            if ( aCurrentTab.aTabStop.GetAdjustment() == SvxTabAdjust::Right )
+                                aCurrentTab.aTabStop.GetAdjustment() = SvxTabAdjust::Left;
+                            else if ( aCurrentTab.aTabStop.GetAdjustment() == SvxTabAdjust::Left )
+                                aCurrentTab.aTabStop.GetAdjustment() = SvxTabAdjust::Right;
                         }
 
-                        if ( ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_RIGHT ) ||
-                             ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_CENTER ) ||
-                             ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_DECIMAL ) )
+                        if ( ( aCurrentTab.aTabStop.GetAdjustment() == SvxTabAdjust::Right ) ||
+                             ( aCurrentTab.aTabStop.GetAdjustment() == SvxTabAdjust::Center ) ||
+                             ( aCurrentTab.aTabStop.GetAdjustment() == SvxTabAdjust::Decimal ) )
                         {
                             // For LEFT / DEFAULT this tab is not considered.
                             aCurrentTab.bValid = true;
@@ -1135,14 +1135,14 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
                     nWidthAfterTab += rTP.GetSize().Width();
                 }
                 long nW = nWidthAfterTab;   // Length before tab position
-                if ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_RIGHT )
+                if ( aCurrentTab.aTabStop.GetAdjustment() == SvxTabAdjust::Right )
                 {
                 }
-                else if ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_CENTER )
+                else if ( aCurrentTab.aTabStop.GetAdjustment() == SvxTabAdjust::Center )
                 {
                     nW = nWidthAfterTab/2;
                 }
-                else if ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_DECIMAL )
+                else if ( aCurrentTab.aTabStop.GetAdjustment() == SvxTabAdjust::Decimal )
                 {
                     OUString aText = GetSelected( EditSelection(  EditPaM( pParaPortion->GetNode(), nTmpPos ),
                                                                 EditPaM( pParaPortion->GetNode(), nTmpPos + pPortion->GetLen() ) ) );
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index ab7f1c197f25..0f5decdeab10 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -785,7 +785,7 @@ SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/
 SvxTabStop::SvxTabStop()
 {
     nTabPos = 0;
-    eAdjustment = SVX_TAB_ADJUST_LEFT;
+    eAdjustment = SvxTabAdjust::Left;
     m_cDecimal = cDfltDecimalChar;
     cFill = cDfltFillChar;
 }
@@ -814,7 +814,7 @@ SvxTabStopItem::SvxTabStopItem( sal_uInt16 _nWhich ) :
     maTabStops()
 {
     const sal_uInt16 nTabs = SVX_TAB_DEFCOUNT, nDist = SVX_TAB_DEFDIST;
-    const SvxTabAdjust eAdjst= SVX_TAB_ADJUST_DEFAULT;
+    const SvxTabAdjust eAdjst= SvxTabAdjust::Default;
 
     for (sal_uInt16 i = 0; i < nTabs; ++i)
     {
@@ -883,11 +883,11 @@ bool SvxTabStopItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
                 pArr[i].Position        = bConvert ? convertTwipToMm100(rTab.GetTabPos()) : rTab.GetTabPos();
                 switch(rTab.GetAdjustment())
                 {
-                case  SVX_TAB_ADJUST_LEFT   : pArr[i].Alignment = style::TabAlign_LEFT; break;
-                case  SVX_TAB_ADJUST_RIGHT  : pArr[i].Alignment = style::TabAlign_RIGHT; break;
-                case  SVX_TAB_ADJUST_DECIMAL: pArr[i].Alignment = style::TabAlign_DECIMAL; break;
-                case  SVX_TAB_ADJUST_CENTER : pArr[i].Alignment = style::TabAlign_CENTER; break;
-                    default: //SVX_TAB_ADJUST_DEFAULT
+                case  SvxTabAdjust::Left   : pArr[i].Alignment = style::TabAlign_LEFT; break;
+                case  SvxTabAdjust::Right  : pArr[i].Alignment = style::TabAlign_RIGHT; break;
+                case  SvxTabAdjust::Decimal: pArr[i].Alignment = style::TabAlign_DECIMAL; break;
+                case  SvxTabAdjust::Center : pArr[i].Alignment = style::TabAlign_CENTER; break;
+                    default: //SvxTabAdjust::Default
                         pArr[i].Alignment = style::TabAlign_DEFAULT;
 
                 }
@@ -964,13 +964,13 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             const sal_uInt16 nCount = (sal_uInt16)aSeq.getLength();
             for(sal_uInt16 i = 0; i < nCount ; i++)
             {
-                SvxTabAdjust eAdjust = SVX_TAB_ADJUST_DEFAULT;
+                SvxTabAdjust eAdjust = SvxTabAdjust::Default;
                 switch(pArr[i].Alignment)
                 {
-                case style::TabAlign_LEFT   : eAdjust = SVX_TAB_ADJUST_LEFT; break;
-                case style::TabAlign_CENTER : eAdjust = SVX_TAB_ADJUST_CENTER; break;
-                case style::TabAlign_RIGHT  : eAdjust = SVX_TAB_ADJUST_RIGHT; break;
-                case style::TabAlign_DECIMAL: eAdjust = SVX_TAB_ADJUST_DECIMAL; break;
+                case style::TabAlign_LEFT   : eAdjust = SvxTabAdjust::Left; break;
+                case style::TabAlign_CENTER : eAdjust = SvxTabAdjust::Center; break;
+                case style::TabAlign_RIGHT  : eAdjust = SvxTabAdjust::Right; break;
+                case style::TabAlign_DECIMAL: eAdjust = SvxTabAdjust::Decimal; break;
                 default: ;//prevent warning
                 }
                 sal_Unicode cFill = pArr[i].FillChar;
@@ -1039,7 +1039,7 @@ bool SvxTabStopItem::GetPresentation
 
     for ( sal_uInt16 i = 0; i < Count(); ++i )
     {
-        if ( SVX_TAB_ADJUST_DEFAULT != ((*this)[i]).GetAdjustment() )
+        if ( SvxTabAdjust::Default != ((*this)[i]).GetAdjustment() )
         {
             if ( bComma )
                 rText += ",";
@@ -1061,7 +1061,7 @@ SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const
     sal_Int8 nTabs;
     rStrm.ReadSChar( nTabs );
     SvxTabStopItem* pAttr =
-        new SvxTabStopItem( 0, 0, SVX_TAB_ADJUST_DEFAULT, Which() );
+        new SvxTabStopItem( 0, 0, SvxTabAdjust::Default, Which() );
 
     for ( sal_Int8 i = 0; i < nTabs; i++ )
     {
@@ -1069,7 +1069,7 @@ SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const
         sal_Int8 eAdjust;
         unsigned char cDecimal, cFill;
         rStrm.ReadInt32( nPos ).ReadSChar( eAdjust ).ReadUChar( cDecimal ).ReadUChar( cFill );
-        if( !i || SVX_TAB_ADJUST_DEFAULT != eAdjust )
+        if( !i || SvxTabAdjust::Default != (SvxTabAdjust)eAdjust )
             pAttr->Insert( SvxTabStop
                 ( nPos, (SvxTabAdjust)eAdjust, sal_Unicode(cDecimal), sal_Unicode(cFill) ) );
     }
@@ -1113,7 +1113,7 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
     {
         const SvxTabStop& rTab = (*this)[ i ];
         rStrm.WriteInt32( rTab.GetTabPos() )
-             .WriteSChar( rTab.GetAdjustment() )
+             .WriteSChar( (char)rTab.GetAdjustment() )
              .WriteUChar( rTab.GetDecimal() )
              .WriteUChar( rTab.GetFill() );
     }
@@ -1121,9 +1121,9 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
     if ( bStoreDefTabs )
         for( ; nCount; --nCount )
         {
-            SvxTabStop aSwTabStop(nNew, SVX_TAB_ADJUST_DEFAULT);
+            SvxTabStop aSwTabStop(nNew, SvxTabAdjust::Default);
             rStrm.WriteInt32( aSwTabStop.GetTabPos() )
-                 .WriteSChar( aSwTabStop.GetAdjustment() )
+                 .WriteSChar( (char)aSwTabStop.GetAdjustment() )
                  .WriteUChar( aSwTabStop.GetDecimal() )
                  .WriteUChar( aSwTabStop.GetFill() );
             nNew += nDefDist;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index ff4afc633ac0..fe6440979752 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1282,7 +1282,7 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
     bool bMethodOwnsToken = false; // #i52542# patch from cmc.
 // then read all the TabStops
     SvxTabStop aTabStop;
-    SvxTabStopItem aAttr( 0, 0, SVX_TAB_ADJUST_DEFAULT, aPardMap.nTabStop );
+    SvxTabStopItem aAttr( 0, 0, SvxTabAdjust::Default, aPardMap.nTabStop );
     bool bContinue = true;
     do {
         switch( nToken )
@@ -1299,16 +1299,16 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
             break;
 
         case RTF_TQL:
-            aTabStop.GetAdjustment() = SVX_TAB_ADJUST_LEFT;
+            aTabStop.GetAdjustment() = SvxTabAdjust::Left;
             break;
         case RTF_TQR:
-            aTabStop.GetAdjustment() = SVX_TAB_ADJUST_RIGHT;
+            aTabStop.GetAdjustment() = SvxTabAdjust::Right;
             break;
         case RTF_TQC:
-            aTabStop.GetAdjustment() = SVX_TAB_ADJUST_CENTER;
+            aTabStop.GetAdjustment() = SvxTabAdjust::Center;
             break;
         case RTF_TQDEC:
-            aTabStop.GetAdjustment() = SVX_TAB_ADJUST_DECIMAL;
+            aTabStop.GetAdjustment() = SvxTabAdjust::Decimal;
             break;
 
         case RTF_TLDOT:     aTabStop.GetFill() = '.';   break;
@@ -1873,9 +1873,9 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
 
             // we want Defaulttabs
             SvxTabStopItem aNewTab( nTabCount, sal_uInt16(nValue),
-                                SVX_TAB_ADJUST_DEFAULT, aPardMap.nTabStop );
+                                SvxTabAdjust::Default, aPardMap.nTabStop );
             while( nTabCount )
-                ((SvxTabStop&)aNewTab[ --nTabCount ]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT;
+                ((SvxTabStop&)aNewTab[ --nTabCount ]).GetAdjustment() = SvxTabAdjust::Default;
 
             pAttrPool->SetPoolDefaultItem( aNewTab );
         }