diff options
23 files changed, 83 insertions, 83 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 1ad8bdcc1e55..3062eeb094da 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -105,7 +105,7 @@ void SetLineSpace_Impl( SvxLineSpacingItem& rLineSpace, { case LLINESPACE_1: rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO; - rLineSpace.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + rLineSpace.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off ); break; case LLINESPACE_115: @@ -130,7 +130,7 @@ void SetLineSpace_Impl( SvxLineSpacingItem& rLineSpace, case LLINESPACE_MIN: rLineSpace.SetLineHeight( (sal_uInt16)lValue ); - rLineSpace.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + rLineSpace.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off ); break; case LLINESPACE_DURCH: @@ -141,7 +141,7 @@ void SetLineSpace_Impl( SvxLineSpacingItem& rLineSpace, case LLINESPACE_FIX: rLineSpace.SetLineHeight((sal_uInt16)lValue); rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_FIX; - rLineSpace.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + rLineSpace.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off ); break; } } @@ -720,17 +720,17 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl { case SVX_LINE_SPACE_AUTO: { - SvxInterLineSpace eInter = rAttr.GetInterLineSpaceRule(); + SvxInterLineSpaceRule eInter = rAttr.GetInterLineSpaceRule(); switch( eInter ) { // Default single line spacing - case SVX_INTER_LINE_SPACE_OFF: + case SvxInterLineSpaceRule::Off: m_pLineDist->SelectEntryPos( LLINESPACE_1 ); break; // Default single line spacing - case SVX_INTER_LINE_SPACE_PROP: + case SvxInterLineSpaceRule::Prop: if ( 100 == rAttr.GetPropLineSpace() ) { m_pLineDist->SelectEntryPos( LLINESPACE_1 ); @@ -759,7 +759,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl m_pLineDist->SelectEntryPos( LLINESPACE_PROP ); break; - case SVX_INTER_LINE_SPACE_FIX: + case SvxInterLineSpaceRule::Fix: SetMetricValue( *m_pLineDistAtMetricBox, rAttr.GetInterLineSpace(), eUnit ); m_pLineDist->SelectEntryPos( LLINESPACE_DURCH ); break; diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 2e984e7da7c6..df4a6464c96a 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -130,7 +130,7 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) aDebStr.append("Min: "); aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLineSpacingItem&>(rItem).GetInterLineSpace())); } - else if ( static_cast<const SvxLineSpacingItem&>(rItem).GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP ) + else if ( static_cast<const SvxLineSpacingItem&>(rItem).GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop ) { aDebStr.append("Prop: "); aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLineSpacingItem&>(rItem).GetPropLineSpace())); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 0429d7560f0d..b54ce8faec71 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -73,7 +73,7 @@ using namespace ::com::sun::star; static sal_uInt16 lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem ) { sal_uInt16 nExtra = 0; - if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) + if ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) { nExtra = rLSItem.GetInterLineSpace(); } @@ -3543,7 +3543,7 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion ) { const SvxULSpaceItem& rULSpace = static_cast<const SvxULSpaceItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE )); const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL )); - sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) + sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0; // only from the top ... @@ -3586,7 +3586,7 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion ) aRange.Max() += rL.GetHeight(); } - if( ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP ) && rLSItem.GetPropLineSpace() && + if( ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop ) && rLSItem.GetPropLineSpace() && ( rLSItem.GetPropLineSpace() < 100 ) ) { const EditLine& rL = pPortion->GetLines()[nFirstInvalid]; @@ -3613,7 +3613,7 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, bool bSmart aPaM.SetNode( pPortion->GetNode() ); const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL )); - sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) + sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0; long nY = pPortion->GetFirstLineOffset(); @@ -4029,7 +4029,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion ) { const SvxULSpaceItem& rULItem = static_cast<const SvxULSpaceItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE )); const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL )); - sal_Int32 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0; + sal_Int32 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0; if ( nSBL ) { @@ -4127,7 +4127,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_Int32 nIndex, long nY = pPortion->GetFirstLineOffset(); const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL )); - sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) + sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0; sal_Int32 nCurIndex = 0; diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index bf52ede29ad4..337e2a67a448 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -1351,7 +1351,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) pLine->SetMaxAscent( (sal_uInt16)(pLine->GetMaxAscent() + ( nFixHeight - nTxtHeight ) ) ); pLine->SetHeight( nFixHeight, nTxtHeight ); } - else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP ) + else if ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop ) { if ( nPara || pLine->GetStartPortion() ) // Not the very first line { @@ -1678,7 +1678,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn pTmpLine->SetMaxAscent( (sal_uInt16)(pTmpLine->GetMaxAscent() + ( nFixHeight - nTxtHeight ) ) ); pTmpLine->SetHeight( nFixHeight, nTxtHeight ); } - else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP ) + else if ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop ) { sal_Int32 nPara = GetParaPortions().GetPos( pParaPortion ); if ( nPara || pTmpLine->GetStartPortion() ) // Not the very first line @@ -2937,7 +2937,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt Point aParaStart( aStartPos ); const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL )); - sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) + sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0; bool bPaintBullet (false); @@ -3959,7 +3959,7 @@ long ImpEditEngine::CalcVertLineSpacing(Point& rStartPos) const nTotalOccupiedHeight += pPortion->GetFirstLineOffset(); const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pPortion->GetNode()->GetContentAttribs().GetItem(EE_PARA_SBL)); - sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) + sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0; const SvxULSpaceItem& rULItem = static_cast<const SvxULSpaceItem&>(pPortion->GetNode()->GetContentAttribs().GetItem(EE_PARA_ULSPACE)); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 1facdd5e232b..17eed1c5ca6a 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -754,7 +754,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SL ); sal_Int32 nVal = static_cast<const SvxLineSpacingItem&>(rItem).GetLineHeight(); char cMult = '0'; - if ( static_cast<const SvxLineSpacingItem&>(rItem).GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP ) + if ( static_cast<const SvxLineSpacingItem&>(rItem).GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop ) { // From where do I get the value now? // The SwRTF parser is based on a 240 Font! diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index e27e3a281553..83b6f4d91bb2 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -85,7 +85,7 @@ SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId nInterLineSpace = 0; nLineHeight = nHeight; eLineSpace = SVX_LINE_SPACE_AUTO; - eInterLineSpace = SVX_INTER_LINE_SPACE_OFF; + eInterLineSpaceRule = SvxInterLineSpaceRule::Off; } @@ -101,12 +101,12 @@ bool SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const && (eLineSpace == SVX_LINE_SPACE_AUTO || nLineHeight == rLineSpace.nLineHeight) // Same Linespacing Rule? - && ( eInterLineSpace == rLineSpace.eInterLineSpace ) + && ( eInterLineSpaceRule == rLineSpace.eInterLineSpaceRule ) // Either set proportional or additive. - && (( eInterLineSpace == SVX_INTER_LINE_SPACE_OFF) - || (eInterLineSpace == SVX_INTER_LINE_SPACE_PROP + && (( eInterLineSpaceRule == SvxInterLineSpaceRule::Off) + || (eInterLineSpaceRule == SvxInterLineSpaceRule::Prop && nPropLineSpace == rLineSpace.nPropLineSpace) - || (eInterLineSpace == SVX_INTER_LINE_SPACE_FIX + || (eInterLineSpaceRule == SvxInterLineSpaceRule::Fix && (nInterLineSpace == rLineSpace.nInterLineSpace))); } @@ -124,12 +124,12 @@ bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const switch( eLineSpace ) { case SVX_LINE_SPACE_AUTO: - if(eInterLineSpace == SVX_INTER_LINE_SPACE_FIX) + if(eInterLineSpaceRule == SvxInterLineSpaceRule::Fix) { aLSp.Mode = style::LineSpacingMode::LEADING; aLSp.Height = ( bConvert ? (short)convertTwipToMm100(nInterLineSpace) : nInterLineSpace); } - else if(eInterLineSpace == SVX_INTER_LINE_SPACE_OFF) + else if(eInterLineSpaceRule == SvxInterLineSpaceRule::Off) { aLSp.Mode = style::LineSpacingMode::PROP; aLSp.Height = 100; @@ -186,7 +186,7 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { case style::LineSpacingMode::LEADING: { - eInterLineSpace = SVX_INTER_LINE_SPACE_FIX; + eInterLineSpaceRule = SvxInterLineSpaceRule::Fix; eLineSpace = SVX_LINE_SPACE_AUTO; nInterLineSpace = aLSp.Height; if(bConvert) @@ -199,15 +199,15 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) eLineSpace = SVX_LINE_SPACE_AUTO; nPropLineSpace = (sal_Int16)aLSp.Height; if(100 == aLSp.Height) - eInterLineSpace = SVX_INTER_LINE_SPACE_OFF; + eInterLineSpaceRule = SvxInterLineSpaceRule::Off; else - eInterLineSpace = SVX_INTER_LINE_SPACE_PROP; + eInterLineSpaceRule = SvxInterLineSpaceRule::Prop; } break; case style::LineSpacingMode::FIX: case style::LineSpacingMode::MINIMUM: { - eInterLineSpace = SVX_INTER_LINE_SPACE_OFF; + eInterLineSpaceRule = SvxInterLineSpaceRule::Off; eLineSpace = aLSp.Mode == style::LineSpacingMode::FIX ? SVX_LINE_SPACE_FIX : SVX_LINE_SPACE_MIN; nLineHeight = aLSp.Height; if(bConvert) @@ -261,7 +261,7 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const pAttr->SetInterLineSpace( nInterSpace ); pAttr->SetPropLineSpace( nPropSpace ); pAttr->GetLineSpaceRule() = (SvxLineSpace)nRule; - pAttr->GetInterLineSpaceRule() = (SvxInterLineSpace)nInterRule; + pAttr->SetInterLineSpaceRule( (SvxInterLineSpaceRule)nInterRule ); return pAttr; } @@ -272,7 +272,7 @@ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion* .WriteInt16( GetInterLineSpace() ) .WriteUInt16( GetLineHeight() ) .WriteSChar( GetLineSpaceRule() ) - .WriteSChar( GetInterLineSpaceRule() ); + .WriteSChar( (char) GetInterLineSpaceRule() ); return rStrm; } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index f5493623bdfc..868727bb03f8 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -6267,7 +6267,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& if ( nVal2 <= 0 ) { aItem.SetLineHeight( (sal_uInt16)( rManager.ScalePoint( -nVal2 ) / 8 ) ); aItem.GetLineSpaceRule() = SVX_LINE_SPACE_FIX; - aItem.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + aItem.SetInterLineSpaceRule(SvxInterLineSpaceRule::Off); } else { sal_uInt8 nPropLineSpace = (sal_uInt8)nVal2; diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index 37037fc182a2..cc0f4886335d 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -228,7 +228,7 @@ namespace frm SvxLineSpacingItem aLineSpacing( m_nLineSpace, getWhich() ); aLineSpacing.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO; if ( 100 == m_nLineSpace ) - aLineSpacing.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + aLineSpacing.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off ); else aLineSpacing.SetPropLineSpace( (sal_uInt8)m_nLineSpace ); diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index da548636c0ef..5a3addf80c06 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -34,11 +34,11 @@ class SvXMLUnitConverter; #define LINE_SPACE_DEFAULT_HEIGHT 200 class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface { - short nInterLineSpace; - sal_uInt16 nLineHeight; - sal_uInt16 nPropLineSpace; - SvxLineSpace eLineSpace; - SvxInterLineSpace eInterLineSpace; + short nInterLineSpace; + sal_uInt16 nLineHeight; + sal_uInt16 nPropLineSpace; + SvxLineSpace eLineSpace; + SvxInterLineSpaceRule eInterLineSpaceRule; public: static SfxPoolItem* CreateDefault(); @@ -69,7 +69,7 @@ public: inline void SetInterLineSpace( const short nSpace ) { nInterLineSpace = nSpace; - eInterLineSpace = SVX_INTER_LINE_SPACE_FIX; + eInterLineSpaceRule = SvxInterLineSpaceRule::Fix; } // Determines the absolute or minimum row height. @@ -85,14 +85,14 @@ public: inline void SetPropLineSpace( const sal_uInt8 nProp ) { nPropLineSpace = nProp; - eInterLineSpace = SVX_INTER_LINE_SPACE_PROP; + eInterLineSpaceRule = SvxInterLineSpaceRule::Prop; } inline SvxLineSpace &GetLineSpaceRule() { return eLineSpace; } inline SvxLineSpace GetLineSpaceRule() const { return eLineSpace; } - inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; } - inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; } + inline void SetInterLineSpaceRule(SvxInterLineSpaceRule e) { eInterLineSpaceRule = e; } + inline SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; } virtual sal_uInt16 GetValueCount() const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index 617dcecd9bd1..f56561bb5233 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -66,12 +66,12 @@ enum SvxLineSpace SVX_LINE_SPACE_END }; -enum SvxInterLineSpace +enum class SvxInterLineSpaceRule { - SVX_INTER_LINE_SPACE_OFF, - SVX_INTER_LINE_SPACE_PROP, - SVX_INTER_LINE_SPACE_FIX, - SVX_INTER_LINE_SPACE_END + Off, + Prop, + Fix, + End }; enum SvxAdjust diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 98594af8e1cb..a3925ea7bef9 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -127,15 +127,15 @@ void ParaLineSpacingControl::Initialize() { case SVX_LINE_SPACE_AUTO: { - SvxInterLineSpace eInter = currSPItem->GetInterLineSpaceRule(); + SvxInterLineSpaceRule eInter = currSPItem->GetInterLineSpaceRule(); switch( eInter ) { - case SVX_INTER_LINE_SPACE_OFF: + case SvxInterLineSpaceRule::Off: SelectEntryPos(LLINESPACE_1); break; - case SVX_INTER_LINE_SPACE_PROP: + case SvxInterLineSpaceRule::Prop: { if ( LINESPACE_1 == currSPItem->GetPropLineSpace() ) { @@ -161,7 +161,7 @@ void ParaLineSpacingControl::Initialize() } break; - case SVX_INTER_LINE_SPACE_FIX: + case SvxInterLineSpaceRule::Fix: { SelectEntryPos(LLINESPACE_DURCH); SetMetricValue(*mpLineDistAtMetricBox, currSPItem->GetInterLineSpace(), eUnit); @@ -375,7 +375,7 @@ void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_In { case LLINESPACE_1: rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO; - rLineSpace.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + rLineSpace.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off ); break; case LLINESPACE_115: @@ -400,7 +400,7 @@ void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_In case LLINESPACE_MIN: rLineSpace.SetLineHeight( (sal_uInt16)lValue ); - rLineSpace.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + rLineSpace.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off ); break; case LLINESPACE_DURCH: @@ -411,7 +411,7 @@ void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_In case LLINESPACE_FIX: rLineSpace.SetLineHeight((sal_uInt16)lValue); rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_FIX; - rLineSpace.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + rLineSpace.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off ); break; } } diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index d6be58b95576..4d67fae5c2eb 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -1164,10 +1164,10 @@ interface BaseText ] SID_ATTR_PARA_LINESPACE // status(final|play) [ - // SvxLineSpace LineSpace MID_LINESPACE; - // UINT16 LineHeight MID_HEIGHT; // % or direct - // SvxInterLineSpace InterLineSpace MID_INTER_LINESPACE; - // INT16 InterSpace MID_INTER_SPACE; + // SvxLineSpace LineSpace MID_LINESPACE; + // UINT16 LineHeight MID_HEIGHT; // % or direct + // SvxInterLineSpaceRule InterLineSpace MID_INTER_LINESPACE; + // INT16 InterSpace MID_INTER_SPACE; ExecMethod = ExecParaAttr ; StateMethod = GetAttrState ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 335582a4907b..3e36f3f5dc52 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -739,7 +739,7 @@ SwContentNotify::SwContentNotify( SwContentFrame *pContentFrame ) : { const SwAttrSet* pSet = pTextFrame->GetAttrSet(); const SvxLineSpacingItem &rSpace = pSet->GetLineSpacing(); - if ( rSpace.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP ) + if ( rSpace.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop ) { mbChkHeightOfLastLine = true; mnHeightOfLastLine = pTextFrame->GetHeightOfLastLine(); diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index eda55e9de8af..63d8994c1beb 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -475,7 +475,7 @@ bool SwTextFrame::GetTopOfLine( SwTwips& _onTopOfLine, // top of the line. // Otherwise the line layout determines the top of the line const SvxLineSpacingItem& rSpace = GetAttrSet()->GetLineSpacing(); - if ( rSpace.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP ) + if ( rSpace.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop ) { SwRect aCharRect; if ( GetAutoPos( aCharRect, _rPos ) ) diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 3e871f1be718..fa01f8903fe4 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -272,9 +272,9 @@ void SwTextMargin::CtorInitTextMargin( SwTextFrame *pNewFrame, SwTextSizeInfo *p } switch( pSpace->GetInterLineSpaceRule() ) { - case SVX_INTER_LINE_SPACE_OFF: + case SvxInterLineSpaceRule::Off: break; - case SVX_INTER_LINE_SPACE_PROP: + case SvxInterLineSpaceRule::Prop: { long nTmp = pSpace->GetPropLineSpace(); // 50% is the minimum, at 0% we switch to @@ -289,7 +289,7 @@ void SwTextMargin::CtorInitTextMargin( SwTextFrame *pNewFrame, SwTextSizeInfo *p nFirstLineOfs = nTmp; break; } - case SVX_INTER_LINE_SPACE_FIX: + case SvxInterLineSpaceRule::Fix: { nFirstLineOfs += pSpace->GetInterLineSpace(); break; diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 59118504be07..7b0eac08724c 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1705,7 +1705,7 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine ) // we ignore any line spacing options except from ... const SvxLineSpacingItem* pSpace = m_aLineInf.GetLineSpacing(); if ( ! IsParaLine() && pSpace && - SVX_INTER_LINE_SPACE_PROP == pSpace->GetInterLineSpaceRule() ) + SvxInterLineSpaceRule::Prop == pSpace->GetInterLineSpaceRule() ) { sal_uLong nTmp = pSpace->GetPropLineSpace(); @@ -1735,7 +1735,7 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine ) case SVX_LINE_SPACE_AUTO: // shrink first line of paragraph too on spacing < 100% if (IsParaLine() && - pSpace->GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP + pSpace->GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop && GetTextFrame()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::PROP_LINE_SPACING_SHRINKS_FIRST_LINE)) { long nTmp = pSpace->GetPropLineSpace(); @@ -1788,9 +1788,9 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine ) if( !IsParaLine() ) switch( pSpace->GetInterLineSpaceRule() ) { - case SVX_INTER_LINE_SPACE_OFF: + case SvxInterLineSpaceRule::Off: break; - case SVX_INTER_LINE_SPACE_PROP: + case SvxInterLineSpaceRule::Prop: { long nTmp = pSpace->GetPropLineSpace(); // 50% ist das Minimum, bei 0% schalten wir auf @@ -1805,7 +1805,7 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine ) nLineHeight = (sal_uInt16)nTmp; break; } - case SVX_INTER_LINE_SPACE_FIX: + case SvxInterLineSpaceRule::Fix: { nLineHeight = nLineHeight + pSpace->GetInterLineSpace(); break; diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 4b32adad98bb..48eefff837f8 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -414,9 +414,9 @@ bool SwTextFrame::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff ) } switch( rSpace.GetInterLineSpaceRule() ) { - case SVX_INTER_LINE_SPACE_OFF: + case SvxInterLineSpaceRule::Off: break; - case SVX_INTER_LINE_SPACE_PROP: + case SvxInterLineSpaceRule::Prop: { long nTmp = rSpace.GetPropLineSpace(); if( nTmp < 50 ) @@ -429,7 +429,7 @@ bool SwTextFrame::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff ) nNetHeight = rRegDiff; break; } - case SVX_INTER_LINE_SPACE_FIX: + case SvxInterLineSpaceRule::Fix: { rRegDiff = rRegDiff + rSpace.GetInterLineSpace(); nNetHeight = rRegDiff; diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index ec13901c974f..2cc921bd0a26 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -2379,7 +2379,7 @@ long SwTextFrame::GetLineSpace( const bool _bNoPropLineSpace ) const switch( rSpace.GetInterLineSpaceRule() ) { - case SVX_INTER_LINE_SPACE_PROP: + case SvxInterLineSpaceRule::Prop: { if ( _bNoPropLineSpace ) { @@ -2400,7 +2400,7 @@ long SwTextFrame::GetLineSpace( const bool _bNoPropLineSpace ) const nRet = 0; } break; - case SVX_INTER_LINE_SPACE_FIX: + case SvxInterLineSpaceRule::Fix: { if ( rSpace.GetInterLineSpace() > 0 ) nRet = rSpace.GetInterLineSpace(); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index c36a82a0af5f..63c874c8261e 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2762,8 +2762,8 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt ) SvxLineSpace eLineSpace = rLSItem.GetLineSpaceRule(); switch( rLSItem.GetInterLineSpaceRule() ) { - case SVX_INTER_LINE_SPACE_OFF: - case SVX_INTER_LINE_SPACE_FIX: + case SvxInterLineSpaceRule::Off: + case SvxInterLineSpaceRule::Fix: { switch( eLineSpace ) { @@ -2779,7 +2779,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt ) } } break; - case SVX_INTER_LINE_SPACE_PROP: + case SvxInterLineSpaceRule::Prop: nPrcHeight = rLSItem.GetPropLineSpace(); break; diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 6c371e0978ab..01e9b9864b66 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -1657,7 +1657,7 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr, aLSItem.SetLineHeight( nHeight ); // interpret <line-height> attribute as minimum line height aLSItem.GetLineSpaceRule() = SVX_LINE_SPACE_MIN; - aLSItem.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + aLSItem.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off ); rItemSet.Put( aLSItem ); } else if( nPropHeight ) @@ -1665,7 +1665,7 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr, SvxLineSpacingItem aLSItem( nPropHeight, aItemIds.nLineSpacing ); aLSItem.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO; if( 100 == nPropHeight ) - aLSItem.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + aLSItem.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off ); else aLSItem.SetPropLineSpace( nPropHeight ); rItemSet.Put( aLSItem ); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index b489623cccb8..03a5b9db186b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4026,7 +4026,7 @@ void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem& rHt) break; case RES_PARATR_LINESPACING: - bMustWrite = static_cast< const SvxLineSpacingItem& >(rHt).GetInterLineSpaceRule() != SVX_INTER_LINE_SPACE_OFF; + bMustWrite = static_cast< const SvxLineSpacingItem& >(rHt).GetInterLineSpaceRule() != SvxInterLineSpaceRule::Off; break; case RES_PARATR_ADJUST: bMustWrite = static_cast< const SvxAdjustItem& >(rHt).GetAdjust() != SVX_ADJUST_LEFT; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 888414431d05..9fbaf6b1fa74 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4297,7 +4297,7 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) break; case SVX_LINE_SPACE_AUTO: { - if( rSpacing.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) // Leading + if( rSpacing.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Fix ) // Leading { // gibt es aber nicht in WW - also wie kommt man an // die MaxLineHeight heran? diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 4125dd337ef5..0c88309fbdda 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -337,7 +337,7 @@ SET_LINESPACE: SvxLineSpacingItem aLineSpacing(ePropL, RES_PARATR_LINESPACING ); aLineSpacing.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO; if( 100 == ePropL ) - aLineSpacing.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; + aLineSpacing.SetInterLineSpaceRule( SvxInterLineSpaceRule::Off ); else aLineSpacing.SetPropLineSpace(ePropL); aSet.Put( aLineSpacing ); @@ -543,7 +543,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) if( SfxItemState::DEFAULT <= eState && static_cast<const SvxLineSpacingItem* >(pItem)->GetLineSpaceRule() == SVX_LINE_SPACE_AUTO ) { - if(SVX_INTER_LINE_SPACE_OFF == + if(SvxInterLineSpaceRule::Off == static_cast<const SvxLineSpacingItem* >(pItem)->GetInterLineSpaceRule()) nLineSpace = 100; else |