sw: prefix members of SwXMLImport

Change-Id: I7e28a5c2a0d7d03de13b673c23f2ed5467d99389

sw/source/filter/xml/xmlimp.hxx

@@ -49,37 +49,37 @@ namespace SwImport {
 
 class SwXMLImport: public SvXMLImport
 {
-    SwNodeIndex             *pSttNdIdx;
-
-    SvXMLUnitConverter      *pTwipUnitConv;
-    SvXMLImportItemMapper   *pTableItemMapper;// paragraph item import
-    SvXMLTokenMap           *pDocElemTokenMap;
-    SvXMLTokenMap           *pTableElemTokenMap;
-    SvXMLTokenMap           *pTableCellAttrTokenMap;
-    SvXMLGraphicHelper      *pGraphicResolver;
-    SvXMLEmbeddedObjectHelper   *pEmbeddedResolver;
-
-    SvXMLItemMapEntriesRef  xTableItemMap;
-    SvXMLItemMapEntriesRef  xTableColItemMap;
-    SvXMLItemMapEntriesRef  xTableRowItemMap;
-    SvXMLItemMapEntriesRef  xTableCellItemMap;
-    tools::SvRef<SotStorage>            xPackage;
+    SwNodeIndex             *m_pSttNdIdx;
+
+    SvXMLUnitConverter      *m_pTwipUnitConv;
+    SvXMLImportItemMapper   *m_pTableItemMapper;// paragraph item import
+    SvXMLTokenMap           *m_pDocElemTokenMap;
+    SvXMLTokenMap           *m_pTableElemTokenMap;
+    SvXMLTokenMap           *m_pTableCellAttrTokenMap;
+    SvXMLGraphicHelper      *m_pGraphicResolver;
+    SvXMLEmbeddedObjectHelper   *m_pEmbeddedResolver;
+
+    SvXMLItemMapEntriesRef  m_xTableItemMap;
+    SvXMLItemMapEntriesRef  m_xTableColItemMap;
+    SvXMLItemMapEntriesRef  m_xTableRowItemMap;
+    SvXMLItemMapEntriesRef  m_xTableCellItemMap;
+    tools::SvRef<SotStorage>            m_xPackage;
     css::uno::Reference< css::container::XNameContainer >
-                            xLateInitSettings;
+                            m_xLateInitSettings;
 
-    sal_uInt16              nStyleFamilyMask;// Mask of styles to load
-    bool                bLoadDoc : 1;   // Load doc or styles only
-    bool                bInsert : 1;    // Insert mode. If styles are
+    sal_uInt16              m_nStyleFamilyMask;// Mask of styles to load
+    bool                m_bLoadDoc : 1;   // Load doc or styles only
+    bool                m_bInsert : 1;    // Insert mode. If styles are
                                             // loaded only false means that
                                             // existing styles will be
                                             // overwritten.
-    bool                bBlock : 1;     // Load text block
-    bool                bShowProgress : 1;
-    bool                bOrganizerMode : 1;
-    bool                bInititedXForms : 1;
-    bool                bPreserveRedlineMode;
+    bool                m_bBlock : 1;     // Load text block
+    bool                m_bShowProgress : 1;
+    bool                m_bOrganizerMode : 1;
+    bool                m_bInititedXForms : 1;
+    bool                m_bPreserveRedlineMode;
 
-    SwDoc*      doc; // cached for getDoc()
+    SwDoc*      m_pDoc; // cached for getDoc()
 
     void                    _InitItemImport();
     void                    _FinitItemImport();
@@ -146,11 +146,11 @@ public:
             const OUString& rLocalName,
             const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
     SvXMLImportContext *CreateBodyContentContext( const OUString& rLocalName );
-    sal_uInt16 GetStyleFamilyMask() const { return nStyleFamilyMask; }
-    bool IsInsertMode() const { return bInsert; }
-    bool IsStylesOnlyMode() const { return !bLoadDoc; }
-    bool IsBlockMode() const { return bBlock; }
-    bool IsOrganizerMode() const { return bOrganizerMode; }
+    sal_uInt16 GetStyleFamilyMask() const { return m_nStyleFamilyMask; }
+    bool IsInsertMode() const { return m_bInsert; }
+    bool IsStylesOnlyMode() const { return !m_bLoadDoc; }
+    bool IsBlockMode() const { return m_bBlock; }
+    bool IsOrganizerMode() const { return m_bOrganizerMode; }
 
     inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
     inline const SvXMLImportItemMapper& GetTableItemMapper() const;
@@ -191,17 +191,17 @@ public:
 
 inline const SvXMLUnitConverter& SwXMLImport::GetTwipUnitConverter() const
 {
-    return *pTwipUnitConv;
+    return *m_pTwipUnitConv;
 }
 
 inline const SvXMLImportItemMapper& SwXMLImport::GetTableItemMapper() const
 {
-    return *pTableItemMapper;
+    return *m_pTableItemMapper;
 }
 
 inline       SvXMLImportItemMapper& SwXMLImport::GetTableItemMapper()
 {
-    return *pTableItemMapper;
+    return *m_pTableItemMapper;
 }
 
 #endif  //  _XMLIMP_HXX

sw/source/filter/xml/xmlitemi.cxx

@@ -329,21 +329,21 @@ SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext(
 
 void SwXMLImport::_InitItemImport()
 {
-    pTwipUnitConv = new SvXMLUnitConverter( GetComponentContext(),
+    m_pTwipUnitConv = new SvXMLUnitConverter( GetComponentContext(),
             util::MeasureUnit::TWIP, util::MeasureUnit::TWIP );
 
-    xTableItemMap = new SvXMLItemMapEntries( aXMLTableItemMap );
-    xTableColItemMap = new SvXMLItemMapEntries( aXMLTableColItemMap );
-    xTableRowItemMap = new SvXMLItemMapEntries( aXMLTableRowItemMap );
-    xTableCellItemMap = new SvXMLItemMapEntries( aXMLTableCellItemMap );
+    m_xTableItemMap = new SvXMLItemMapEntries( aXMLTableItemMap );
+    m_xTableColItemMap = new SvXMLItemMapEntries( aXMLTableColItemMap );
+    m_xTableRowItemMap = new SvXMLItemMapEntries( aXMLTableRowItemMap );
+    m_xTableCellItemMap = new SvXMLItemMapEntries( aXMLTableCellItemMap );
 
-    pTableItemMapper = new SwXMLImportTableItemMapper_Impl( xTableItemMap );
+    m_pTableItemMapper = new SwXMLImportTableItemMapper_Impl( m_xTableItemMap );
 }
 
 void SwXMLImport::_FinitItemImport()
 {
-    delete pTableItemMapper;
-    delete pTwipUnitConv;
+    delete m_pTableItemMapper;
+    delete m_pTwipUnitConv;
 }
 
 SvXMLImportContext *SwXMLImport::CreateTableItemImportContext(
@@ -358,20 +358,20 @@ SvXMLImportContext *SwXMLImport::CreateTableItemImportContext(
     switch( nFamily )
     {
     case XML_STYLE_FAMILY_TABLE_TABLE:
-        xItemMap = xTableItemMap;
+        xItemMap = m_xTableItemMap;
         break;
     case XML_STYLE_FAMILY_TABLE_COLUMN:
-        xItemMap = xTableColItemMap;
+        xItemMap = m_xTableColItemMap;
         break;
     case XML_STYLE_FAMILY_TABLE_ROW:
-        xItemMap = xTableRowItemMap;
+        xItemMap = m_xTableRowItemMap;
         break;
     case XML_STYLE_FAMILY_TABLE_CELL:
-        xItemMap = xTableCellItemMap;
+        xItemMap = m_xTableCellItemMap;
         break;
     }
 
-    pTableItemMapper->setMapEntries( xItemMap );
+    m_pTableItemMapper->setMapEntries( xItemMap );
 
     return new SwXMLItemSetContext_Impl( *this, nPrefix, rLocalName,
                                             xAttrList, rItemSet,

sw/source/filter/xml/xmltbli.cxx

@@ -149,18 +149,18 @@ static SvXMLTokenMapEntry aTableCellAttrTokenMap[] =
 
 const SvXMLTokenMap& SwXMLImport::GetTableElemTokenMap()
 {
-    if( !pTableElemTokenMap )
-        pTableElemTokenMap = new SvXMLTokenMap( aTableElemTokenMap );
+    if( !m_pTableElemTokenMap )
+        m_pTableElemTokenMap = new SvXMLTokenMap( aTableElemTokenMap );
 
-    return *pTableElemTokenMap;
+    return *m_pTableElemTokenMap;
 }
 
 const SvXMLTokenMap& SwXMLImport::GetTableCellAttrTokenMap()
 {
-    if( !pTableCellAttrTokenMap )
-        pTableCellAttrTokenMap = new SvXMLTokenMap( aTableCellAttrTokenMap );
+    if( !m_pTableCellAttrTokenMap )
+        m_pTableCellAttrTokenMap = new SvXMLTokenMap( aTableCellAttrTokenMap );
 
-    return *pTableCellAttrTokenMap;
+    return *m_pTableCellAttrTokenMap;
 }
 
 class SwXMLTableCell_Impl