diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-19 09:00:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-19 09:00:04 +0200 |
| commit | ebd6fec73bfd77aa78a1ae92256d59d04ba999f3 (patch) | |
| tree | 108b04c50177a6a36dc99dd8cfb2daac310c43a9 /reportdesign/source | |
| parent | 7e5bada5540662ae5bde0522bacf28da1e856589 (diff) | |
Revert "cppcheck:duplInheritedMember"
This reverts commit a55496a9e88ac3da821b0ae0d334866d669540c6.
Diffstat (limited to 'reportdesign/source')
4 files changed, 11 insertions, 10 deletions
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 757a4f0cf718..c18edf50de9d 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -187,21 +187,21 @@ void OXMLFixedContent::EndElement() uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); xControl->setDataField("rpt:" + m_sPageText); - OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); - m_pInP->m_xReportComponent = xControl.get(); - m_xReportComponent = xControl.get(); + OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); + m_pInP->m_xComponent = xControl.get(); + m_xComponent = xControl.get(); } else { Reference< XFixedText > xControl(xFactor->createInstance(SERVICE_FIXEDTEXT),uno::UNO_QUERY); - OSL_ENSURE(xControl.is(),"Could not create FixedContent!"); - m_pInP->m_xReportComponent = xControl.get(); - m_xReportComponent = xControl.get(); + OSL_ENSURE(xControl.is(),"Could not create FixedContent!"); + m_pInP->m_xComponent = xControl.get(); + m_xComponent = xControl.get(); xControl->setLabel(m_sLabel); } - m_pContainer->addCell(m_xReportComponent); - m_rCell.setComponent(m_xReportComponent); + m_pContainer->addCell(m_xComponent); + m_rCell.setComponent(m_xComponent); OXMLReportElementBase::EndElement(); } diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index b244cb80309e..47053d3a8137 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -43,7 +43,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, ,bool _bPageCount) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) { - OSL_ENSURE(m_xReportComponent.is(),"Component is NULL!"); + OSL_ENSURE(m_xComponent.is(),"Component is NULL!"); const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetControlElemTokenMap(); diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx index 13aa3cd676b5..0a945258ac71 100644 --- a/reportdesign/source/filter/xml/xmlReport.hxx +++ b/reportdesign/source/filter/xml/xmlReport.hxx @@ -27,6 +27,7 @@ namespace rptxml class ORptFilter; class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds { + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xComponent; ::std::vector< OUString> m_aMasterFields; ::std::vector< OUString> m_aDetailFields; OXMLReport(const OXMLReport&) = delete; diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index ec14b63bbd11..c087dbd9015f 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx @@ -44,7 +44,7 @@ namespace rptxml protected: ORptFilter& m_rImport; OXMLTable* m_pContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xReportComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, |