sw/source/filter/ww8/ww8par2.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 8d645c36b8cee4850884390fac4d858ceeff1108
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 19 12:49:34 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 19 22:24:24 2018 +0200
expression is excessive
Change-Id: Idb6b2af0a3d37ff9ebf13a0413f9656000296b48
Reviewed-on: https://gerrit.libreoffice.org/61996
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 58257f01830c..f272fded5b5c 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -798,8 +798,8 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const
sal_uInt8* pData, shor
return;
}
- if( m_nSwNumLevel <= MAXLEVEL // Value range mapping WW:1..9 ->
SW:0..8
- && m_nSwNumLevel <= 9 ){ // No Bullets or Numbering
+ if (m_nSwNumLevel <= 9) // Value range mapping WW:1..9 -> SW:0..8
+ {
// If NumRuleItems were set, either directly or through inheritance,
disable them now
m_pCurrentColl->SetFormatAttr( SwNumRuleItem() );
@@ -814,7 +814,8 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const
sal_uInt8* pData, shor
// Missing Levels need not be replenished
m_rDoc.SetOutlineNumRule( aNR );
- }else if( m_xStyles->mnWwNumLevel == 10 || m_xStyles->mnWwNumLevel == 11 ){
+ }
+ else if( m_xStyles->mnWwNumLevel == 10 || m_xStyles->mnWwNumLevel == 11 ){
SwNumRule* pNR = GetStyRule();
SetAnld(pNR, reinterpret_cast<WW8_ANLD const *>(pData), 0, false);
m_pCurrentColl->SetFormatAttr( SwNumRuleItem( pNR->GetName() ) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
