diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-09 13:17:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-10 12:13:29 +0100 |
| commit | f2ca8ff2e68281abf6b1d805f9fd17bf0d4e7750 (patch) | |
| tree | 97bd8c968ce2e664ecb0c81f3dddf22bb74100ca /sw | |
| parent | 802adf5563d3fb190b7ce964bc10a3792f99ad04 (diff) | |
cppcheck: knownConditionTrueFalse
Change-Id: I0368639742e23ce449d2d4ba75f524e693d2ea65
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 9c35e3984d14..9e661d665144 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -266,7 +266,7 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& } // export sub streams for package, else full stream into a file - bool bWarn = false, bErr = false; + bool bWarn = false; // RDF metadata: export if ODF >= 1.2 // N.B.: embedded documents have their own manifest.rdf! @@ -327,25 +327,24 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& } } - if( !bErr ) + if( !bBlock ) { - if( !bBlock ) + if( !WriteThroughComponent( + xModelComp, "settings.xml", xContext, + (bOASIS ? "com.sun.star.comp.Writer.XMLOasisSettingsExporter" + : "com.sun.star.comp.Writer.XMLSettingsExporter"), + aEmptyArgs, aProps ) ) { - if( !WriteThroughComponent( - xModelComp, "settings.xml", xContext, - (bOASIS ? "com.sun.star.comp.Writer.XMLOasisSettingsExporter" - : "com.sun.star.comp.Writer.XMLSettingsExporter"), - aEmptyArgs, aProps ) ) + if( !bWarn ) { - if( !bWarn ) - { - bWarn = true; - sWarnFile = "settings.xml"; - } + bWarn = true; + sWarnFile = "settings.xml"; } } } + bool bErr = false; + OUString sErrFile; if( !WriteThroughComponent( xModelComp, "styles.xml", xContext, |