convert SvxLineSpace to scoped enum

and rename to be more explicit

Change-Id: Id06e6b68ef30e1d0d0daf19c37a390060e8bcb01

20 files changed, 86 insertions, 86 deletions

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 3062eeb094da..cf1de0fa319d 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -104,27 +104,27 @@ void SetLineSpace_Impl( SvxLineSpacingItem& rLineSpace,
     switch ( eSpace )
     {
         case LLINESPACE_1:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off );
             break;
 
         case LLINESPACE_115:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetPropLineSpace( 115 );
             break;
 
         case LLINESPACE_15:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetPropLineSpace( 150 );
             break;
 
         case LLINESPACE_2:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetPropLineSpace( 200 );
             break;
 
         case LLINESPACE_PROP:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetPropLineSpace( (sal_uInt8)lValue );
             break;
 
@@ -134,13 +134,13 @@ void SetLineSpace_Impl( SvxLineSpacingItem& rLineSpace,
             break;
 
         case LLINESPACE_DURCH:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetInterLineSpace( (sal_uInt16)lValue );
             break;
 
         case LLINESPACE_FIX:
             rLineSpace.SetLineHeight((sal_uInt16)lValue);
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_FIX;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Fix );
             rLineSpace.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off );
         break;
     }
@@ -718,7 +718,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl
 
     switch( rAttr.GetLineSpaceRule() )
     {
-        case SVX_LINE_SPACE_AUTO:
+        case SvxLineSpaceRule::Auto:
         {
             SvxInterLineSpaceRule eInter = rAttr.GetInterLineSpaceRule();
 
@@ -767,12 +767,12 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl
             }
         }
         break;
-        case SVX_LINE_SPACE_FIX:
+        case SvxLineSpaceRule::Fix:
             SetMetricValue(*m_pLineDistAtMetricBox, rAttr.GetLineHeight(), eUnit);
             m_pLineDist->SelectEntryPos( LLINESPACE_FIX );
         break;
 
-        case SVX_LINE_SPACE_MIN:
+        case SvxLineSpaceRule::Min:
             SetMetricValue(*m_pLineDistAtMetricBox, rAttr.GetLineHeight(), eUnit);
             m_pLineDist->SelectEntryPos( LLINESPACE_MIN );
             break;
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index df4a6464c96a..1572f046cec5 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -125,7 +125,7 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem)
         break;
         case EE_PARA_SBL:
             aDebStr.append("SBL=");
-            if ( static_cast<const SvxLineSpacingItem&>(rItem).GetLineSpaceRule() == SVX_LINE_SPACE_MIN )
+            if ( static_cast<const SvxLineSpacingItem&>(rItem).GetLineSpaceRule() == SvxLineSpaceRule::Min )
             {
                 aDebStr.append("Min: ");
                 aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLineSpacingItem&>(rItem).GetInterLineSpace()));
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index f4e12e833524..458dc14bf610 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -893,7 +893,7 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
             DBG_ASSERT( dynamic_cast<const SvxLineSpacingItem *>(&rPoolItem) != nullptr, "ConvertItem: Invalid Item!" );
             SvxLineSpacingItem& rItem = static_cast<SvxLineSpacingItem&>(rPoolItem);
             // SetLineHeight changes also eLineSpace!
-            if ( rItem.GetLineSpaceRule() == SVX_LINE_SPACE_MIN )
+            if ( rItem.GetLineSpaceRule() == SvxLineSpaceRule::Min )
                 rItem.SetLineHeight( sal::static_int_cast< sal_uInt16 >( OutputDevice::LogicToLogic( rItem.GetLineHeight(), eSourceUnit, eDestUnit ) ) );
         }
         break;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 337e2a67a448..ff612cb13d01 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1332,7 +1332,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
 
         if ( !bSameLineAgain && !aStatus.IsOutliner() )
         {
-            if ( rLSItem.GetLineSpaceRule() == SVX_LINE_SPACE_MIN )
+            if ( rLSItem.GetLineSpaceRule() == SvxLineSpaceRule::Min )
             {
                 sal_uInt16 nMinHeight = GetYValue( rLSItem.GetLineHeight() );
                 sal_uInt16 nTxtHeight = pLine->GetHeight();
@@ -1344,7 +1344,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
                     pLine->SetHeight( nMinHeight, nTxtHeight );
                 }
             }
