loplugin:datamembershadow in reportdesign

Change-Id: I90f95775c5bc6615cc8a8026355cd410e9656a89
Reviewed-on: https://gerrit.libreoffice.org/30922
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

10 files changed, 52 insertions, 53 deletions

diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index ea87a5d06c72..de77b9efd096 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -188,20 +188,20 @@ void OXMLFixedContent::EndElement()
             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();
+            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();
+            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 fed1adea735b..bab04afa626c 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/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index 0ab2c3acfd00..818524e15567 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -47,7 +47,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
     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 = m_rImport.GetNamespaceMap();
     const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap();
     static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index a15343275106..67fa765b8270 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -43,9 +43,9 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
                 const Reference< XAttributeList > & _xAttrList
                 ,const uno::Reference< report::XReportDefinition >& _xComponent) :
     OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),nullptr)
-    ,m_xComponent(_xComponent)
+    ,m_xReportDefinition(_xComponent)
 {
-    OSL_ENSURE(m_xComponent.is(),"No Report definition!");
+    OSL_ENSURE(m_xReportDefinition.is(),"No Report definition!");
 
     impl_initRuntimeDefaults();
 
@@ -71,26 +71,26 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
                         const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetCommandTypeOptions();
                         bool bConvertOk = SvXMLUnitConverter::convertEnum( nRet, sValue, aXML_EnumMap );
                         SAL_WARN_IF(!bConvertOk, "reportdesign", "convertEnum failed");
-                        m_xComponent->setCommandType(nRet);
+                        m_xReportDefinition->setCommandType(nRet);
                     }
                     break;
                 case XML_TOK_COMMAND:
-                    m_xComponent->setCommand(sValue);
+                    m_xReportDefinition->setCommand(sValue);
                     break;
                 case XML_TOK_FILTER:
-                    m_xComponent->setFilter(sValue);
+                    m_xReportDefinition->setFilter(sValue);
                     break;
                 case XML_TOK_CAPTION:
-                    m_xComponent->setCaption(sValue);
+                    m_xReportDefinition->setCaption(sValue);
                     break;
                 case XML_TOK_ESCAPE_PROCESSING:
-                    m_xComponent->setEscapeProcessing(sValue == s_sTRUE);
+                    m_xReportDefinition->setEscapeProcessing(sValue == s_sTRUE);
                     break;
                 case XML_TOK_REPORT_MIMETYPE:
-                    m_xComponent->setMimeType(sValue);
+                    m_xReportDefinition->setMimeType(sValue);
                     break;
                 case XML_TOK_REPORT_NAME:
-                    m_xComponent->setName(sValue);
+                    m_xReportDefinition->setName(sValue);
                     break;
                 default:
                     break;
@@ -111,13 +111,13 @@ OXMLReport::~OXMLReport()
 
 void OXMLReport::impl_initRuntimeDefaults() const
 {
-    OSL_PRECOND( m_xComponent.is(), "OXMLReport::impl_initRuntimeDefaults: no component!" );
-    if ( !m_xComponent.is() )
+    OSL_PRECOND( m_xReportDefinition.is(), "OXMLReport::impl_initRuntimeDefaults: no component!" );
+    if ( !m_xReportDefinition.is() )
         return;
 
     try
     {
-        m_xComponent->setCommandType( sdb::CommandType::COMMAND );
+        m_xReportDefinition->setCommandType( sdb::CommandType::COMMAND );
     }
     catch( const Exception& )
     {
@@ -141,7 +141,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
         case XML_TOK_REPORT_FUNCTION:
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                pContext = new OXMLFunction( m_rImport, nPrefix, rLocalName,xAttrList,m_xComponent.get(),true);
+                pContext = new OXMLFunction( m_rImport, nPrefix, rLocalName,xAttrList,m_xReportDefinition.get(),true);
             }
             break;
         case XML_TOK_MASTER_DETAIL_FIELDS:
@@ -151,15 +151,15 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
         case XML_TOK_REPORT_HEADER:
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                m_xComponent->setReportHeaderOn(true);
-                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getReportHeader());
+                m_xReportDefinition->setReportHeaderOn(true);
+                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getReportHeader());
             }
             break;
         case XML_TOK_PAGE_HEADER:
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                m_xComponent->setPageHeaderOn(true);
-                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getPageHeader());
+                m_xReportDefinition->setPageHeaderOn(true);
+                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getPageHeader());
             }
             break;
         case XML_TOK_GROUP:
