From fd2ba0d7cd3598f329bd18f96c0716b68e396378 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 22 Apr 2016 09:37:31 +0200 Subject: Avoid reserved identifiers Change-Id: Ifccf58c748ca8189949efeecc1ac7329a07be1f7 --- reportdesign/source/filter/xml/xmlFixedContent.cxx | 4 ++-- reportdesign/source/filter/xml/xmlFixedContent.hxx | 2 +- reportdesign/source/filter/xml/xmlReport.cxx | 2 +- reportdesign/source/filter/xml/xmlReportElementBase.cxx | 4 ++-- reportdesign/source/filter/xml/xmlReportElementBase.hxx | 2 +- reportdesign/source/filter/xml/xmlSubDocument.cxx | 4 ++-- reportdesign/source/filter/xml/xmlSubDocument.hxx | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'reportdesign/source/filter/xml') diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 4546b21cdd3a..ea87a5d06c72 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -126,12 +126,12 @@ OXMLFixedContent::~OXMLFixedContent() } -SvXMLImportContext* OXMLFixedContent::_CreateChildContext( +SvXMLImportContext* OXMLFixedContent::CreateChildContext_( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = OXMLReportElementBase::_CreateChildContext(nPrefix,rLocalName,xAttrList); + SvXMLImportContext *pContext = OXMLReportElementBase::CreateChildContext_(nPrefix,rLocalName,xAttrList); if ( pContext ) return pContext; diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx index 056aef5ff535..ccfe510d4300 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.hxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx @@ -36,7 +36,7 @@ namespace rptxml bool m_bFormattedField; protected: - virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContext* CreateChildContext_( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; private: diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index aaef945dde4f..895ae83cbf7f 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -131,7 +131,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = _CreateChildContext(nPrefix,rLocalName,xAttrList); + SvXMLImportContext *pContext = CreateChildContext_(nPrefix,rLocalName,xAttrList); if ( pContext ) return pContext; const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap(); diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index fb0e8307903d..97c152115e68 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -52,13 +52,13 @@ SvXMLImportContext* OXMLReportElementBase::CreateChildContext( const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = _CreateChildContext(nPrefix,rLocalName,xAttrList); + SvXMLImportContext *pContext = CreateChildContext_(nPrefix,rLocalName,xAttrList); if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); return pContext; } -SvXMLImportContext* OXMLReportElementBase::_CreateChildContext( +SvXMLImportContext* OXMLReportElementBase::CreateChildContext_( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index e4afcc636754..fd8c5c6d5de3 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx @@ -46,7 +46,7 @@ namespace rptxml OXMLTable* m_pContainer; css::uno::Reference< css::report::XReportComponent > m_xComponent; - virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContext* CreateChildContext_( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); public: diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index 4e270774469b..3abc7a933a86 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -57,12 +57,12 @@ OXMLSubDocument::~OXMLSubDocument() } -SvXMLImportContext* OXMLSubDocument::_CreateChildContext( +SvXMLImportContext* OXMLSubDocument::CreateChildContext_( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = OXMLReportElementBase::_CreateChildContext(_nPrefix,_rLocalName,xAttrList); + SvXMLImportContext *pContext = OXMLReportElementBase::CreateChildContext_(_nPrefix,_rLocalName,xAttrList); if ( pContext ) return pContext; const SvXMLTokenMap& rTokenMap = static_cast(GetImport()).GetReportElemTokenMap(); diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx index 1bbeb6d764b2..347c44caa2ca 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.hxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx @@ -39,7 +39,7 @@ namespace rptxml OXMLSubDocument(const OXMLSubDocument&) = delete; void operator =(const OXMLSubDocument&) = delete; - virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContext* CreateChildContext_( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; public: -- cgit