[Libreoffice-commits] core.git: xmloff/source

Julien Nabet serval2412 at yahoo.fr
Wed Mar 1 22:30:48 UTC 2017


 xmloff/source/transform/TransformerBase.cxx |    8 ++++----
 xmloff/source/transform/TransformerBase.hxx |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 472f92421b1b15dc765714a7c657704812859868
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Mar 1 22:58:54 2017 +0100

    xmloff: prefix member nElement of XMLTransformerBase
    
    Change-Id: I83f62ccad47bc10c2a506a6b79a24e3367df5335
    Reviewed-on: https://gerrit.libreoffice.org/34769
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 558214c..351b39e 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -179,7 +179,7 @@ XMLTransformerBase::XMLTransformerBase( XMLTransformerActionInit *pInit,
     m_pReplaceNamespaceMap( new SvXMLNamespaceMap ),
     m_pElemActions( new XMLTransformerActions( pInit ) ),
     m_pTokenMap( new XMLTransformerTokenMap( pTKMapInit ) ),
-    nElement(0),
+    m_nElement(0),
     m_xFastAttributes( new sax_fastparser::FastAttributeList( m_xTokenHandler.get(),
         dynamic_cast< sax_fastparser::FastTokenHandlerBase *>( m_xTokenHandler.get() ) ) )
 {
@@ -1449,7 +1449,7 @@ void XMLTransformerBase::startFastElement( const OUString& rName,
     {
         OUString aLocalName;
         sal_uInt16 nPrefix = m_pNamespaceMap->GetKeyByAttrName( rName, &aLocalName );
-        nElement = NAMESPACE_TOKEN( nPrefix ) | m_xTokenHandler->getTokenDirect(
+        m_nElement = NAMESPACE_TOKEN( nPrefix ) | m_xTokenHandler->getTokenDirect(
                         OUStringToOString( aLocalName, RTL_TEXTENCODING_ASCII_US ).getStr(), aLocalName.getLength() ) ;
         m_xFastAttributes->clear();
 
@@ -1472,7 +1472,7 @@ void XMLTransformerBase::startFastElement( const OUString& rName,
                 m_xFastAttributes->add( nAttr, OUStringToOString( rAttrValue, RTL_TEXTENCODING_ASCII_US ).getStr() );
             }
         }
-        m_xFastHandler->startFastElement( nElement, m_xFastAttributes.get() );
+        m_xFastHandler->startFastElement( m_nElement, m_xFastAttributes.get() );
     }
     else
         m_xHandler->startElement( rName, xAttrList );
@@ -1481,7 +1481,7 @@ void XMLTransformerBase::startFastElement( const OUString& rName,
 void XMLTransformerBase::endFastElement( const OUString& rName )
 {
     if( m_xFastHandler.is() )
-       m_xFastHandler->endFastElement( nElement );
+       m_xFastHandler->endFastElement( m_nElement );
     else
         m_xHandler->endElement( rName );
 }
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index 323ddc5..ad0257f 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -76,7 +76,7 @@ class XMLTransformerBase : public XMLTransformer
     XMLTransformerTokenMap      *m_pTokenMap;
 
     //for feeding FastDocumentHandler
-    sal_Int32 nElement;
+    sal_Int32 m_nElement;
     rtl::Reference< sax_fastparser::FastAttributeList > m_xFastAttributes;
 
 protected:


More information about the Libreoffice-commits mailing list