diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-10 18:31:38 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-10 18:34:09 +0200 |
| commit | f4d50ca58143d4592e047cccace9e207448142fe (patch) | |
| tree | 36d9ba5ea384a0078dc454a535415861f7220884 /sw/source/filter | |
| parent | 463ba7b4d347c6fa0bcd1f01a49a18c7470a4ea0 (diff) | |
CID#704368 RtfAttributeOutput::ParaNumRule_Impl(): logically dead code
Change-Id: I7dae57f890a32511bb00ae5a6e1741fb6701046e
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 47731f4be4d4..198da0ad5d26 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2584,20 +2584,17 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL { SAL_WARN_IF(pTxtNd->GetActualListLevel() < 0 || pTxtNd->GetActualListLevel() >= MAXLEVEL, "sw.rtf", "text node does not have valid list level"); - const bool bExportNumRule = USHRT_MAX != nNumId; const SwNumFmt* pFmt = pRule->GetNumFmt( nLvl ); if( !pFmt ) pFmt = &pRule->Get( nLvl ); const SfxItemSet& rNdSet = pTxtNd->GetSwAttrSet(); - if ( bExportNumRule ) { - m_aStyles.append('{'); - m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LISTTEXT); - m_aStyles.append(OOO_STRING_SVTOOLS_RTF_PARD); - m_aStyles.append(OOO_STRING_SVTOOLS_RTF_PLAIN); - m_aStyles.append(' '); - } + m_aStyles.append('{'); + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LISTTEXT); + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_PARD); + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_PLAIN); + m_aStyles.append(' '); SvxLRSpaceItem aLR( (SvxLRSpaceItem&)rNdSet.Get( RES_LR_SPACE ) ); aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt->GetIndentAt() ); @@ -2621,32 +2618,27 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL m_aStyles.append(msfilter::rtfutil::OutString(sTxt, m_rExport.eDefaultEncoding)); } - if( bExportNumRule ) + if( OUTLINE_RULE != pRule->GetRuleType() ) { - if( OUTLINE_RULE != pRule->GetRuleType() ) + if (sTxt.Len()) + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB); + m_aStyles.append('}'); + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL); + if( nLvl > 8 ) // RTF knows only 9 levels { - if (sTxt.Len()) - m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB); + m_aStyles.append((sal_Int32)8); + m_aStyles.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SOUTLVL); + m_aStyles.append((sal_Int32)nLvl); m_aStyles.append('}'); - m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL); - if( nLvl > 8 ) // RTF knows only 9 levels - { - m_aStyles.append((sal_Int32)8); - m_aStyles.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SOUTLVL); - m_aStyles.append((sal_Int32)nLvl); - m_aStyles.append('}'); - } - else - m_aStyles.append((sal_Int32)nLvl); } else - m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB "}"); - m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LS); - m_aStyles.append((sal_Int32)m_rExport.GetId(*pRule)+1); - m_aStyles.append(' '); + m_aStyles.append((sal_Int32)nLvl); } - else if( sTxt.Len() ) - m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB); + else + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB "}"); + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LS); + m_aStyles.append((sal_Int32)m_rExport.GetId(*pRule)+1); + m_aStyles.append(' '); } FormatLRSpace(aLR); } |