summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-10-17 18:17:22 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-19 06:49:12 +0000
commita55496a9e88ac3da821b0ae0d334866d669540c6 (patch)
tree27a77c423792a971805fc385b9a9924eebbaf1aa /reportdesign
parent2d64fcf4c8d3316ad9ae2232601678553dcad6a3 (diff)
cppcheck:duplInheritedMember
Change-Id: Ie525330eb79a80fd47a6bfe46343aa25ae0aeb5c Reviewed-on: https://gerrit.libreoffice.org/19419 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx16
-rw-r--r--reportdesign/source/filter/xml/xmlFormattedField.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReport.hxx1
-rw-r--r--reportdesign/source/filter/xml/xmlReportElementBase.hxx2
4 files changed, 10 insertions, 11 deletions
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index c18edf50de9d..757a4f0cf718 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_xComponent = xControl.get();
- m_xComponent = xControl.get();
+ OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
+ m_pInP->m_xReportComponent = xControl.get();
+ m_xReportComponent = xControl.get();
}
else
{
Reference< XFixedText > xControl(xFactor->createInstance(SERVICE_FIXEDTEXT),uno::UNO_QUERY);
- OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
- m_pInP->m_xComponent = xControl.get();
- m_xComponent = xControl.get();
+ OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
+ m_pInP->m_xReportComponent = xControl.get();
+ m_xReportComponent = xControl.get();
xControl->setLabel(m_sLabel);
}
- m_pContainer->addCell(m_xComponent);
- m_rCell.setComponent(m_xComponent);
+ m_pContainer->addCell(m_xReportComponent);
+ m_rCell.setComponent(m_xReportComponent);
OXMLReportElementBase::EndElement();
}
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 47053d3a8137..b244cb80309e 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_xComponent.is(),"Component is NULL!");
+ OSL_ENSURE(m_xReportComponent.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 0a945258ac71..13aa3cd676b5 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -27,7 +27,6 @@ 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 c087dbd9015f..ec14b63bbd11 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_xComponent;
+ ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xReportComponent;
virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,