-            else if ( rLSItem.GetLineSpaceRule() == SVX_LINE_SPACE_FIX )
+            else if ( rLSItem.GetLineSpaceRule() == SvxLineSpaceRule::Fix )
             {
                 sal_uInt16 nFixHeight = GetYValue( rLSItem.GetLineHeight() );
                 sal_uInt16 nTxtHeight = pLine->GetHeight();
@@ -1658,7 +1658,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
 
     if ( !aStatus.IsOutliner() )
     {
-        if ( rLSItem.GetLineSpaceRule() == SVX_LINE_SPACE_MIN )
+        if ( rLSItem.GetLineSpaceRule() == SvxLineSpaceRule::Min )
         {
             sal_uInt16 nMinHeight = rLSItem.GetLineHeight();
             sal_uInt16 nTxtHeight = pTmpLine->GetHeight();
@@ -1670,7 +1670,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
                 pTmpLine->SetHeight( nMinHeight, nTxtHeight );
             }
         }
-        else if ( rLSItem.GetLineSpaceRule() == SVX_LINE_SPACE_FIX )
+        else if ( rLSItem.GetLineSpaceRule() == SvxLineSpaceRule::Fix )
         {
             sal_uInt16 nFixHeight = rLSItem.GetLineHeight();
             sal_uInt16 nTxtHeight = pTmpLine->GetHeight();
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 83b6f4d91bb2..ab7f1c197f25 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -84,7 +84,7 @@ SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId
     nPropLineSpace = 100;
     nInterLineSpace = 0;
     nLineHeight = nHeight;
-    eLineSpace = SVX_LINE_SPACE_AUTO;
+    eLineSpaceRule = SvxLineSpaceRule::Auto;
     eInterLineSpaceRule = SvxInterLineSpaceRule::Off;
 }
 
@@ -96,9 +96,9 @@ bool SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const
     const SvxLineSpacingItem& rLineSpace = static_cast<const SvxLineSpacingItem&>(rAttr);
     return
         // Same Linespacing Rule?
-        (eLineSpace == rLineSpace.eLineSpace)
+        (eLineSpaceRule == rLineSpace.eLineSpaceRule)
         // For maximum and minimum Linespacing be the size must coincide.
-        && (eLineSpace == SVX_LINE_SPACE_AUTO ||
+        && (eLineSpaceRule == SvxLineSpaceRule::Auto ||
             nLineHeight == rLineSpace.nLineHeight)
         // Same Linespacing Rule?
         && ( eInterLineSpaceRule == rLineSpace.eInterLineSpaceRule )
@@ -121,9 +121,9 @@ bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     nMemberId &= ~CONVERT_TWIPS;
 
     style::LineSpacing aLSp;
-    switch( eLineSpace )
+    switch( eLineSpaceRule )
     {
-        case SVX_LINE_SPACE_AUTO:
+        case SvxLineSpaceRule::Auto:
             if(eInterLineSpaceRule == SvxInterLineSpaceRule::Fix)
             {
                 aLSp.Mode = style::LineSpacingMode::LEADING;
@@ -140,13 +140,13 @@ bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
                 aLSp.Height = nPropLineSpace;
             }
         break;
-        case SVX_LINE_SPACE_FIX :
-        case SVX_LINE_SPACE_MIN :
-            aLSp.Mode = eLineSpace == SVX_LINE_SPACE_FIX ? style::LineSpacingMode::FIX : style::LineSpacingMode::MINIMUM;
+        case SvxLineSpaceRule::Fix :
+        case SvxLineSpaceRule::Min :
+            aLSp.Mode = eLineSpaceRule == SvxLineSpaceRule::Fix ? style::LineSpacingMode::FIX : style::LineSpacingMode::MINIMUM;
             aLSp.Height = ( bConvert ? (short)convertTwipToMm100(nLineHeight) : nLineHeight );
         break;
         default:
-            ;//prevent warning about SVX_LINE_SPACE_END
+            ;//prevent warning about SvxLineSpaceRule::End
     }
 
     switch ( nMemberId )
@@ -187,7 +187,7 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             case style::LineSpacingMode::LEADING:
             {
                 eInterLineSpaceRule = SvxInterLineSpaceRule::Fix;
-                eLineSpace = SVX_LINE_SPACE_AUTO;
+                eLineSpaceRule = SvxLineSpaceRule::Auto;
                 nInterLineSpace = aLSp.Height;
                 if(bConvert)
                     nInterLineSpace = (short)convertMm100ToTwip(nInterLineSpace);
@@ -196,7 +196,7 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             break;
             case style::LineSpacingMode::PROP:
             {
-                eLineSpace = SVX_LINE_SPACE_AUTO;
+                eLineSpaceRule = SvxLineSpaceRule::Auto;
                 nPropLineSpace = (sal_Int16)aLSp.Height;
                 if(100 == aLSp.Height)
                     eInterLineSpaceRule = SvxInterLineSpaceRule::Off;
@@ -208,7 +208,7 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             case style::LineSpacingMode::MINIMUM:
             {
                 eInterLineSpaceRule =  SvxInterLineSpaceRule::Off;
-                eLineSpace = aLSp.Mode == style::LineSpacingMode::FIX ? SVX_LINE_SPACE_FIX : SVX_LINE_SPACE_MIN;
+                eLineSpaceRule = aLSp.Mode == style::LineSpacingMode::FIX ? SvxLineSpaceRule::Fix : SvxLineSpaceRule::Min;
                 nLineHeight = aLSp.Height;
                 if(bConvert)
                     nLineHeight = (sal_uInt16)convertMm100ToTwip(nLineHeight);
@@ -260,7 +260,7 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const
     SvxLineSpacingItem* pAttr = new SvxLineSpacingItem( nHeight, Which() );
     pAttr->SetInterLineSpace( nInterSpace );
     pAttr->SetPropLineSpace( nPropSpace );
-    pAttr->GetLineSpaceRule() = (SvxLineSpace)nRule;
+    pAttr->SetLineSpaceRule( (SvxLineSpaceRule)nRule );
     pAttr->SetInterLineSpaceRule( (SvxInterLineSpaceRule)nInterRule );
     return pAttr;
 }
@@ -271,7 +271,7 @@ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*
     rStrm.WriteSChar( GetPropLineSpace() )
          .WriteInt16( GetInterLineSpace() )
          .WriteUInt16( GetLineHeight() )
-         .WriteSChar( GetLineSpaceRule() )
+         .WriteSChar( (char) GetLineSpaceRule() )
          .WriteSChar( (char) GetInterLineSpaceRule() );
     return rStrm;
 }
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index a7e428d2bdce..ff4afc633ac0 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -449,7 +449,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                         nTokenValue = 200;      // is one BYTE !!!
 
                     aLSpace.SetPropLineSpace( (const sal_uInt8)nTokenValue );
-                    aLSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+                    aLSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
 
                     pSet->Put( aLSpace );
                 }
@@ -467,28 +467,28 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                     if (1000 == nTokenValue )
                         nTokenValue = 240;
 
-                    SvxLineSpace eLnSpc;
+                    SvxLineSpaceRule eLnSpc;
                     if (nTokenValue < 0)
                     {
-                        eLnSpc = SVX_LINE_SPACE_FIX;
+                        eLnSpc = SvxLineSpaceRule::Fix;
                         nTokenValue = -nTokenValue;
                     }
                     else if (nTokenValue == 0)
                     {
                         //if \sl0 is used, the line spacing is automatically
                         //determined
-                        eLnSpc = SVX_LINE_SPACE_AUTO;
+                        eLnSpc = SvxLineSpaceRule::Auto;
                     }
                     else
-                        eLnSpc = SVX_LINE_SPACE_MIN;
+                        eLnSpc = SvxLineSpaceRule::Min;
 
                     if (IsCalcValue())
                         CalcValue();
 
-                    if (eLnSpc != SVX_LINE_SPACE_AUTO)
+                    if (eLnSpc != SvxLineSpaceRule::Auto)
                         aLSpace.SetLineHeight( (const sal_uInt16)nTokenValue );
 
-                    aLSpace.GetLineSpaceRule() = eLnSpc;
+                    aLSpace.SetLineSpaceRule(eLnSpc);
                     pSet->Put(aLSpace);
                 }
                 break;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 868727bb03f8..01ce1253db1b 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6266,13 +6266,13 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet,  boost::optional< sal_Int16 >&
         SvxLineSpacingItem aItem( 200, EE_PARA_SBL );
         if ( nVal2 <= 0 ) {
             aItem.SetLineHeight( (sal_uInt16)( rManager.ScalePoint( -nVal2 ) / 8 ) );
-            aItem.GetLineSpaceRule() = SVX_LINE_SPACE_FIX;
+            aItem.SetLineSpaceRule( SvxLineSpaceRule::Fix );
             aItem.SetInterLineSpaceRule(SvxInterLineSpaceRule::Off);
         } else
         {
             sal_uInt8 nPropLineSpace = (sal_uInt8)nVal2;
             aItem.SetPropLineSpace( nPropLineSpace );
-            aItem.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            aItem.SetLineSpaceRule( SvxLineSpaceRule::Auto );
         }
         rSet.Put( aItem );
     }
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index cc0f4886335d..fce2049d9ae3 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -226,7 +226,7 @@ namespace frm
         (void)_pAdditionalArg;
 
         SvxLineSpacingItem aLineSpacing( m_nLineSpace, getWhich() );
-        aLineSpacing.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+        aLineSpacing.SetLineSpaceRule( SvxLineSpaceRule::Auto );
         if ( 100 == m_nLineSpace )
             aLineSpacing.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off );
         else
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx
index 5a3addf80c06..f63daf5fba81 100644
--- a/include/editeng/lspcitem.hxx
+++ b/include/editeng/lspcitem.hxx
@@ -37,7 +37,7 @@ class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
     short                 nInterLineSpace;
     sal_uInt16            nLineHeight;
     sal_uInt16            nPropLineSpace;
-    SvxLineSpace          eLineSpace;
+    SvxLineSpaceRule      eLineSpaceRule;
     SvxInterLineSpaceRule eInterLineSpaceRule;
 
 public:
@@ -77,7 +77,7 @@ public:
     inline void SetLineHeight( const sal_uInt16 nHeight )
     {
         nLineHeight = nHeight;
-        eLineSpace = SVX_LINE_SPACE_MIN;
+        eLineSpaceRule = SvxLineSpaceRule::Min;
     }
 
     // To increase or decrease the row height.
@@ -88,8 +88,8 @@ public:
         eInterLineSpaceRule = SvxInterLineSpaceRule::Prop;
     }
 
-    inline SvxLineSpace &GetLineSpaceRule() { return eLineSpace; }
-    inline SvxLineSpace GetLineSpaceRule() const { return eLineSpace; }
+    inline void SetLineSpaceRule(SvxLineSpaceRule e) { eLineSpaceRule = e; }
+    inline SvxLineSpaceRule GetLineSpaceRule() const { return eLineSpaceRule; }
 
     inline void SetInterLineSpaceRule(SvxInterLineSpaceRule e) { eInterLineSpaceRule = e; }
     inline SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; }
diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index f56561bb5233..0ce5a69aeea2 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -58,12 +58,12 @@ enum SvxTabAdjust
     SVX_TAB_ADJUST_END
 };
 
-enum SvxLineSpace
+enum class SvxLineSpaceRule
 {
-    SVX_LINE_SPACE_AUTO,
-    SVX_LINE_SPACE_FIX,
-    SVX_LINE_SPACE_MIN,
-    SVX_LINE_SPACE_END
+    Auto,
+    Fix,
+    Min,
+    End
 };
 
 enum class SvxInterLineSpaceRule
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index a3925ea7bef9..17bdd7e206de 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -125,7 +125,7 @@ void ParaLineSpacingControl::Initialize()
 
         switch( currSPItem->GetLineSpaceRule() )
         {
-        case SVX_LINE_SPACE_AUTO:
+        case SvxLineSpaceRule::Auto:
             {
                 SvxInterLineSpaceRule eInter = currSPItem->GetInterLineSpaceRule();
 
@@ -172,14 +172,14 @@ void ParaLineSpacingControl::Initialize()
                 }
             }
             break;
-        case SVX_LINE_SPACE_FIX:
+        case SvxLineSpaceRule::Fix:
             {
                 SelectEntryPos(LLINESPACE_FIX);
                 SetMetricValue(*mpLineDistAtMetricBox, currSPItem->GetLineHeight(), eUnit);
             }
             break;
 
