loplugin:singlevalfields

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

4 files changed, 2 insertions, 85 deletions

diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx
index 5d3b7c2e7aef..c609bb242861 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -116,7 +116,7 @@ void OWriterTable::fillColumns()
         sal_Int32 eType = sdbc::DataType::OTHER;
         bool bCurrency = false;
 
-        lcl_GetColumnInfo(m_xTable, m_nStartCol + i, m_nStartRow, m_bHasHeaders,
+        lcl_GetColumnInfo(m_xTable, m_nStartCol + i, 0, m_bHasHeaders,
                           aColumnName, eType, bCurrency);
 
         sal_Int32 nPrecision = 0;   //! ...
@@ -184,7 +184,6 @@ OWriterTable::OWriterTable(sdbcx::OCollection* _pTables, OWriterConnection* _pCo
                                       CatalogName)
     ,m_pWriterConnection(_pConnection)
     ,m_nStartCol(0)
-    ,m_nStartRow(0)
     ,m_nDataCols(0)
     ,m_bHasHeaders(false)
 {
@@ -263,7 +262,7 @@ bool OWriterTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols,
     {
         if ((_rRow->get())[i]->isBound())
         {
-            lcl_SetValue((_rRow->get())[i]->get(), m_xTable, m_nStartCol, m_nStartRow, m_bHasHeaders,
+            lcl_SetValue((_rRow->get())[i]->get(), m_xTable, m_nStartCol, 0, m_bHasHeaders,
                          m_nFilePos, i);
         }
     }
diff --git a/connectivity/source/inc/writer/WTable.hxx b/connectivity/source/inc/writer/WTable.hxx
index 3b1fe9d09c8b..750a66b65df5 100644
--- a/connectivity/source/inc/writer/WTable.hxx
+++ b/connectivity/source/inc/writer/WTable.hxx
@@ -68,7 +68,6 @@ private:
     css::uno::Reference< css::text::XTextTable > m_xTable;
     OWriterConnection* m_pWriterConnection;
     sal_Int32 m_nStartCol;
-    sal_Int32 m_nStartRow;
     sal_Int32 m_nDataCols;
     bool      m_bHasHeaders;
     css::uno::Reference< css::util::XNumberFormats > m_xFormats;
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 6df7017b9b6d..ee241d416a31 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1543,14 +1543,8 @@ ScXMLImport::ScXMLImport(
     sLocale(SC_LOCALE),
     sCellStyle(SC_UNONAME_CELLSTYL),
     pDocElemTokenMap( nullptr ),
-    pBodyElemTokenMap( nullptr ),
-    pContentValidationsElemTokenMap( nullptr ),
     pContentValidationElemTokenMap( nullptr ),
-    pContentValidationAttrTokenMap( nullptr ),
     pContentValidationMessageElemTokenMap( nullptr ),
-    pContentValidationHelpMessageAttrTokenMap( nullptr ),
-    pContentValidationErrorMessageAttrTokenMap( nullptr ),
-    pContentValidationErrorMacroAttrTokenMap( nullptr ),
     pCondFormatsTokenMap( nullptr ),
     pCondFormatTokenMap( nullptr ),
     pCondFormatAttrMap( nullptr ),
@@ -1562,15 +1556,9 @@ ScXMLImport::ScXMLImport(
     pDataBarAttrMap( nullptr ),
     pFormattingEntryAttrMap( nullptr ),
     pIconSetAttrMap( nullptr ),
-    pLabelRangesElemTokenMap( nullptr ),
-    pLabelRangeAttrTokenMap( nullptr ),
     pTableElemTokenMap( nullptr ),
-    pTableProtectionElemTokenMap(nullptr),
     pTableRowsElemTokenMap( nullptr ),
-    pTableColsElemTokenMap( nullptr ),
-    pTableScenarioAttrTokenMap( nullptr ),
     pTableAttrTokenMap( nullptr ),
-    pTableColAttrTokenMap( nullptr ),
     pTableRowElemTokenMap( nullptr ),
     pTableRowAttrTokenMap( nullptr ),
     pTableRowCellElemTokenMap( nullptr ),
@@ -1580,12 +1568,6 @@ ScXMLImport::ScXMLImport(
     pDetectiveHighlightedAttrTokenMap( nullptr ),
     pDetectiveOperationAttrTokenMap( nullptr ),
     pTableCellRangeSourceAttrTokenMap( nullptr ),
-    pNamedExpressionsElemTokenMap( nullptr ),
-    pNamedRangeAttrTokenMap( nullptr ),
-    pNamedExpressionAttrTokenMap( nullptr ),
-    pDatabaseRangesElemTokenMap( nullptr ),
-    pDatabaseRangeElemTokenMap( nullptr ),
-    pDatabaseRangeAttrTokenMap( nullptr ),
     pDatabaseRangeSourceSQLAttrTokenMap( nullptr ),
     pDatabaseRangeSourceTableAttrTokenMap( nullptr ),
     pDatabaseRangeSourceQueryAttrTokenMap( nullptr ),
@@ -1595,14 +1577,7 @@ ScXMLImport::ScXMLImport(
     pFilterConditionAttrTokenMap( nullptr ),
     pFilterSetItemAttrTokenMap( nullptr ),
     pSortElemTokenMap( nullptr ),
-    pSortAttrTokenMap( nullptr ),
     pSortSortByAttrTokenMap( nullptr ),
-    pDatabaseRangeSubTotalRulesElemTokenMap( nullptr ),
-    pDatabaseRangeSubTotalRulesAttrTokenMap( nullptr ),
-    pSubTotalRulesSortGroupsAttrTokenMap( nullptr ),
-    pSubTotalRulesSubTotalRuleElemTokenMap( nullptr ),
-    pSubTotalRulesSubTotalRuleAttrTokenMap( nullptr ),
-    pSubTotalRuleSubTotalFieldAttrTokenMap( nullptr ),
     pDataPilotTablesElemTokenMap( nullptr ),
     pDataPilotTableAttrTokenMap( nullptr ),
     pDataPilotTableElemTokenMap( nullptr ),
@@ -1618,13 +1593,11 @@ ScXMLImport::ScXMLImport(
     pDataPilotSubTotalAttrTokenMap( nullptr ),
     pDataPilotMembersElemTokenMap( nullptr ),
     pDataPilotMemberAttrTokenMap( nullptr ),
-    pConsolidationAttrTokenMap( nullptr ),
     pCellTextParaElemTokenMap(nullptr),
     pCellTextSpanElemTokenMap(nullptr),
     pCellTextSpanAttrTokenMap(nullptr),
     pCellTextURLAttrTokenMap(nullptr),
     pCellTextSAttrTokenMap(nullptr),
-    pDataStreamAttrTokenMap(nullptr),
     mpPostProcessData(nullptr),
     aTables(*this),
     m_pMyNamedExpressions(nullptr),
@@ -1683,14 +1656,8 @@ ScXMLImport::~ScXMLImport() throw()
 {
     //  delete pI18NMap;
     delete pDocElemTokenMap;
-    delete pBodyElemTokenMap;
-    delete pContentValidationsElemTokenMap;
     delete pContentValidationElemTokenMap;
-    delete pContentValidationAttrTokenMap;
     delete pContentValidationMessageElemTokenMap;
-    delete pContentValidationHelpMessageAttrTokenMap;
-    delete pContentValidationErrorMessageAttrTokenMap;
-    delete pContentValidationErrorMacroAttrTokenMap;
     delete pCondFormatsTokenMap;
     delete pCondFormatTokenMap;
     delete pCondFormatAttrMap;
@@ -1701,15 +1668,9 @@ ScXMLImport::~ScXMLImport() throw()
     delete pDataBarTokenMap;
     delete pDataBarAttrMap;
     delete pFormattingEntryAttrMap;
-    delete pLabelRangesElemTokenMap;
-    delete pLabelRangeAttrTokenMap;
     delete pTableElemTokenMap;
-    delete pTableProtectionElemTokenMap;
     delete pTableRowsElemTokenMap;
-    delete pTableColsElemTokenMap;
     delete pTableAttrTokenMap;
-    delete pTableScenarioAttrTokenMap;
-    delete pTableColAttrTokenMap;
     delete pTableRowElemTokenMap;
     delete pTableRowAttrTokenMap;
     delete pTableRowCellElemTokenMap;
@@ -1719,12 +1680,6 @@ ScXMLImport::~ScXMLImport() throw()
     delete pDetectiveHighlightedAttrTokenMap;
     delete pDetectiveOperationAttrTokenMap;
     delete pTableCellRangeSourceAttrTokenMap;
-    delete pNamedExpressionsElemTokenMap;
-    delete pNamedRangeAttrTokenMap;
-    delete pNamedExpressionAttrTokenMap;
-    delete pDatabaseRangesElemTokenMap;
-    delete pDatabaseRangeElemTokenMap;
-    delete pDatabaseRangeAttrTokenMap;
     delete pDatabaseRangeSourceSQLAttrTokenMap;
     delete pDatabaseRangeSourceTableAttrTokenMap;
     delete pDatabaseRangeSourceQueryAttrTokenMap;
@@ -1734,14 +1689,7 @@ ScXMLImport::~ScXMLImport() throw()
     delete pFilterConditionAttrTokenMap;
     delete pFilterSetItemAttrTokenMap;
     delete pSortElemTokenMap;
-    delete pSortAttrTokenMap;
     delete pSortSortByAttrTokenMap;
-    delete pDatabaseRangeSubTotalRulesElemTokenMap;
-    delete pDatabaseRangeSubTotalRulesAttrTokenMap;
-    delete pSubTotalRulesSortGroupsAttrTokenMap;
-    delete pSubTotalRulesSubTotalRuleElemTokenMap;
-    delete pSubTotalRulesSubTotalRuleAttrTokenMap;
-    delete pSubTotalRuleSubTotalFieldAttrTokenMap;
     delete pDataPilotTablesElemTokenMap;
     delete pDataPilotTableAttrTokenMap;
     delete pDataPilotTableElemTokenMap;
@@ -1756,13 +1704,11 @@ ScXMLImport::~ScXMLImport() throw()
     delete pDataPilotSubTotalAttrTokenMap;
     delete pDataPilotMembersElemTokenMap;
     delete pDataPilotMemberAttrTokenMap;
-    delete pConsolidationAttrTokenMap;
     delete pCellTextParaElemTokenMap;
     delete pCellTextSpanElemTokenMap;
     delete pCellTextSpanAttrTokenMap;
     delete pCellTextURLAttrTokenMap;
     delete pCellTextSAttrTokenMap;
-    delete pDataStreamAttrTokenMap;
 
     delete pChangeTrackingImportHelper;
     delete pNumberFormatAttributesExportHelper;
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index d2bc254972ab..b098995a5e45 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -833,14 +833,8 @@ class ScXMLImport: public SvXMLImport
     rtl::Reference < XMLPropertySetMapper >       xTableStylesPropertySetMapper;
 
     SvXMLTokenMap           *pDocElemTokenMap;
-    SvXMLTokenMap           *pBodyElemTokenMap;
-    SvXMLTokenMap           *pContentValidationsElemTokenMap;
     SvXMLTokenMap           *pContentValidationElemTokenMap;
-    SvXMLTokenMap           *pContentValidationAttrTokenMap;
     SvXMLTokenMap           *pContentValidationMessageElemTokenMap;
-    SvXMLTokenMap           *pContentValidationHelpMessageAttrTokenMap;
-    SvXMLTokenMap           *pContentValidationErrorMessageAttrTokenMap;
-    SvXMLTokenMap           *pContentValidationErrorMacroAttrTokenMap;
     SvXMLTokenMap           *pCondFormatsTokenMap;
     SvXMLTokenMap           *pCondFormatTokenMap;
     SvXMLTokenMap           *pCondFormatAttrMap;
@@ -852,15 +846,9 @@ class ScXMLImport: public SvXMLImport
     SvXMLTokenMap           *pDataBarAttrMap;
     SvXMLTokenMap           *pFormattingEntryAttrMap;
     SvXMLTokenMap           *pIconSetAttrMap;
-    SvXMLTokenMap           *pLabelRangesElemTokenMap;
-    SvXMLTokenMap           *pLabelRangeAttrTokenMap;
     SvXMLTokenMap           *pTableElemTokenMap;
-    SvXMLTokenMap           *pTableProtectionElemTokenMap;
     SvXMLTokenMap           *pTableRowsElemTokenMap;
-    SvXMLTokenMap           *pTableColsElemTokenMap;
-    SvXMLTokenMap           *pTableScenarioAttrTokenMap;
     SvXMLTokenMap           *pTableAttrTokenMap;
-    SvXMLTokenMap           *pTableColAttrTokenMap;
     SvXMLTokenMap           *pTableRowElemTokenMap;
     SvXMLTokenMap           *pTableRowAttrTokenMap;
     SvXMLTokenMap           *pTableRowCellElemTokenMap;
@@ -870,12 +858,6 @@ class ScXMLImport: public SvXMLImport
     SvXMLTokenMap           *pDetectiveHighlightedAttrTokenMap;
     SvXMLTokenMap           *pDetectiveOperationAttrTokenMap;
     SvXMLTokenMap           *pTableCellRangeSourceAttrTokenMap;
-    SvXMLTokenMap           *pNamedExpressionsElemTokenMap;
-    SvXMLTokenMap           *pNamedRangeAttrTokenMap;
-    SvXMLTokenMap           *pNamedExpressionAttrTokenMap;
-    SvXMLTokenMap           *pDatabaseRangesElemTokenMap;
-    SvXMLTokenMap           *pDatabaseRangeElemTokenMap;
-    SvXMLTokenMap           *pDatabaseRangeAttrTokenMap;
     SvXMLTokenMap           *pDatabaseRangeSourceSQLAttrTokenMap;
     SvXMLTokenMap           *pDatabaseRangeSourceTableAttrTokenMap;
     SvXMLTokenMap           *pDatabaseRangeSourceQueryAttrTokenMap;
@@ -885,14 +867,7 @@ class ScXMLImport: public SvXMLImport
     SvXMLTokenMap           *pFilterConditionAttrTokenMap;
     SvXMLTokenMap           *pFilterSetItemAttrTokenMap;
     SvXMLTokenMap           *pSortElemTokenMap;
-    SvXMLTokenMap           *pSortAttrTokenMap;
     SvXMLTokenMap           *pSortSortByAttrTokenMap;
-    SvXMLTokenMap           *pDatabaseRangeSubTotalRulesElemTokenMap;
-    SvXMLTokenMap           *pDatabaseRangeSubTotalRulesAttrTokenMap;
-    SvXMLTokenMap           *pSubTotalRulesSortGroupsAttrTokenMap;
-    SvXMLTokenMap           *pSubTotalRulesSubTotalRuleElemTokenMap;
-    SvXMLTokenMap           *pSubTotalRulesSubTotalRuleAttrTokenMap;
-    SvXMLTokenMap           *pSubTotalRuleSubTotalFieldAttrTokenMap;
     SvXMLTokenMap           *pDataPilotTablesElemTokenMap;
     SvXMLTokenMap           *pDataPilotTableAttrTokenMap;
     SvXMLTokenMap           *pDataPilotTableElemTokenMap;
@@ -908,13 +883,11 @@ class ScXMLImport: public SvXMLImport
     SvXMLTokenMap           *pDataPilotSubTotalAttrTokenMap;
     SvXMLTokenMap           *pDataPilotMembersElemTokenMap;
     SvXMLTokenMap           *pDataPilotMemberAttrTokenMap;
-    SvXMLTokenMap           *pConsolidationAttrTokenMap;
     SvXMLTokenMap           *pCellTextParaElemTokenMap;
     SvXMLTokenMap           *pCellTextSpanElemTokenMap;
     SvXMLTokenMap           *pCellTextSpanAttrTokenMap;
     SvXMLTokenMap           *pCellTextURLAttrTokenMap;
     SvXMLTokenMap           *pCellTextSAttrTokenMap;
-    SvXMLTokenMap           *pDataStreamAttrTokenMap;
 
     sc::ImportPostProcessData* mpPostProcessData; /// Lift cycle managed elsewhere, no need to delete.