diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-07 17:16:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-08 08:08:35 +0200 |
| commit | a209172669e7a2de6065486e385e4e3007b74bd2 (patch) | |
| tree | 4a7e008cf700fb23ecc6e4cd44de1c6a08a9b7e7 /xmloff | |
| parent | 2675cbf042130f24fe7ea299b85b8f5f4794a667 (diff) | |
loplugin:constantparam
Change-Id: Ib92aba17c46a4ada75c2a0630f281759d995f32e
Reviewed-on: https://gerrit.libreoffice.org/40843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtparae.cxx | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index e6ce3a0c453c..361d968f696a 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -1677,7 +1677,7 @@ void XMLTextParagraphExport::exportText( if( !bAutoStyles && (pRedlineExport != nullptr) ) pRedlineExport->ExportStartOrEndRedline( xPropertySet, true ); exportTextContentEnumeration( xParaEnum, bAutoStyles, xBaseSection, - bIsProgress, bExportParagraph, nullptr, true/*bExportLevels*/, eExtensionNS ); + bIsProgress, bExportParagraph, nullptr, eExtensionNS ); if( !bAutoStyles && (pRedlineExport != nullptr) ) pRedlineExport->ExportStartOrEndRedline( xPropertySet, false ); } @@ -1720,7 +1720,7 @@ void XMLTextParagraphExport::exportTextContentEnumeration( bool bIsProgress, bool bExportParagraph, const Reference < XPropertySet > *pRangePropSet, - bool bExportLevels, TextPNS eExtensionNS ) + TextPNS eExtensionNS ) { SAL_WARN_IF( !rContEnum.is(), "xmloff", "No enumeration to export!" ); bool bHasMoreElements = rContEnum->hasMoreElements(); @@ -1756,30 +1756,27 @@ void XMLTextParagraphExport::exportTextContentEnumeration( Reference<XServiceInfo> xServiceInfo( xTxtCntnt, UNO_QUERY ); if( xServiceInfo->supportsService( sParagraphService ) ) { - if( bExportLevels ) + if( bAutoStyles ) { - if( bAutoStyles ) - { - exportListAndSectionChange( xCurrentTextSection, xTxtCntnt, - aPrevNumInfo, aNextNumInfo, - bAutoStyles ); - } - else - { - /* Pass list auto style pool to <XMLTextNumRuleInfo> instance - Pass info about request to export <text:number> element - to <XMLTextNumRuleInfo> instance (#i69627#) - */ - aNextNumInfo.Set( xTxtCntnt, - GetExport().writeOutlineStyleAsNormalListStyle(), - GetListAutoStylePool(), - GetExport().exportTextNumberElement() ); - - exportListAndSectionChange( xCurrentTextSection, aPropSetHelper, - TEXT_SECTION, xTxtCntnt, - aPrevNumInfo, aNextNumInfo, - bAutoStyles ); - } + exportListAndSectionChange( xCurrentTextSection, xTxtCntnt, + aPrevNumInfo, aNextNumInfo, + bAutoStyles ); + } + else + { + /* Pass list auto style pool to <XMLTextNumRuleInfo> instance + Pass info about request to export <text:number> element + to <XMLTextNumRuleInfo> instance (#i69627#) + */ + aNextNumInfo.Set( xTxtCntnt, + GetExport().writeOutlineStyleAsNormalListStyle(), + GetListAutoStylePool(), + GetExport().exportTextNumberElement() ); + + exportListAndSectionChange( xCurrentTextSection, aPropSetHelper, + TEXT_SECTION, xTxtCntnt, + aPrevNumInfo, aNextNumInfo, + bAutoStyles ); } // if we found a mute section: skip all section content @@ -1866,7 +1863,7 @@ void XMLTextParagraphExport::exportTextContentEnumeration( bHasMoreElements = rContEnum->hasMoreElements(); } - if( bExportLevels && bHasContent && !bAutoStyles ) + if( bHasContent && !bAutoStyles ) { aNextNumInfo.Reset(); |