-        case SVX_LINE_SPACE_MIN:
+        case SvxLineSpaceRule::Min:
             {
                 SelectEntryPos(LLINESPACE_MIN);
                 SetMetricValue(*mpLineDistAtMetricBox, currSPItem->GetLineHeight(), eUnit);
@@ -374,27 +374,27 @@ void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_In
     switch ( eSpace )
     {
         case LLINESPACE_1:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off );
             break;
 
         case LLINESPACE_115:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetPropLineSpace( LINESPACE_115 );
             break;
 
         case LLINESPACE_15:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetPropLineSpace( LINESPACE_15 );
             break;
 
         case LLINESPACE_2:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetPropLineSpace( LINESPACE_2 );
             break;
 
         case LLINESPACE_PROP:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetPropLineSpace( (sal_uInt8)lValue );
             break;
 
@@ -404,13 +404,13 @@ void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_In
             break;
 
         case LLINESPACE_DURCH:
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             rLineSpace.SetInterLineSpace( (sal_uInt16)lValue );
             break;
 
         case LLINESPACE_FIX:
             rLineSpace.SetLineHeight((sal_uInt16)lValue);
-            rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_FIX;
+            rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Fix );
             rLineSpace.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off );
         break;
     }
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 4d67fae5c2eb..a6991e8ab8d1 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1164,7 +1164,7 @@ interface BaseText
     ]
     SID_ATTR_PARA_LINESPACE // status(final|play)
     [
-         // SvxLineSpace           LineSpace       MID_LINESPACE;
+         // SvxLineSpaceRule       LineSpace       MID_LINESPACE;
          // UINT16                 LineHeight      MID_HEIGHT;     // % or direct
          // SvxInterLineSpaceRule  InterLineSpace  MID_INTER_LINESPACE;
          // INT16                  InterSpace      MID_INTER_SPACE;
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index fa01f8903fe4..f57a1f3bba68 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -257,15 +257,15 @@ void SwTextMargin::CtorInitTextMargin( SwTextFrame *pNewFrame, SwTextSizeInfo *p
             {
                 switch( pSpace->GetLineSpaceRule() )
                 {
-                    case SVX_LINE_SPACE_AUTO:
+                    case SvxLineSpaceRule::Auto:
                     break;
-                    case SVX_LINE_SPACE_MIN:
+                    case SvxLineSpaceRule::Min:
                     {
                         if( nFirstLineOfs < pSpace->GetLineHeight() )
                             nFirstLineOfs = pSpace->GetLineHeight();
                         break;
                     }
-                    case SVX_LINE_SPACE_FIX:
+                    case SvxLineSpaceRule::Fix:
                         nFirstLineOfs = pSpace->GetLineHeight();
                     break;
                     default: OSL_FAIL( ": unknown LineSpaceRule" );
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 7b0eac08724c..b4ea8e8598d4 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1732,7 +1732,7 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine )
         {
             switch( pSpace->GetLineSpaceRule() )
             {
-                case SVX_LINE_SPACE_AUTO:
+                case SvxLineSpaceRule::Auto:
                     // shrink first line of paragraph too on spacing < 100%
                     if (IsParaLine() &&
                         pSpace->GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop
@@ -1763,13 +1763,13 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine )
                         }
                     }
                 break;
-                case SVX_LINE_SPACE_MIN:
+                case SvxLineSpaceRule::Min:
                 {
                     if( nLineHeight < sal_uInt16( pSpace->GetLineHeight() ) )
                         nLineHeight = pSpace->GetLineHeight();
                     break;
                 }
-                case SVX_LINE_SPACE_FIX:
+                case SvxLineSpaceRule::Fix:
                 {
                     nLineHeight = pSpace->GetLineHeight();
                     const sal_uInt16 nAsc = ( 4 * nLineHeight ) / 5;  // 80%
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 48eefff837f8..15ead55817fa 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -294,8 +294,8 @@ bool SwTextFrame::FormatEmpty()
           aSet.GetRegister().GetValue() ) )
         return false;
     const SvxLineSpacingItem &rSpacing = aSet.GetLineSpacing();
-    if( !bCollapse && ( SVX_LINE_SPACE_MIN == rSpacing.GetLineSpaceRule() ||
-        SVX_LINE_SPACE_FIX == rSpacing.GetLineSpaceRule() ||
+    if( !bCollapse && ( SvxLineSpaceRule::Min == rSpacing.GetLineSpaceRule() ||
+        SvxLineSpaceRule::Fix == rSpacing.GetLineSpaceRule() ||
         aSet.GetLRSpace().IsAutoFirst() ) )
         return false;
 
@@ -369,7 +369,7 @@ bool SwTextFrame::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff )
                     if( pFormat )
                     {
                         const SvxLineSpacingItem &rSpace = pFormat->GetLineSpacing();
-                        if( SVX_LINE_SPACE_FIX == rSpace.GetLineSpaceRule() )
+                        if( SvxLineSpaceRule::Fix == rSpace.GetLineSpaceRule() )
                         {
                             rRegDiff = rSpace.GetLineHeight();
                             pDesc->SetRegHeight( rRegDiff );
@@ -401,9 +401,9 @@ bool SwTextFrame::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff )
 
                             switch( rSpace.GetLineSpaceRule() )
                             {
-                                case SVX_LINE_SPACE_AUTO:
+                                case SvxLineSpaceRule::Auto:
                                 break;
-                                case SVX_LINE_SPACE_MIN:
+                                case SvxLineSpaceRule::Min:
                                 {
                                     if( rRegDiff < rSpace.GetLineHeight() )
                                         rRegDiff = rSpace.GetLineHeight();
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 63c874c8261e..238bc1bb7c03 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2759,7 +2759,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt )
 
     sal_uInt16 nHeight = 0;
     sal_uInt16 nPrcHeight = 0;
-    SvxLineSpace eLineSpace = rLSItem.GetLineSpaceRule();
+    SvxLineSpaceRule eLineSpace = rLSItem.GetLineSpaceRule();
     switch( rLSItem.GetInterLineSpaceRule() )
     {
     case SvxInterLineSpaceRule::Off:
@@ -2767,11 +2767,11 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt )
         {
             switch( eLineSpace )
             {
-            case SVX_LINE_SPACE_MIN:
-            case SVX_LINE_SPACE_FIX:
+            case SvxLineSpaceRule::Min:
+            case SvxLineSpaceRule::Fix:
                 nHeight = rLSItem.GetLineHeight();
                 break;
-            case SVX_LINE_SPACE_AUTO:
+            case SvxLineSpaceRule::Auto:
                 nPrcHeight = 100;
                 break;
             default:
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 01e9b9864b66..5f5f9aa3e880 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -1656,14 +1656,14 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr,
         SvxLineSpacingItem aLSItem( nHeight, aItemIds.nLineSpacing );
         aLSItem.SetLineHeight( nHeight );
         // interpret <line-height> attribute as minimum line height
-        aLSItem.GetLineSpaceRule() = SVX_LINE_SPACE_MIN;
+        aLSItem.SetLineSpaceRule( SvxLineSpaceRule::Min );
         aLSItem.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off );
         rItemSet.Put( aLSItem );
     }
     else if( nPropHeight )
     {
         SvxLineSpacingItem aLSItem( nPropHeight, aItemIds.nLineSpacing );
-        aLSItem.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+        aLSItem.SetLineSpaceRule( SvxLineSpaceRule::Auto );
         if( 100 == nPropHeight )
             aLSItem.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off );
         else
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 9fbaf6b1fa74..dfdb32175318 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4289,13 +4289,13 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing )
     {
         default:
             break;
-        case SVX_LINE_SPACE_FIX: // Fix
+        case SvxLineSpaceRule::Fix: // Fix
             nSpace = -(short)rSpacing.GetLineHeight();
             break;
-        case SVX_LINE_SPACE_MIN: // At least
+        case SvxLineSpaceRule::Min: // At least
             nSpace = (short)rSpacing.GetLineHeight();
             break;
-        case SVX_LINE_SPACE_AUTO:
+        case SvxLineSpaceRule::Auto:
         {
             if( rSpacing.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) // Leading
             {
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 41350954feb5..26fcc8a40b44 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4096,14 +4096,14 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short
     ww::WordVersion eVersion = m_pWwFib->GetFIBVersion();
     short nMulti = (eVersion <= ww::eWW2) ? 1 : SVBT16ToShort( pData + 2 );
 
-    SvxLineSpace eLnSpc;
+    SvxLineSpaceRule eLnSpc;
     if( 0 > nSpace )
     {
         nSpace = -nSpace;
-        eLnSpc = SVX_LINE_SPACE_FIX;
+        eLnSpc = SvxLineSpaceRule::Fix;
     }
     else
-        eLnSpc = SVX_LINE_SPACE_MIN;
+        eLnSpc = SvxLineSpaceRule::Min;
 
     // WW has implicit additional paragraph spacing depending on
     // the line spacing. It is, for "exactly", 0.8 * line spacing "before"
@@ -4135,7 +4135,7 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short
         // for negative space, the distance is "exact", otherwise "at least"
         nSpaceTw = (sal_uInt16)nSpace;
         aLSpc.SetLineHeight( nSpaceTw );
-        aLSpc.GetLineSpaceRule() = eLnSpc;
+        aLSpc.SetLineSpaceRule( eLnSpc);
     }
     NewAttr( aLSpc );
     if( m_pSFlyPara )
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index 0c88309fbdda..bbc78e62a899 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -335,7 +335,7 @@ SET_LINESPACE:
         {
 
             SvxLineSpacingItem aLineSpacing(ePropL, RES_PARATR_LINESPACING );
-            aLineSpacing.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+            aLineSpacing.SetLineSpaceRule( SvxLineSpaceRule::Auto );
             if( 100 == ePropL )
                 aLineSpacing.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off );
             else
@@ -541,7 +541,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
     if( SfxItemState::DEFAULT == eState )
         pItem = &rPool.GetDefaultItem(RES_PARATR_LINESPACING);
     if( SfxItemState::DEFAULT <= eState &&
-            static_cast<const SvxLineSpacingItem* >(pItem)->GetLineSpaceRule() == SVX_LINE_SPACE_AUTO )
+            static_cast<const SvxLineSpacingItem* >(pItem)->GetLineSpaceRule() == SvxLineSpaceRule::Auto )
     {
         if(SvxInterLineSpaceRule::Off ==
                     static_cast<const SvxLineSpacingItem* >(pItem)->GetInterLineSpaceRule())