@@ -169,21 +169,21 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
         case XML_TOK_DETAIL:
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getDetail());
+                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getDetail());
             }
             break;
         case XML_TOK_PAGE_FOOTER:
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                m_xComponent->setPageFooterOn(true);
-                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getPageFooter(),false);
+                m_xReportDefinition->setPageFooterOn(true);
+                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getPageFooter(),false);
             }
             break;
         case XML_TOK_REPORT_FOOTER:
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                m_xComponent->setReportFooterOn(true);
-                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getReportFooter());
+                m_xReportDefinition->setReportFooterOn(true);
+                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getReportFooter());
             }
             break;
         default:
@@ -199,7 +199,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
 
 void OXMLReport::EndElement()
 {
-    Reference< XFunctions > xFunctions = m_xComponent->getFunctions();
+    Reference< XFunctions > xFunctions = m_xReportDefinition->getFunctions();
     const ORptFilter::TGroupFunctionMap& aFunctions = m_rImport.getFunctions();
     ORptFilter::TGroupFunctionMap::const_iterator aIter = aFunctions.begin();
     const ORptFilter::TGroupFunctionMap::const_iterator aEnd = aFunctions.end();
@@ -207,9 +207,9 @@ void OXMLReport::EndElement()
         xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(aIter->second));
 
     if ( !m_aMasterFields.empty() )
