From 9996b7aba68b2e8a84701d7643c4376ed6c34554 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 3 Apr 2023 08:10:49 +0200 Subject: xmloff: prefix members of XMLTextParagraphExport See tdf#94879 for motivation. Change-Id: I894665f1af47cf1e5f0f191bfdf3100e426fa6d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149946 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- xmloff/source/text/txtftne.cxx | 2 +- xmloff/source/text/txtparae.cxx | 182 ++++++++++++++++++++-------------------- xmloff/source/text/txtsecte.cxx | 22 ++--- xmloff/source/text/txtstyle.cxx | 10 +-- 4 files changed, 108 insertions(+), 108 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx index 333ec7c6f783..9673b15745c9 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -97,7 +97,7 @@ void XMLTextParagraphExport::exportTextFootnote( { XMLTextCharStyleNamesElementExport aCharStylesExport( GetExport(), bIsUICharStyle && - aCharStyleNamesPropInfoCache.hasProperty( + m_aCharStyleNamesPropInfoCache.hasProperty( rPropSet ), bHasAutoStyle, rPropSet, gsCharStyleNames ); if( !sStyle.isEmpty() ) diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index a06e027c7190..f9f070a1d9b2 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -1352,85 +1352,85 @@ XMLTextParagraphExport::XMLTextParagraphExport( ) : XMLStyleExport( rExp, &rASP ), m_xImpl(new Impl), - rAutoStylePool( rASP ), - pBoundFrameSets(new BoundFrameSets(GetExport().GetModel())), + m_rAutoStylePool( rASP ), + m_pBoundFrameSets(new BoundFrameSets(GetExport().GetModel())), maListAutoPool( GetExport() ), - bProgress( false ), - bBlock( false ), - bOpenRuby( false ), + m_bProgress( false ), + m_bBlock( false ), + m_bOpenRuby( false ), mpTextListsHelper( nullptr ), mbCollected(false), - aCharStyleNamesPropInfoCache( gsCharStyleNames ) + m_aCharStyleNamesPropInfoCache( gsCharStyleNames ) { rtl::Reference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TextPropMap::PARA, true )); - xParaPropMapper = new XMLTextExportPropertySetMapper( xPropMapper, + m_xParaPropMapper = new XMLTextExportPropertySetMapper( xPropMapper, GetExport() ); OUString sFamily( GetXMLToken(XML_PARAGRAPH) ); OUString aPrefix(u'P'); - rAutoStylePool.AddFamily( XmlStyleFamily::TEXT_PARAGRAPH, sFamily, - xParaPropMapper, aPrefix ); + m_rAutoStylePool.AddFamily( XmlStyleFamily::TEXT_PARAGRAPH, sFamily, + m_xParaPropMapper, aPrefix ); xPropMapper = new XMLTextPropertySetMapper( TextPropMap::TEXT, true ); - xTextPropMapper = new XMLTextExportPropertySetMapper( xPropMapper, + m_xTextPropMapper = new XMLTextExportPropertySetMapper( xPropMapper, GetExport() ); sFamily = GetXMLToken(XML_TEXT); aPrefix = "T"; - rAutoStylePool.AddFamily( XmlStyleFamily::TEXT_TEXT, sFamily, - xTextPropMapper, aPrefix ); + m_rAutoStylePool.AddFamily( XmlStyleFamily::TEXT_TEXT, sFamily, + m_xTextPropMapper, aPrefix ); xPropMapper = new XMLTextPropertySetMapper( TextPropMap::AUTO_FRAME, true ); - xAutoFramePropMapper = new XMLTextExportPropertySetMapper( xPropMapper, + m_xAutoFramePropMapper = new XMLTextExportPropertySetMapper( xPropMapper, GetExport() ); sFamily = XML_STYLE_FAMILY_SD_GRAPHICS_NAME; aPrefix = "fr"; - rAutoStylePool.AddFamily( XmlStyleFamily::TEXT_FRAME, sFamily, - xAutoFramePropMapper, aPrefix ); + m_rAutoStylePool.AddFamily( XmlStyleFamily::TEXT_FRAME, sFamily, + m_xAutoFramePropMapper, aPrefix ); xPropMapper = new XMLTextPropertySetMapper( TextPropMap::SECTION, true ); - xSectionPropMapper = new XMLTextExportPropertySetMapper( xPropMapper, + m_xSectionPropMapper = new XMLTextExportPropertySetMapper( xPropMapper, GetExport() ); sFamily = GetXMLToken( XML_SECTION ); aPrefix = "Sect" ; - rAutoStylePool.AddFamily( XmlStyleFamily::TEXT_SECTION, sFamily, - xSectionPropMapper, aPrefix ); + m_rAutoStylePool.AddFamily( XmlStyleFamily::TEXT_SECTION, sFamily, + m_xSectionPropMapper, aPrefix ); xPropMapper = new XMLTextPropertySetMapper( TextPropMap::RUBY, true ); - xRubyPropMapper = new SvXMLExportPropertyMapper( xPropMapper ); + m_xRubyPropMapper = new SvXMLExportPropertyMapper( xPropMapper ); sFamily = GetXMLToken( XML_RUBY ); aPrefix = "Ru"; - rAutoStylePool.AddFamily( XmlStyleFamily::TEXT_RUBY, sFamily, - xRubyPropMapper, aPrefix ); + m_rAutoStylePool.AddFamily( XmlStyleFamily::TEXT_RUBY, sFamily, + m_xRubyPropMapper, aPrefix ); xPropMapper = new XMLTextPropertySetMapper( TextPropMap::FRAME, true ); - xFramePropMapper = new XMLTextExportPropertySetMapper( xPropMapper, + m_xFramePropMapper = new XMLTextExportPropertySetMapper( xPropMapper, GetExport() ); - pSectionExport.reset( new XMLSectionExport( rExp, *this ) ); - pIndexMarkExport.reset( new XMLIndexMarkExport( rExp ) ); + m_pSectionExport.reset( new XMLSectionExport( rExp, *this ) ); + m_pIndexMarkExport.reset( new XMLIndexMarkExport( rExp ) ); if( ! IsBlockMode() && Reference( GetExport().GetModel(), UNO_QUERY ).is()) - pRedlineExport.reset( new XMLRedlineExport( rExp ) ); + m_pRedlineExport.reset( new XMLRedlineExport( rExp ) ); // The text field helper needs a pre-constructed XMLPropertyState // to export the combined characters field. We construct that // here, because we need the text property mapper to do it. // construct Any value, then find index - sal_Int32 nIndex = xTextPropMapper->getPropertySetMapper()->FindEntryIndex( + sal_Int32 nIndex = m_xTextPropMapper->getPropertySetMapper()->FindEntryIndex( "", XML_NAMESPACE_STYLE, GetXMLToken(XML_TEXT_COMBINE)); - pFieldExport.reset( new XMLTextFieldExport( rExp, std::make_unique( nIndex, uno::Any(true) ) ) ); + m_pFieldExport.reset( new XMLTextFieldExport( rExp, std::make_unique( nIndex, uno::Any(true) ) ) ); PushNewTextListsHelper(); } XMLTextParagraphExport::~XMLTextParagraphExport() { - pRedlineExport.reset(); - pIndexMarkExport.reset(); - pSectionExport.reset(); - pFieldExport.reset(); + m_pRedlineExport.reset(); + m_pIndexMarkExport.reset(); + m_pSectionExport.reset(); + m_pFieldExport.reset(); #ifdef DBG_UTIL txtparae_bContainsIllegalCharacters = false; #endif @@ -1473,10 +1473,10 @@ SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateParaDefaultExtPropMappe void XMLTextParagraphExport::exportPageFrames( bool bIsProgress ) { - const TextContentSet& rTexts = pBoundFrameSets->GetTexts()->GetPageBoundContents(); - const TextContentSet& rGraphics = pBoundFrameSets->GetGraphics()->GetPageBoundContents(); - const TextContentSet& rEmbeddeds = pBoundFrameSets->GetEmbeddeds()->GetPageBoundContents(); - const TextContentSet& rShapes = pBoundFrameSets->GetShapes()->GetPageBoundContents(); + const TextContentSet& rTexts = m_pBoundFrameSets->GetTexts()->GetPageBoundContents(); + const TextContentSet& rGraphics = m_pBoundFrameSets->GetGraphics()->GetPageBoundContents(); + const TextContentSet& rEmbeddeds = m_pBoundFrameSets->GetEmbeddeds()->GetPageBoundContents(); + const TextContentSet& rShapes = m_pBoundFrameSets->GetShapes()->GetPageBoundContents(); for(TextContentSet::const_iterator_t it = rTexts.getBegin(); it != rTexts.getEnd(); ++it) @@ -1500,25 +1500,25 @@ void XMLTextParagraphExport::exportFrameFrames( bool bIsProgress, const Reference < XTextFrame > *pParentTxtFrame ) { - const TextContentSet* const pTexts = pBoundFrameSets->GetTexts()->GetFrameBoundContents(*pParentTxtFrame); + const TextContentSet* const pTexts = m_pBoundFrameSets->GetTexts()->GetFrameBoundContents(*pParentTxtFrame); if(pTexts) for(TextContentSet::const_iterator_t it = pTexts->getBegin(); it != pTexts->getEnd(); ++it) exportTextFrame(*it, bAutoStyles, bIsProgress, true); - const TextContentSet* const pGraphics = pBoundFrameSets->GetGraphics()->GetFrameBoundContents(*pParentTxtFrame); + const TextContentSet* const pGraphics = m_pBoundFrameSets->GetGraphics()->GetFrameBoundContents(*pParentTxtFrame); if(pGraphics) for(TextContentSet::const_iterator_t it = pGraphics->getBegin(); it != pGraphics->getEnd(); ++it) exportTextGraphic(*it, bAutoStyles); - const TextContentSet* const pEmbeddeds = pBoundFrameSets->GetEmbeddeds()->GetFrameBoundContents(*pParentTxtFrame); + const TextContentSet* const pEmbeddeds = m_pBoundFrameSets->GetEmbeddeds()->GetFrameBoundContents(*pParentTxtFrame); if(pEmbeddeds) for(TextContentSet::const_iterator_t it = pEmbeddeds->getBegin(); it != pEmbeddeds->getEnd(); ++it) exportTextEmbedded(*it, bAutoStyles); - const TextContentSet* const pShapes = pBoundFrameSets->GetShapes()->GetFrameBoundContents(*pParentTxtFrame); + const TextContentSet* const pShapes = m_pBoundFrameSets->GetShapes()->GetFrameBoundContents(*pParentTxtFrame); if(pShapes) for(TextContentSet::const_iterator_t it = pShapes->getBegin(); it != pShapes->getEnd(); @@ -1603,7 +1603,7 @@ void XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress ) } // Export text frames: - Reference xTextFramesEnum = pBoundFrameSets->GetTexts()->createEnumeration(); + Reference xTextFramesEnum = m_pBoundFrameSets->GetTexts()->createEnumeration(); if(xTextFramesEnum.is()) while(xTextFramesEnum->hasMoreElements()) { @@ -1613,7 +1613,7 @@ void XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress ) } // Export graphic objects: - Reference xGraphicsEnum = pBoundFrameSets->GetGraphics()->createEnumeration(); + Reference xGraphicsEnum = m_pBoundFrameSets->GetGraphics()->createEnumeration(); if(xGraphicsEnum.is()) while(xGraphicsEnum->hasMoreElements()) { @@ -1623,7 +1623,7 @@ void XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress ) } // Export embedded objects: - Reference xEmbeddedsEnum = pBoundFrameSets->GetEmbeddeds()->createEnumeration(); + Reference xEmbeddedsEnum = m_pBoundFrameSets->GetEmbeddeds()->createEnumeration(); if(xEmbeddedsEnum.is()) while(xEmbeddedsEnum->hasMoreElements()) { @@ -1633,7 +1633,7 @@ void XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress ) } // Export shapes: - Reference xShapesEnum = pBoundFrameSets->GetShapes()->createEnumeration(); + Reference xShapesEnum = m_pBoundFrameSets->GetShapes()->createEnumeration(); if(xShapesEnum.is()) while(xShapesEnum->hasMoreElements()) { @@ -1767,12 +1767,12 @@ void XMLTextParagraphExport::exportText( // #96530# Export redlines at start & end of XText before & after // exporting the text content enumeration - if( !bAutoStyles && (pRedlineExport != nullptr) ) - pRedlineExport->ExportStartOrEndRedline( xPropertySet, true ); + if( !bAutoStyles && (m_pRedlineExport != nullptr) ) + m_pRedlineExport->ExportStartOrEndRedline( xPropertySet, true ); exportTextContentEnumeration( xParaEnum, bAutoStyles, xBaseSection, bIsProgress, bExportParagraph, nullptr, eExtensionNS ); - if( !bAutoStyles && (pRedlineExport != nullptr) ) - pRedlineExport->ExportStartOrEndRedline( xPropertySet, false ); + if( !bAutoStyles && (m_pRedlineExport != nullptr) ) + m_pRedlineExport->ExportStartOrEndRedline( xPropertySet, false ); } void XMLTextParagraphExport::exportText( @@ -1795,15 +1795,15 @@ void XMLTextParagraphExport::exportText( // #96530# Export redlines at start & end of XText before & after // exporting the text content enumeration Reference xPropertySet; - if( !bAutoStyles && (pRedlineExport != nullptr) ) + if( !bAutoStyles && (m_pRedlineExport != nullptr) ) { xPropertySet.set(rText, uno::UNO_QUERY ); - pRedlineExport->ExportStartOrEndRedline( xPropertySet, true ); + m_pRedlineExport->ExportStartOrEndRedline( xPropertySet, true ); } exportTextContentEnumeration( xParaEnum, bAutoStyles, rBaseSection, bIsProgress, bExportParagraph ); - if( !bAutoStyles && (pRedlineExport != nullptr) ) - pRedlineExport->ExportStartOrEndRedline( xPropertySet, false ); + if( !bAutoStyles && (m_pRedlineExport != nullptr) ) + m_pRedlineExport->ExportStartOrEndRedline( xPropertySet, false ); } void XMLTextParagraphExport::exportTextContentEnumeration( @@ -1873,11 +1873,11 @@ void XMLTextParagraphExport::exportTextContentEnumeration( } // if we found a mute section: skip all section content - if (pSectionExport->IsMuteSection(xCurrentTextSection)) + if (m_pSectionExport->IsMuteSection(xCurrentTextSection)) { // Make sure headings are exported anyway. if( !bAutoStyles ) - pSectionExport->ExportMasterDocHeadingDummies(); + m_pSectionExport->ExportMasterDocHeadingDummies(); while (rContEnum->hasMoreElements() && XMLSectionExport::IsInSection( xCurrentTextSection, @@ -1908,21 +1908,21 @@ void XMLTextParagraphExport::exportTextContentEnumeration( aPrevNumInfo, aNextNumInfo, bAutoStyles ); - if (! pSectionExport->IsMuteSection(xCurrentTextSection)) + if (! m_pSectionExport->IsMuteSection(xCurrentTextSection)) { // export start + end redlines (for wholly redlined tables) - if ((! bAutoStyles) && (nullptr != pRedlineExport)) - pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, true); + if ((! bAutoStyles) && (nullptr != m_pRedlineExport)) + m_pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, true); exportTable( xTxtCntnt, bAutoStyles, bIsProgress ); - if ((! bAutoStyles) && (nullptr != pRedlineExport)) - pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, false); + if ((! bAutoStyles) && (nullptr != m_pRedlineExport)) + m_pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, false); } else if( !bAutoStyles ) { // Make sure headings are exported anyway. - pSectionExport->ExportMasterDocHeadingDummies(); + m_pSectionExport->ExportMasterDocHeadingDummies(); } bHasContent = true; @@ -2355,12 +2355,12 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( } else if (sType == gsDocumentIndexMark) { - pIndexMarkExport->ExportIndexMark(xPropSet, bAutoStyles); + m_pIndexMarkExport->ExportIndexMark(xPropSet, bAutoStyles); } else if (sType == gsRedline) { - if (nullptr != pRedlineExport) - pRedlineExport->ExportChange(xPropSet, bAutoStyles); + if (nullptr != m_pRedlineExport) + m_pRedlineExport->ExportChange(xPropSet, bAutoStyles); } else if (sType == gsRuby) { @@ -2596,13 +2596,13 @@ void XMLTextParagraphExport::exportTextField( { if ( bAutoStyles ) { - pFieldExport->ExportFieldAutoStyle( xTextField, bIsProgress, + m_pFieldExport->ExportFieldAutoStyle( xTextField, bIsProgress, bRecursive ); } else { assert(pPrevCharIsSpace); - pFieldExport->ExportField(xTextField, bIsProgress, *pPrevCharIsSpace); + m_pFieldExport->ExportField(xTextField, bIsProgress, *pPrevCharIsSpace); } } @@ -3090,7 +3090,7 @@ void XMLTextParagraphExport::exportAnyTextFrame( bIsUICharStyle = false; bool bDoSomething = bIsUICharStyle - && aCharStyleNamesPropInfoCache.hasProperty( *pRangePropSet ); + && m_aCharStyleNamesPropInfoCache.hasProperty( *pRangePropSet ); XMLTextCharStyleNamesElementExport aCharStylesExport( GetExport(), bDoSomething, bHasAutoStyle, bDoSomething ? *pRangePropSet : Reference(), @@ -3556,7 +3556,7 @@ void XMLTextParagraphExport::exportTextRangeSpan( { XMLTextCharStyleNamesElementExport aCharStylesExport( GetExport(), - bIsUICharStyle && aCharStyleNamesPropInfoCache.hasProperty( xPropSet, xPropSetInfo ), + bIsUICharStyle && m_aCharStyleNamesPropInfoCache.hasProperty( xPropSet, xPropSetInfo ), bHasAutoStyle, xPropSet, gsCharStyleNames ); @@ -3735,7 +3735,7 @@ void XMLTextParagraphExport::exportCharacterData(const OUString& rText, void XMLTextParagraphExport::exportTextDeclarations() { - pFieldExport->ExportFieldDeclarations(); + m_pFieldExport->ExportFieldDeclarations(); // get XPropertySet from the document and ask for AutoMarkFileURL. // If it exists, export the auto-mark-file element. @@ -3765,39 +3765,39 @@ void XMLTextParagraphExport::exportTextDeclarations() void XMLTextParagraphExport::exportTextDeclarations( const Reference & rText ) { - pFieldExport->ExportFieldDeclarations(rText); + m_pFieldExport->ExportFieldDeclarations(rText); } void XMLTextParagraphExport::exportUsedDeclarations() { - pFieldExport->SetExportOnlyUsedFieldDeclarations( false/*bOnlyUsed*/ ); + m_pFieldExport->SetExportOnlyUsedFieldDeclarations( false/*bOnlyUsed*/ ); } void XMLTextParagraphExport::exportTrackedChanges(bool bAutoStyles) { - if (nullptr != pRedlineExport) - pRedlineExport->ExportChangesList( bAutoStyles ); + if (nullptr != m_pRedlineExport) + m_pRedlineExport->ExportChangesList( bAutoStyles ); } void XMLTextParagraphExport::exportTrackedChanges( const Reference & rText, bool bAutoStyle) { - if (nullptr != pRedlineExport) - pRedlineExport->ExportChangesList(rText, bAutoStyle); + if (nullptr != m_pRedlineExport) + m_pRedlineExport->ExportChangesList(rText, bAutoStyle); } void XMLTextParagraphExport::recordTrackedChangesForXText( const Reference & rText ) { - if (nullptr != pRedlineExport) - pRedlineExport->SetCurrentXText(rText); + if (nullptr != m_pRedlineExport) + m_pRedlineExport->SetCurrentXText(rText); } void XMLTextParagraphExport::recordTrackedChangesNoXText() { - if (nullptr != pRedlineExport) - pRedlineExport->SetCurrentXText(); + if (nullptr != m_pRedlineExport) + m_pRedlineExport->SetCurrentXText(); } void XMLTextParagraphExport::exportTableAutoStyles() {} @@ -3845,13 +3845,13 @@ void XMLTextParagraphExport::exportRuby( // ruby start // we can only start a ruby if none is open - assert(!bOpenRuby && "Can't open a ruby inside of ruby!"); - if( bOpenRuby ) + assert(!m_bOpenRuby && "Can't open a ruby inside of ruby!"); + if( m_bOpenRuby ) return; // save ruby text + ruby char style - rPropSet->getPropertyValue(gsRubyText) >>= sOpenRubyText; - rPropSet->getPropertyValue(gsRubyCharStyleName) >>= sOpenRubyCharStyle; + rPropSet->getPropertyValue(gsRubyText) >>= m_sOpenRubyText; + rPropSet->getPropertyValue(gsRubyCharStyleName) >>= m_sOpenRubyCharStyle; // ruby style GetExport().CheckAttrList(); @@ -3865,15 +3865,15 @@ void XMLTextParagraphExport::exportRuby( GetExport().ClearAttrList(); GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY_BASE, false ); - bOpenRuby = true; + m_bOpenRuby = true; } else { // ruby end // check for an open ruby - assert(bOpenRuby && "Can't close a ruby if none is open!"); - if( !bOpenRuby ) + assert(m_bOpenRuby && "Can't close a ruby if none is open!"); + if( !m_bOpenRuby ) return; // close @@ -3882,21 +3882,21 @@ void XMLTextParagraphExport::exportRuby( // write the ruby text (with char style) { - if (!sOpenRubyCharStyle.isEmpty()) + if (!m_sOpenRubyCharStyle.isEmpty()) GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME, - GetExport().EncodeStyleName( sOpenRubyCharStyle) ); + GetExport().EncodeStyleName( m_sOpenRubyCharStyle) ); SvXMLElementExport aRubyElement( GetExport(), XML_NAMESPACE_TEXT, XML_RUBY_TEXT, false, false); - GetExport().Characters(sOpenRubyText); + GetExport().Characters(m_sOpenRubyText); } // and finally, close the ruby GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY, false); - bOpenRuby = false; + m_bOpenRuby = false; } } } @@ -4143,9 +4143,9 @@ void XMLTextParagraphExport::PreventExportOfControlsInMuteSections( // if we don't have shapes or a form export, there's nothing to do return; } - SAL_WARN_IF( pSectionExport == nullptr, "xmloff", "We need the section export." ); + SAL_WARN_IF( m_pSectionExport == nullptr, "xmloff", "We need the section export." ); - Reference xShapesEnum = pBoundFrameSets->GetShapes()->createEnumeration(); + Reference xShapesEnum = m_pBoundFrameSets->GetShapes()->createEnumeration(); if(!xShapesEnum.is()) return; while( xShapesEnum->hasMoreElements() ) @@ -4166,7 +4166,7 @@ void XMLTextParagraphExport::PreventExportOfControlsInMuteSections( Reference xTextContent( xControlShape, UNO_QUERY ); if( xTextContent.is() ) { - if( pSectionExport->IsMuteSection( xTextContent, false ) ) + if( m_pSectionExport->IsMuteSection( xTextContent, false ) ) { // Ah, we've found a shape that // 1) is a control shape diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx index 13dad5332807..14589b961d81 100644 --- a/xmloff/source/text/txtsecte.cxx +++ b/xmloff/source/text/txtsecte.cxx @@ -113,7 +113,7 @@ void XMLTextParagraphExport::exportListAndSectionChange( { // if we have a mute section, ignore all its children // (all previous ones) - if (pSectionExport->IsMuteSection(aCurrent)) + if (m_pSectionExport->IsMuteSection(aCurrent)) aOldStack.clear(); aOldStack.push_back(aCurrent); @@ -127,7 +127,7 @@ void XMLTextParagraphExport::exportListAndSectionChange( { // if we have a mute section, ignore all its children // (all previous ones) - if (pSectionExport->IsMuteSection(aCurrent)) + if (m_pSectionExport->IsMuteSection(aCurrent)) { aNewStack.clear(); bMute = true; @@ -160,18 +160,18 @@ void XMLTextParagraphExport::exportListAndSectionChange( while ((aOldForward != aOldStack.end()) && (*aOldForward != *aOld)) { - if ( !bAutoStyles && (nullptr != pRedlineExport) ) - pRedlineExport->ExportStartOrEndRedline(*aOldForward, + if ( !bAutoStyles && (nullptr != m_pRedlineExport) ) + m_pRedlineExport->ExportStartOrEndRedline(*aOldForward, false); - pSectionExport->ExportSectionEnd(*aOldForward, bAutoStyles); + m_pSectionExport->ExportSectionEnd(*aOldForward, bAutoStyles); ++aOldForward; } if (aOldForward != aOldStack.end()) { - if ( !bAutoStyles && (nullptr != pRedlineExport) ) - pRedlineExport->ExportStartOrEndRedline(*aOldForward, + if ( !bAutoStyles && (nullptr != m_pRedlineExport) ) + m_pRedlineExport->ExportStartOrEndRedline(*aOldForward, false); - pSectionExport->ExportSectionEnd(*aOldForward, bAutoStyles); + m_pSectionExport->ExportSectionEnd(*aOldForward, bAutoStyles); } } @@ -179,9 +179,9 @@ void XMLTextParagraphExport::exportListAndSectionChange( // (order: oldest to newest) while (aNew != aNewStack.rend()) { - if ( !bAutoStyles && (nullptr != pRedlineExport) ) - pRedlineExport->ExportStartOrEndRedline(*aNew, true); - pSectionExport->ExportSectionStart(*aNew, bAutoStyles); + if ( !bAutoStyles && (nullptr != m_pRedlineExport) ) + m_pRedlineExport->ExportStartOrEndRedline(*aNew, true); + m_pSectionExport->ExportSectionStart(*aNew, bAutoStyles); ++aNew; } diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index 4cc211dcff0b..0c7a1c3cd32b 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -98,7 +98,7 @@ void XMLTextParagraphExport::exportStyleAttributes( GetExport().EncodeStyleName( sName ) ); } } - if( bProgress ) + if( m_bProgress ) { ProgressBarHelper *pProgress = GetExport().GetProgressBarHelper(); pProgress->SetValue( pProgress->GetValue()+2 ); @@ -113,8 +113,8 @@ void XMLTextParagraphExport::exportNumStyles( bool bUsed ) void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg ) { - bool bOldProg = bProgress; - bProgress = bProg; + bool bOldProg = m_bProgress; + m_bProgress = bProg; Reference < lang::XMultiServiceFactory > xFactory (GetExport().GetModel(), UNO_QUERY); if (xFactory.is()) @@ -147,7 +147,7 @@ void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg ) bUsed, XmlStyleFamily::TEXT_TEXT ); // get shape export to make sure the frame family is added correctly. GetExport().GetShapeExport(); - exportStyleFamily( "FrameStyles", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xFramePropMapper, + exportStyleFamily( "FrameStyles", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), m_xFramePropMapper, bUsed, XmlStyleFamily::TEXT_FRAME); exportNumStyles( bUsed ); if( !IsBlockMode() ) @@ -158,7 +158,7 @@ void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg ) aLineNumberingExport.Export(); } - bProgress = bOldProg; + m_bProgress = bOldProg; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit