convert SvxLineSpace to scoped enum

and rename to be more explicit

Change-Id: Id06e6b68ef30e1d0d0daf19c37a390060e8bcb01

9 files changed, 27 insertions, 27 deletions

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())