diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-06-17 08:33:19 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-06-17 09:17:06 +0200 |
commit | 32b903ffd077a0f11b345148f242d0524c72f1b4 (patch) | |
tree | 7a44b3bf9e92c54c49a8969dae492d96fba8beac | |
parent | c8acd77fd08c0c02fa3e1b388f993e77aba3537e (diff) |
xmloff: prefix members of XMLIndexSimpleEntryContext
Change-Id: I90950ebbb78c53a24960b007ddf53fb02e5cfb9a
Reviewed-on: https://gerrit.libreoffice.org/74144
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
6 files changed, 38 insertions, 38 deletions
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx index 26e5cae30746..c8724ee10849 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx @@ -111,8 +111,8 @@ void XMLIndexBibliographyEntryContext::StartElement( { if ( IsXMLToken( sLocalName, XML_STYLE_NAME ) ) { - sCharStyleName = xAttrList->getValueByIndex(nAttr); - bCharStyleNameOK = true; + m_sCharStyleName = xAttrList->getValueByIndex(nAttr); + m_bCharStyleNameOK = true; } else if ( IsXMLToken( sLocalName, XML_BIBLIOGRAPHY_DATA_FIELD ) ) { @@ -129,13 +129,13 @@ void XMLIndexBibliographyEntryContext::StartElement( } // if we have a style name, set it! - if (bCharStyleNameOK) + if (m_bCharStyleNameOK) { - nValues++; + m_nValues++; } // always bibliography; else element is not valid - nValues++; + m_nValues++; } void XMLIndexBibliographyEntryContext::EndElement() @@ -154,7 +154,7 @@ void XMLIndexBibliographyEntryContext::FillPropertyValues( XMLIndexSimpleEntryContext::FillPropertyValues(rValues); // bibliography data field - sal_Int32 nIndex = bCharStyleNameOK ? 2 : 1; + sal_Int32 nIndex = m_bCharStyleNameOK ? 2 : 1; rValues[nIndex].Name = "BibliographyDataField"; rValues[nIndex].Value <<= nBibliographyInfo; } diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index 840eea547596..4d5118b369d8 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -94,8 +94,8 @@ void XMLIndexChapterInfoEntryContext::StartElement( { if ( IsXMLToken( sLocalName, XML_STYLE_NAME ) ) { - sCharStyleName = xAttrList->getValueByIndex(nAttr); - bCharStyleNameOK = true; + m_sCharStyleName = xAttrList->getValueByIndex(nAttr); + m_bCharStyleNameOK = true; } else if ( IsXMLToken( sLocalName, XML_DISPLAY ) )//i53420, always true, in TOC as well { @@ -123,15 +123,15 @@ void XMLIndexChapterInfoEntryContext::StartElement( } // if we have a style name, set it! - if (bCharStyleNameOK) + if (m_bCharStyleNameOK) { - nValues++; + m_nValues++; } // if we have chapter info, set it! if (bChapterInfoOK) { - nValues++; + m_nValues++; /* Some of the index chapter information attributes written to ODF 1.1 and 1.2 don't reflect the displaying (#i89791#) */ @@ -163,7 +163,7 @@ void XMLIndexChapterInfoEntryContext::StartElement( } } if (bOutlineLevelOK) - nValues++; + m_nValues++; } void XMLIndexChapterInfoEntryContext::FillPropertyValues( @@ -172,7 +172,7 @@ void XMLIndexChapterInfoEntryContext::FillPropertyValues( // entry name and (optionally) style name in parent class XMLIndexSimpleEntryContext::FillPropertyValues(rValues); - sal_Int32 nIndex = bCharStyleNameOK ? 2 : 1; + sal_Int32 nIndex = m_bCharStyleNameOK ? 2 : 1; if( bChapterInfoOK ) { diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx index 3137282b9798..3addf0827632 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -45,10 +45,10 @@ XMLIndexSimpleEntryContext::XMLIndexSimpleEntryContext( sal_uInt16 nPrfx, const OUString& rLocalName ) : SvXMLImportContext(rImport, nPrfx, rLocalName) -, rEntryType(rEntry) -, bCharStyleNameOK(false) -, rTemplateContext(rTemplate) -, nValues(1) +, m_rEntryType(rEntry) +, m_bCharStyleNameOK(false) +, m_rTemplateContext(rTemplate) +, m_nValues(1) { } @@ -70,33 +70,33 @@ void XMLIndexSimpleEntryContext::StartElement( if ( (XML_NAMESPACE_TEXT == nPrefix) && IsXMLToken(sLocalName, XML_STYLE_NAME) ) { - sCharStyleName = xAttrList->getValueByIndex(nAttr); + m_sCharStyleName = xAttrList->getValueByIndex(nAttr); OUString sDisplayStyleName = GetImport().GetStyleDisplayName( - XML_STYLE_FAMILY_TEXT_TEXT, sCharStyleName ); + XML_STYLE_FAMILY_TEXT_TEXT, m_sCharStyleName ); // #142494#: Check if style exists const Reference < css::container::XNameContainer > & rStyles = GetImport().GetTextImport()->GetTextStyles(); if( rStyles.is() && rStyles->hasByName( sDisplayStyleName ) ) - bCharStyleNameOK = true; + m_bCharStyleNameOK = true; else - bCharStyleNameOK = false; + m_bCharStyleNameOK = false; } } // if we have a style name, set it! - if (bCharStyleNameOK) + if (m_bCharStyleNameOK) { - nValues++; + m_nValues++; } } void XMLIndexSimpleEntryContext::EndElement() { - Sequence<PropertyValue> aValues(nValues); + Sequence<PropertyValue> aValues(m_nValues); FillPropertyValues(aValues); - rTemplateContext.addTemplateEntry(aValues); + m_rTemplateContext.addTemplateEntry(aValues); } void XMLIndexSimpleEntryContext::FillPropertyValues( @@ -110,15 +110,15 @@ void XMLIndexSimpleEntryContext::FillPropertyValues( // token type rValues[0].Name = "TokenType"; - rValues[0].Value <<= rEntryType; + rValues[0].Value <<= m_rEntryType; // char style - if (bCharStyleNameOK) + if (m_bCharStyleNameOK) { rValues[1].Name = "CharacterStyleName"; aAny <<= GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_TEXT, - sCharStyleName ); + m_sCharStyleName ); rValues[1].Value = aAny; } diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx index 4640f859f629..50748c9bf0ab 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx @@ -38,18 +38,18 @@ class XMLIndexSimpleEntryContext : public SvXMLImportContext { // entry type - const OUString rEntryType; + const OUString m_rEntryType; protected: // character style - OUString sCharStyleName; - bool bCharStyleNameOK; + OUString m_sCharStyleName; + bool m_bCharStyleNameOK; // surrounding template - XMLIndexTemplateContext& rTemplateContext; + XMLIndexTemplateContext& m_rTemplateContext; // number of values for PropertyValues - sal_Int32 nValues; + sal_Int32 m_nValues; public: diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx index 34e48d38369b..b205b49d19ab 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx @@ -36,7 +36,7 @@ XMLIndexSpanEntryContext::XMLIndexSpanEntryContext( XMLIndexSimpleEntryContext(rImport, "TokenText", rTemplate, nPrfx, rLocalName) { - nValues++; // one more for the text string + m_nValues++; // one more for the text string } XMLIndexSpanEntryContext::~XMLIndexSpanEntryContext() @@ -57,8 +57,8 @@ void XMLIndexSpanEntryContext::FillPropertyValues( // content Any aAny; aAny <<= sContent.makeStringAndClear(); - rValues[nValues-1].Name = "Text"; - rValues[nValues-1].Value = aAny; + rValues[m_nValues-1].Name = "Text"; + rValues[m_nValues-1].Value = aAny; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index 6c39b33a74e8..23a79135dbde 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -111,7 +111,7 @@ void XMLIndexTabStopEntryContext::StartElement( } // how many entries? #i21237# - nValues += 2 + (bTabPositionOK ? 1 : 0) + (bLeaderCharOK ? 1 : 0); + m_nValues += 2 + (bTabPositionOK ? 1 : 0) + (bLeaderCharOK ? 1 : 0); // now try parent class (for character style) XMLIndexSimpleEntryContext::StartElement( xAttrList ); @@ -124,7 +124,7 @@ void XMLIndexTabStopEntryContext::FillPropertyValues( XMLIndexSimpleEntryContext::FillPropertyValues(rValues); // get values array and next entry to be written; - sal_Int32 nNextEntry = bCharStyleNameOK ? 2 : 1; + sal_Int32 nNextEntry = m_bCharStyleNameOK ? 2 : 1; PropertyValue* pValues = rValues.getArray(); // right aligned? |