From 808ba5ac050fb5c9b3e1c77cb71feff1cf1a664e Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 26 Sep 2016 08:32:40 +0200 Subject: sw: prefix members of SwXMLExport Change-Id: Idd5897a9b74cd86e19cb0791b8c22ebd8528e91e Reviewed-on: https://gerrit.libreoffice.org/29290 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/source/filter/xml/xmlexp.cxx | 40 +++++++++++++++++++-------------------- sw/source/filter/xml/xmlexp.hxx | 30 ++++++++++++++--------------- sw/source/filter/xml/xmlfmte.cxx | 8 ++++---- sw/source/filter/xml/xmliteme.cxx | 16 ++++++++-------- sw/source/filter/xml/xmltble.cxx | 34 ++++++++++++++++----------------- 5 files changed, 64 insertions(+), 64 deletions(-) (limited to 'sw/source/filter') diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 11e3de0c6cfd..b87a04cfbea9 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -88,19 +88,19 @@ SwXMLExport::SwXMLExport( OUString const & implementationName, SvXMLExportFlags nExportFlags) : SvXMLExport( util::MeasureUnit::INCH, rContext, implementationName, XML_TEXT, nExportFlags ), - pTableItemMapper( nullptr ), - pTableLines( nullptr ), - bBlock( false ), - bShowProgress( true ), - bSavedShowChanges( false ), - doc( nullptr ) + m_pTableItemMapper( nullptr ), + m_pTableLines( nullptr ), + m_bBlock( false ), + m_bShowProgress( true ), + m_bSavedShowChanges( false ), + m_pDoc( nullptr ) { InitItemExport(); } void SwXMLExport::setBlockMode() { - bBlock = true; + m_bBlock = true; } @@ -145,7 +145,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) XML_NAMESPACE_OFFICE_EXT); } - GetTextParagraphExport()->SetBlockMode( bBlock ); + GetTextParagraphExport()->SetBlockMode( m_bBlock ); const SfxItemPool& rPool = pDoc->GetAttrPool(); sal_uInt16 aWhichIds[5] = { RES_UNKNOWNATR_CONTAINER, @@ -187,7 +187,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) if (GetMM100UnitConverter().GetXMLMeasureUnit() != eUnit ) { GetMM100UnitConverter().SetXMLMeasureUnit( eUnit ); - pTwipUnitConv->SetXMLMeasureUnit( eUnit ); + m_pTwipUnitConverter->SetXMLMeasureUnit( eUnit ); } if( getExportFlags() & SvXMLExportFlags::META) @@ -196,7 +196,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) // the progress works correctly. pDoc->getIDocumentStatistics().UpdateDocStat( false, true ); } - if( bShowProgress ) + if( m_bShowProgress ) { ProgressBarHelper *pProgress = GetProgressBarHelper(); if( -1 == pProgress->GetReference() ) @@ -285,7 +285,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) } } RedlineFlags nRedlineFlags = RedlineFlags::NONE; - bSavedShowChanges = IDocumentRedlineAccess::IsShowChanges( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ); + m_bSavedShowChanges = IDocumentRedlineAccess::IsShowChanges( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ); if( bSaveRedline ) { // now save and switch redline mode @@ -307,7 +307,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) if( pEmbeddedResolver ) SvXMLEmbeddedObjectHelper::Destroy( pEmbeddedResolver ); - OSL_ENSURE( !pTableLines, "there are table columns infos left" ); + OSL_ENSURE( !m_pTableLines, "there are table columns infos left" ); return nRet; } @@ -376,7 +376,7 @@ void SwXMLExport::GetViewSettings(Sequence& aProps) // "show redline mode" cannot simply be read from the document // since it gets changed during execution. If it's in the info // XPropertySet, we take it from there. - bool bShowRedlineChanges = bSavedShowChanges; + bool bShowRedlineChanges = m_bSavedShowChanges; Reference xInfoSet( getExportInfo() ); if ( xInfoSet.is() ) { @@ -491,8 +491,8 @@ void SwXMLExport::ExportContent_() Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY ); Reference < XText > xText = xTextDoc->getText(); - GetTextParagraphExport()->exportFramesBoundToPage( bShowProgress ); - GetTextParagraphExport()->exportText( xText, bShowProgress ); + GetTextParagraphExport()->exportFramesBoundToPage( m_bShowProgress ); + GetTextParagraphExport()->exportText( xText, m_bShowProgress ); } namespace @@ -519,8 +519,8 @@ sal_Int64 SAL_CALL SwXMLExport::getSomething( const Sequence< sal_Int8 >& rId ) SwDoc* SwXMLExport::getDoc() { - if( doc != nullptr ) - return doc; + if( m_pDoc != nullptr ) + return m_pDoc; Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY ); Reference < XText > xText = xTextDoc->getText(); Reference xTextTunnel( xText, UNO_QUERY); @@ -528,9 +528,9 @@ SwDoc* SwXMLExport::getDoc() SwXText *pText = reinterpret_cast< SwXText *>( sal::static_int_cast< sal_IntPtr >( xTextTunnel->getSomething( SwXText::getUnoTunnelId() ))); assert( pText != nullptr ); - doc = pText->GetDoc(); - assert( doc != nullptr ); - return doc; + m_pDoc = pText->GetDoc(); + assert( m_pDoc != nullptr ); + return m_pDoc; } const SwDoc* SwXMLExport::getDoc() const diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index b08682d961b5..1f405ce43d5d 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -47,19 +47,19 @@ typedef std::vector< SwXMLTableLines_Impl* > SwXMLTableLinesCache_Impl; class SwXMLExport : public SvXMLExport { - SvXMLUnitConverter* pTwipUnitConv; - SvXMLExportItemMapper* pTableItemMapper; - SwXMLTableLinesCache_Impl* pTableLines; + SvXMLUnitConverter* m_pTwipUnitConverter; + SvXMLExportItemMapper* m_pTableItemMapper; + SwXMLTableLinesCache_Impl* m_pTableLines; - SvXMLItemMapEntriesRef xTableItemMap; - SvXMLItemMapEntriesRef xTableRowItemMap; - SvXMLItemMapEntriesRef xTableCellItemMap; + SvXMLItemMapEntriesRef m_xTableItemMap; + SvXMLItemMapEntriesRef m_xTableRowItemMap; + SvXMLItemMapEntriesRef m_xTableCellItemMap; - bool bBlock : 1; // export text block? - bool bShowProgress : 1; - bool bSavedShowChanges : 1; + bool m_bBlock : 1; // export text block? + bool m_bShowProgress : 1; + bool m_bSavedShowChanges : 1; - SwDoc* doc; // cached for getDoc() + SwDoc* m_pDoc; // cached for getDoc() void InitItemExport(); void FinitItemExport(); @@ -122,11 +122,11 @@ public: void ExportTableAutoStyles( const SwTableNode& rTableNd ); void ExportTable( const SwTableNode& rTableNd ); - SvXMLExportItemMapper& GetTableItemMapper() { return *pTableItemMapper; } + SvXMLExportItemMapper& GetTableItemMapper() { return *m_pTableItemMapper; } - bool IsShowProgress() const { return bShowProgress; } - void SetShowProgress( bool b ) { bShowProgress = b; } - bool IsBlockMode() const { return bBlock; } + bool IsShowProgress() const { return m_bShowProgress; } + void SetShowProgress( bool b ) { m_bShowProgress = b; } + bool IsBlockMode() const { return m_bBlock; } // XUnoTunnel static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); @@ -138,7 +138,7 @@ public: inline const SvXMLUnitConverter& SwXMLExport::GetTwipUnitConverter() const { - return *pTwipUnitConv; + return *m_pTwipUnitConverter; } #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLEXP_HXX diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 7bc0c33081df..7e5327335018 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -133,16 +133,16 @@ void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFami XMLTokenEnum ePropToken = XML_TABLE_PROPERTIES; if( XML_TABLE == eFamily ) { - xItemMap = xTableItemMap; + xItemMap = m_xTableItemMap; } else if( XML_TABLE_ROW == eFamily ) { - xItemMap = xTableRowItemMap; + xItemMap = m_xTableRowItemMap; ePropToken = XML_TABLE_ROW_PROPERTIES; } else if( XML_TABLE_CELL == eFamily ) { - xItemMap = xTableCellItemMap; + xItemMap = m_xTableCellItemMap; ePropToken = XML_TABLE_CELL_PROPERTIES; } @@ -219,7 +219,7 @@ void SwXMLExport::ExportAutoStyles_() GetFormExport()->examineForms(xPage); } - GetTextParagraphExport()->collectTextAutoStylesOptimized( bShowProgress ); + GetTextParagraphExport()->collectTextAutoStylesOptimized( m_bShowProgress ); } GetTextParagraphExport()->exportTextAutoStyles(); diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 482ef650df05..fdb699b471b6 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -216,25 +216,25 @@ inline void SwXMLTableItemMapper_Impl::SetAbsWidth( sal_uInt32 nAbs ) void SwXMLExport::InitItemExport() { - pTwipUnitConv = new SvXMLUnitConverter(getComponentContext(), + m_pTwipUnitConverter = new SvXMLUnitConverter(getComponentContext(), util::MeasureUnit::TWIP, GetMM100UnitConverter().GetXMLMeasureUnit()); - xTableItemMap = new SvXMLItemMapEntries( aXMLTableItemMap ); - xTableRowItemMap = new SvXMLItemMapEntries( aXMLTableRowItemMap ); - xTableCellItemMap = new SvXMLItemMapEntries( aXMLTableCellItemMap ); + m_xTableItemMap = new SvXMLItemMapEntries( aXMLTableItemMap ); + m_xTableRowItemMap = new SvXMLItemMapEntries( aXMLTableRowItemMap ); + m_xTableCellItemMap = new SvXMLItemMapEntries( aXMLTableCellItemMap ); - pTableItemMapper = new SwXMLTableItemMapper_Impl( xTableItemMap, *this ); + m_pTableItemMapper = new SwXMLTableItemMapper_Impl( m_xTableItemMap, *this ); } void SwXMLExport::FinitItemExport() { - delete pTableItemMapper; - delete pTwipUnitConv; + delete m_pTableItemMapper; + delete m_pTwipUnitConverter; } void SwXMLExport::ExportTableFormat( const SwFrameFormat& rFormat, sal_uInt32 nAbsWidth ) { - static_cast(pTableItemMapper) + static_cast(m_pTableItemMapper) ->SetAbsWidth( nAbsWidth ); ExportFormat( rFormat, XML_TABLE ); } diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index b238ed603f47..fcea0f4dd1a3 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -573,10 +573,10 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines, { // pass 1: calculate columns SwXMLTableLines_Impl *pLines = new SwXMLTableLines_Impl( rLines ); - if( !pTableLines ) - pTableLines = new SwXMLTableLinesCache_Impl(); + if( !m_pTableLines ) + m_pTableLines = new SwXMLTableLinesCache_Impl(); - pTableLines->push_back( pLines ); + m_pTableLines->push_back( pLines ); // pass 2: export column styles { @@ -972,18 +972,18 @@ void SwXMLExport::ExportTableLines( const SwTableLines& rLines, SwXMLTableInfo_Impl& rTableInfo, sal_uInt32 nHeaderRows ) { - OSL_ENSURE( pTableLines && !pTableLines->empty(), + OSL_ENSURE( m_pTableLines && !m_pTableLines->empty(), "SwXMLExport::ExportTableLines: table columns infos missing" ); - if( !pTableLines || pTableLines->empty() ) + if( !m_pTableLines || m_pTableLines->empty() ) return; SwXMLTableLines_Impl* pLines = nullptr; size_t nInfoPos; - for( nInfoPos=0; nInfoPos < pTableLines->size(); nInfoPos++ ) + for( nInfoPos=0; nInfoPos < m_pTableLines->size(); nInfoPos++ ) { - if( pTableLines->at( nInfoPos )->GetLines() == &rLines ) + if( m_pTableLines->at( nInfoPos )->GetLines() == &rLines ) { - pLines = pTableLines->at( nInfoPos ); + pLines = m_pTableLines->at( nInfoPos ); break; } } @@ -994,14 +994,14 @@ void SwXMLExport::ExportTableLines( const SwTableLines& rLines, if( !pLines ) return; - SwXMLTableLinesCache_Impl::iterator it = pTableLines->begin(); + SwXMLTableLinesCache_Impl::iterator it = m_pTableLines->begin(); advance( it, nInfoPos ); - pTableLines->erase( it ); + m_pTableLines->erase( it ); - if( pTableLines->empty() ) + if( m_pTableLines->empty() ) { - delete pTableLines ; - pTableLines = nullptr; + delete m_pTableLines ; + m_pTableLines = nullptr; } // pass 2: export columns @@ -1200,12 +1200,12 @@ void SwXMLTextParagraphExport::exportTable( void SwXMLExport::DeleteTableLines() { - if ( pTableLines ) + if ( m_pTableLines ) { - for (SwXMLTableLines_Impl* p : *pTableLines) + for (SwXMLTableLines_Impl* p : *m_pTableLines) delete p; - pTableLines->clear(); - delete pTableLines; + m_pTableLines->clear(); + delete m_pTableLines; } } -- cgit v1.2.3