diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2020-08-27 17:01:30 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2020-08-27 19:00:32 +0200 |
commit | f1e789442d59330349067a4c59aee75cb267a86f (patch) | |
tree | d2011bc6849fabbec894d38a65f83081c8d20bda /xmloff | |
parent | e7f81a8bcb481df4daa17ae9ef7210c68af5f337 (diff) |
xmloff: prefix members of XMLTextFieldImportContext
Change-Id: I8a67d0c1c24e6c82803198fe343d4ee1c095b9b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101484
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/txtfldi.hxx | 24 | ||||
-rw-r--r-- | xmloff/source/text/txtfldi.cxx | 80 | ||||
-rw-r--r-- | xmloff/source/text/txtvfldi.cxx | 2 |
3 files changed, 53 insertions, 53 deletions
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index bea6df8bb853..2e8f9562c40a 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -385,22 +385,22 @@ public: /** superclass for database fields: handle database and table names */ class XMLDatabaseFieldImportContext : public XMLTextFieldImportContext { - OUString sDatabaseName; - OUString sDatabaseURL; - OUString sTableName; + OUString m_sDatabaseName; + OUString m_sDatabaseURL; + OUString m_sTableName; - sal_Int32 nCommandType; - bool bCommandTypeOK; + sal_Int32 m_nCommandType; + bool m_bCommandTypeOK; - bool bDisplay; - bool bDisplayOK; - bool bUseDisplay; + bool m_bDisplay; + bool m_bDisplayOK; + bool m_bUseDisplay; protected: - bool bDatabaseOK; - bool bDatabaseNameOK; - bool bDatabaseURLOK; - bool bTableOK; + bool m_bDatabaseOK; + bool m_bDatabaseNameOK; + bool m_bDatabaseURLOK; + bool m_bTableOK; /// protected constructor: only for subclasses XMLDatabaseFieldImportContext(SvXMLImport& rImport, diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 6133045d909e..917c061eb626 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -1147,15 +1147,15 @@ XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext( const char* pServiceName, sal_uInt16 nPrfx, const OUString& sLocalName, bool bUseDisply) : XMLTextFieldImportContext(rImport, rHlp, pServiceName, nPrfx, sLocalName) -, nCommandType( sdb::CommandType::TABLE ) -, bCommandTypeOK(false) -, bDisplay( true ) -, bDisplayOK( false ) -, bUseDisplay( bUseDisply ) -, bDatabaseOK(false) -, bDatabaseNameOK(false) -, bDatabaseURLOK(false) -, bTableOK(false) +, m_nCommandType( sdb::CommandType::TABLE ) +, m_bCommandTypeOK(false) +, m_bDisplay( true ) +, m_bDisplayOK( false ) +, m_bUseDisplay( bUseDisply ) +, m_bDatabaseOK(false) +, m_bDatabaseNameOK(false) +, m_bDatabaseURLOK(false) +, m_bTableOK(false) { } @@ -1165,41 +1165,41 @@ void XMLDatabaseFieldImportContext::ProcessAttribute( switch (nAttrToken) { case XML_TOK_TEXTFIELD_DATABASE_NAME: - sDatabaseName = sAttrValue; - bDatabaseOK = true; - bDatabaseNameOK = true; + m_sDatabaseName = sAttrValue; + m_bDatabaseOK = true; + m_bDatabaseNameOK = true; break; case XML_TOK_TEXTFIELD_TABLE_NAME: - sTableName = sAttrValue; - bTableOK = true; + m_sTableName = sAttrValue; + m_bTableOK = true; break; case XML_TOK_TEXTFIELD_TABLE_TYPE: if( IsXMLToken( sAttrValue, XML_TABLE ) ) { - nCommandType = sdb::CommandType::TABLE; - bCommandTypeOK = true; + m_nCommandType = sdb::CommandType::TABLE; + m_bCommandTypeOK = true; } else if( IsXMLToken( sAttrValue, XML_QUERY ) ) { - nCommandType = sdb::CommandType::QUERY; - bCommandTypeOK = true; + m_nCommandType = sdb::CommandType::QUERY; + m_bCommandTypeOK = true; } else if( IsXMLToken( sAttrValue, XML_COMMAND ) ) { - nCommandType = sdb::CommandType::COMMAND; - bCommandTypeOK = true; + m_nCommandType = sdb::CommandType::COMMAND; + m_bCommandTypeOK = true; } break; case XML_TOK_TEXTFIELD_DISPLAY: if( IsXMLToken( sAttrValue, XML_NONE ) ) { - bDisplay = false; - bDisplayOK = true; + m_bDisplay = false; + m_bDisplayOK = true; } else if( IsXMLToken( sAttrValue, XML_VALUE ) ) { - bDisplay = true; - bDisplayOK = true; + m_bDisplay = true; + m_bDisplayOK = true; } break; } @@ -1224,9 +1224,9 @@ SvXMLImportContextRef XMLDatabaseFieldImportContext::CreateChildContext( if( ( nPrefix == XML_NAMESPACE_XLINK ) && IsXMLToken( sLocalName, XML_HREF ) ) { - sDatabaseURL = xAttrList->getValueByIndex(n); - bDatabaseOK = true; - bDatabaseURLOK = true; + m_sDatabaseURL = xAttrList->getValueByIndex(n); + m_bDatabaseOK = true; + m_bDatabaseURLOK = true; } } @@ -1242,27 +1242,27 @@ SvXMLImportContextRef XMLDatabaseFieldImportContext::CreateChildContext( void XMLDatabaseFieldImportContext::PrepareField( const Reference<XPropertySet> & xPropertySet) { - xPropertySet->setPropertyValue(gsPropertyTableName, Any(sTableName)); + xPropertySet->setPropertyValue(gsPropertyTableName, Any(m_sTableName)); - if( bDatabaseNameOK ) + if( m_bDatabaseNameOK ) { - xPropertySet->setPropertyValue(gsPropertyDataBaseName, Any(sDatabaseName)); + xPropertySet->setPropertyValue(gsPropertyDataBaseName, Any(m_sDatabaseName)); } - else if( bDatabaseURLOK ) + else if( m_bDatabaseURLOK ) { - xPropertySet->setPropertyValue(gsPropertyDataBaseURL, Any(sDatabaseURL)); + xPropertySet->setPropertyValue(gsPropertyDataBaseURL, Any(m_sDatabaseURL)); } // #99980# load/save command type for all fields; also load // old documents without command type - if( bCommandTypeOK ) + if( m_bCommandTypeOK ) { - xPropertySet->setPropertyValue( gsPropertyDataCommandType, Any(nCommandType) ); + xPropertySet->setPropertyValue( gsPropertyDataCommandType, Any(m_nCommandType) ); } - if( bUseDisplay && bDisplayOK ) + if( m_bUseDisplay && m_bDisplayOK ) { - xPropertySet->setPropertyValue( gsPropertyIsVisible, Any(bDisplay) ); + xPropertySet->setPropertyValue( gsPropertyIsVisible, Any(m_bDisplay) ); } } @@ -1283,7 +1283,7 @@ void XMLDatabaseNameImportContext::ProcessAttribute( { // delegate to superclass and check for success XMLDatabaseFieldImportContext::ProcessAttribute(nAttrToken, sAttrValue); - bValid = bDatabaseOK && bTableOK; + bValid = m_bDatabaseOK && m_bTableOK; } @@ -1335,7 +1335,7 @@ void XMLDatabaseNextImportContext::ProcessAttribute( sAttrValue); } - bValid = bDatabaseOK && bTableOK; + bValid = m_bDatabaseOK && m_bTableOK; } void XMLDatabaseNextImportContext::PrepareField( @@ -1383,7 +1383,7 @@ void XMLDatabaseSelectImportContext::ProcessAttribute( XMLDatabaseNextImportContext::ProcessAttribute(nAttrToken, sAttrValue); } - bValid = bTableOK && bDatabaseOK && bNumberOK; + bValid = m_bTableOK && m_bDatabaseOK && bNumberOK; } void XMLDatabaseSelectImportContext::PrepareField( @@ -1441,7 +1441,7 @@ void XMLDatabaseNumberImportContext::ProcessAttribute( break; } - bValid = bTableOK && bDatabaseOK; + bValid = m_bTableOK && m_bDatabaseOK; } void XMLDatabaseNumberImportContext::PrepareField( diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 9f84d8675664..608701482f3f 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -972,7 +972,7 @@ void XMLDatabaseDisplayImportContext::ProcessAttribute( break; } - bValid = bTableOK && bDatabaseOK && bColumnOK; + bValid = m_bTableOK && m_bDatabaseOK && bColumnOK; } void XMLDatabaseDisplayImportContext::EndElement() |