diff options
author | Noel Grandin <noel@peralex.com> | 2016-06-27 15:08:50 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-28 11:21:17 +0000 |
commit | 48a8d6d8434908690bc2a51d27f1051bd550c9b0 (patch) | |
tree | 066f8fc9753bdba62f87f205baface6e729857bf /xmloff | |
parent | svtools: survive swapout/in of graphic with embedded pdf (diff) | |
download | core-48a8d6d8434908690bc2a51d27f1051bd550c9b0.tar.gz core-48a8d6d8434908690bc2a51d27f1051bd550c9b0.zip |
loplugin:singlevalfields in various
Change-Id: Ia0d8f463a4dba9ec63aa0159441e3e607dd3bf5e
Reviewed-on: https://gerrit.libreoffice.org/26738
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/text/XMLTextMasterPageContext.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 29e1ab48327a..b2feaccdeec1 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -74,10 +74,6 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport, , bInsertFooterFirst( false ) , bHeaderInserted( false ) , bFooterInserted( false ) -, bHeaderLeftInserted( false ) -, bFooterLeftInserted( false ) -, bHeaderFirstInserted( false ) -, bFooterFirstInserted( false ) { OUString sName, sDisplayName; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -199,19 +195,19 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateChildContext( } break; case XML_TOK_TEXT_MP_HEADER_LEFT: - if( bInsertHeaderLeft && bHeaderInserted && !bHeaderLeftInserted ) + if( bInsertHeaderLeft && bHeaderInserted ) bInsert = bLeft = true; break; case XML_TOK_TEXT_MP_FOOTER_LEFT: - if( bInsertFooterLeft && bFooterInserted && !bFooterLeftInserted ) + if( bInsertFooterLeft && bFooterInserted ) bInsert = bFooter = bLeft = true; break; case XML_TOK_TEXT_MP_HEADER_FIRST: - if( bInsertHeaderFirst && bHeaderInserted && !bHeaderFirstInserted ) + if( bInsertHeaderFirst && bHeaderInserted ) bInsert = bFirst = true; break; case XML_TOK_TEXT_MP_FOOTER_FIRST: - if( bInsertFooterFirst && bFooterInserted && !bFooterFirstInserted ) + if( bInsertFooterFirst && bFooterInserted ) bInsert = bFooter = bFirst = true; break; } |