-        m_xComponent->setMasterFields(Sequence< OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
+        m_xReportDefinition->setMasterFields(Sequence< OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
     if ( !m_aDetailFields.empty() )
-        m_xComponent->setDetailFields(Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
+        m_xReportDefinition->setDetailFields(Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
 }
 
 void OXMLReport::addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair)
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx
index d36d1db187b8..590bbe38a1b0 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -27,7 +27,7 @@ namespace rptxml
     class ORptFilter;
     class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds
     {
-        css::uno::Reference< css::report::XReportDefinition > m_xComponent;
+        css::uno::Reference< css::report::XReportDefinition > m_xReportDefinition;
         ::std::vector< OUString> m_aMasterFields;
         ::std::vector< OUString> m_aDetailFields;
         OXMLReport(const OXMLReport&) = delete;
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index 97c152115e68..b1c8e8065bc1 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -38,7 +38,7 @@ OXMLReportElementBase::OXMLReportElementBase( ORptFilter& rImport
     SvXMLImportContext( rImport, nPrfx, rLName )
 ,m_rImport(rImport)
 ,m_pContainer(_pContainer)
-,m_xComponent(_xComponent)
+,m_xReportComponent(_xComponent)
 {
 }
 
@@ -70,7 +70,7 @@ SvXMLImportContext* OXMLReportElementBase::CreateChildContext_(
     {
         case XML_TOK_REPORT_ELEMENT:
             {
-                uno::Reference<report::XReportControlModel> xReportModel(m_xComponent,uno::UNO_QUERY);
+                uno::Reference<report::XReportControlModel> xReportModel(m_xReportComponent,uno::UNO_QUERY);
                 if ( xReportModel.is() )
                 {
                     m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
@@ -80,7 +80,7 @@ SvXMLImportContext* OXMLReportElementBase::CreateChildContext_(
             break;
         case XML_TOK_PROPERTIES:
             m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-            pContext = new OXMLControlProperty( m_rImport, nPrefix, rLocalName,xAttrList,m_xComponent.get());
+            pContext = new OXMLControlProperty( m_rImport, nPrefix, rLocalName,xAttrList,m_xReportComponent.get());
             break;
         default:
             break;
@@ -93,8 +93,8 @@ void OXMLReportElementBase::EndElement()
 {
     try
     {
-        if ( m_pContainer && m_pContainer->getSection().is() && m_xComponent.is() )
-            m_pContainer->getSection()->add(m_xComponent.get());
+        if ( m_pContainer && m_pContainer->getSection().is() && m_xReportComponent.is() )
+            m_pContainer->getSection()->add(m_xReportComponent.get());
     }
     catch(Exception&)
     {
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index bf7c347cb14e..c46485cc5350 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;
-        css::uno::Reference< css::report::XReportComponent >      m_xComponent;
+        css::uno::Reference< css::report::XReportComponent >      m_xReportComponent;
 
         virtual SvXMLImportContext* CreateChildContext_( sal_uInt16 nPrefix,
                     const OUString& rLocalName,
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index 3abc7a933a86..af051ddc105e 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -104,18 +104,18 @@ void OXMLSubDocument::EndElement()
 {
     if ( m_bContainsShape )
     {
-        m_xComponent.set(m_pContainer->getSection()->getByIndex(m_nCurrentCount),uno::UNO_QUERY);
-        if ( m_xComponent.is() )
+        m_xReportComponent.set(m_pContainer->getSection()->getByIndex(m_nCurrentCount),uno::UNO_QUERY);
+        if ( m_xReportComponent.is() )
         {
             if ( !m_aMasterFields.empty() )
-                m_xComponent->setMasterFields(Sequence< OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
+                m_xReportComponent->setMasterFields(Sequence< OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
             if ( !m_aDetailFields.empty() )
-                m_xComponent->setDetailFields(Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
+                m_xReportComponent->setDetailFields(Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
 
-            m_xComponent->setName(m_xFake->getName());
-            m_xComponent->setPrintRepeatedValues(m_xFake->getPrintRepeatedValues());
+            m_xReportComponent->setName(m_xFake->getName());
+            m_xReportComponent->setPrintRepeatedValues(m_xFake->getPrintRepeatedValues());
             uno::Reference< report::XReportControlModel >   xFakeModel(m_xFake,uno::UNO_QUERY);
-            uno::Reference< report::XReportControlModel >   xComponentModel(m_xComponent,uno::UNO_QUERY);
+            uno::Reference< report::XReportControlModel >   xComponentModel(m_xReportComponent,uno::UNO_QUERY);
             if ( xComponentModel.is() && xFakeModel.is() )
             {
                 xComponentModel->setPrintWhenGroupChange(xFakeModel->getPrintWhenGroupChange());
diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx
index 66d1bb1b30b8..74e597d884eb 100644
--- a/reportdesign/source/ui/inc/toolboxcontroller.hxx
+++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx
@@ -43,7 +43,6 @@ namespace rptui
         typedef std::map<OUString, sal_Bool> TCommandState;
         TCommandState   m_aStates;
         TToolbarHelper  m_pToolbarController;
-        sal_uInt16      m_nToolBoxId;
         OToolboxController(const OToolboxController&) = delete;
         void operator =(const OToolboxController&) = delete;
     public:
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index c7f5b6afe78f..bede2e4fb1d3 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -83,7 +83,6 @@ Reference< XInterface > OToolboxController::create(Reference< XComponentContext
 
 OToolboxController::OToolboxController(const Reference< XComponentContext >& _rxORB)
     : m_pToolbarController(nullptr)
-    ,m_nToolBoxId(1)
 {
     osl_atomic_increment(&m_refCount);
     m_xContext = _rxORB;
@@ -119,6 +118,7 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
     ToolboxController::initialize(_rArguments);
     SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard(m_aMutex);
+    sal_uInt16      nToolBoxId = 1;
 
     VclPtr< ToolBox > pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent()).get());
     if ( pToolBox )
@@ -129,7 +129,7 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
             const sal_uInt16 nItemId = pToolBox->GetItemId(nPos);
             if ( pToolBox->GetItemCommand(nItemId) == m_aCommandURL )
             {
-                m_nToolBoxId = nItemId;
+                nToolBoxId = nItemId;
                 break;
             }
         }
@@ -137,12 +137,12 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:FontColor"),true));
             m_aStates.insert(TCommandState::value_type(OUString(".uno:Color"),true));
-            m_pToolbarController = new SvxColorToolBoxControl(SID_ATTR_CHAR_COLOR2,m_nToolBoxId,*pToolBox);
+            m_pToolbarController = new SvxColorToolBoxControl(SID_ATTR_CHAR_COLOR2,nToolBoxId,*pToolBox);
         }
         else
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:BackgroundColor"),true));
-            m_pToolbarController = new SvxColorToolBoxControl(SID_BACKGROUND_COLOR,m_nToolBoxId,*pToolBox);
+            m_pToolbarController = new SvxColorToolBoxControl(SID_BACKGROUND_COLOR,nToolBoxId,*pToolBox);
         }
 
         TCommandState::const_iterator aIter = m_aStates.begin();
@@ -152,7 +152,7 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
         if ( m_pToolbarController.is() )
             m_pToolbarController->initialize(_rArguments);
         // check if paste special is allowed, when not don't add DROPDOWN
-        pToolBox->SetItemBits(m_nToolBoxId,pToolBox->GetItemBits(m_nToolBoxId) | ToolBoxItemBits::DROPDOWN);
+        pToolBox->SetItemBits(nToolBoxId,pToolBox->GetItemBits(nToolBoxId) | ToolBoxItemBits::DROPDOWN);
     }
 }