[Libreoffice-commits] core.git: sw/source

Zolnai Tamás tamas.zolnai at collabora.com
Sat Sep 3 21:49:41 UTC 2016


 sw/source/filter/html/htmlatr.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 423b4ed6a2474f9ba1110b324b54950c2fc56c76
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sat Sep 3 23:48:43 2016 +0200

    cppcheck: variableScope
    
    Change-Id: I3850017bdf3ac2ac0436d4f64f45d61be9c8691a

diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 3c5a598..0eaf819 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -303,10 +303,8 @@ SwHTMLFormatInfo::SwHTMLFormatInfo( const SwFormat *pF, SwDoc *pDoc, SwDoc *pTem
 
         pItemSet->Set( pFormat->GetAttrSet() );
 
-        bool bSetDefaults = true, bClearSame = true;
         if( pReferenceFormat )
-            SwHTMLWriter::SubtractItemSet( *pItemSet, pReferenceFormat->GetAttrSet(),
-                                           bSetDefaults, bClearSame );
+            SwHTMLWriter::SubtractItemSet( *pItemSet, pReferenceFormat->GetAttrSet(), true, true );
 
         // delete ItemSet that is empty straight away. This will save work
         // later on


More information about the Libreoffice-commits mailing list