diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-22 15:24:59 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-23 07:30:03 +0100 |
commit | d3d8618608ec0f329a40e029de951374871a8de0 (patch) | |
tree | df667e02164bc994408212a345c7c11dd37518ac /sc | |
parent | 77fe54df21195a1b0483fb06466ced935a186030 (diff) |
loplugin:unusedfields in sc
Change-Id: I5e9842970821d0ae61e06e3ad35c9f571b43632c
Reviewed-on: https://gerrit.libreoffice.org/68224
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/externalrefmgr.hxx | 3 | ||||
-rw-r--r-- | sc/inc/mtvelements.hxx | 1 | ||||
-rw-r--r-- | sc/inc/pagepar.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/column3.cxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/pagepar.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmldpimp.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlfilti.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/xmltabi.cxx | 1 | ||||
-rw-r--r-- | sc/source/filter/xml/xmltabi.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessibleSpreadsheet.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/preview.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/dataproviderdlg.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaformatcondition.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaformatcondition.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/preview.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/printfun.cxx | 2 |
19 files changed, 3 insertions, 41 deletions
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 0dee986d81c0..00a5ca7429ad 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -54,7 +54,7 @@ class ColumnSpanSet; class ScExternalRefLink : public ::sfx2::SvBaseLink { public: - ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId, const OUString& rFilter); + ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId); virtual ~ScExternalRefLink() override; virtual void Closed() override; @@ -69,7 +69,6 @@ private: ScExternalRefLink(const ScExternalRefLink&) = delete; sal_uInt16 const mnFileId; - OUString maFilterName; ScDocument* const mpDoc; bool mbDoRefresh; }; diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx index 04c34775cedb..407f0392c4cd 100644 --- a/sc/inc/mtvelements.hxx +++ b/sc/inc/mtvelements.hxx @@ -130,7 +130,6 @@ struct ColumnBlockPosition struct ColumnBlockConstPosition { CellNoteStoreType::const_iterator miCellNotePos; - BroadcasterStoreType::const_iterator miBroadcasterPos; CellTextAttrStoreType::const_iterator miCellTextAttrPos; CellStoreType::const_iterator miCellPos; diff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxx index 50a51cde8b63..2a86e32936f2 100644 --- a/sc/inc/pagepar.hxx +++ b/sc/inc/pagepar.hxx @@ -59,8 +59,6 @@ struct ScPageAreaParam bool bRepeatRow; bool bRepeatCol; ScRange aPrintArea; - ScRange aRepeatRow; - ScRange aRepeatCol; ScPageAreaParam(); ~ScPageAreaParam(); diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index a5a6a4a0993a..329971d2b3bf 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -788,7 +788,6 @@ void ScColumn::InitBlockPosition( sc::ColumnBlockPosition& rBlockPos ) void ScColumn::InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const { - rBlockPos.miBroadcasterPos = maBroadcasters.begin(); rBlockPos.miCellNotePos = maCellNotes.begin(); rBlockPos.miCellTextAttrPos = maCellTextAttrs.begin(); rBlockPos.miCellPos = maCells.begin(); diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx index 9853e4ac52a5..35a270e39391 100644 --- a/sc/source/core/data/pagepar.cxx +++ b/sc/source/core/data/pagepar.cxx @@ -58,8 +58,6 @@ void ScPageAreaParam::Reset() bPrintArea = bRepeatRow = bRepeatCol = false; aPrintArea = ScRange(); - aRepeatRow = ScRange(); - aRepeatCol = ScRange(); } diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index c75abd762f41..31bd37690efb 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -87,8 +87,6 @@ class ScXMLDataPilotTableContext : public ScXMLImportContext OUString sSourceRangeName; ScRange aSourceCellRangeAddress; ScRange aTargetRangeAddress; - ScRange aFilterSourceRange; - ScAddress aFilterOutputPosition; ScQueryParam aSourceQueryParam; ScMySourceType nSourceType; sal_uInt32 mnRowFieldCount; @@ -132,8 +130,6 @@ public: void SetSourceRangeName(const OUString& sValue) { sSourceRangeName = sValue; bSourceCellRange = true; } void SetSourceCellRangeAddress(const ScRange& aValue) { aSourceCellRangeAddress = aValue; bSourceCellRange = true; } void SetSourceQueryParam(const ScQueryParam& aValue) { aSourceQueryParam = aValue; } - void SetFilterOutputPosition(const ScAddress& aValue) { aFilterOutputPosition = aValue; } - void SetFilterSourceRange(const ScRange& aValue) { aFilterSourceRange = aValue; } void AddDimension(ScDPSaveDimension* pDim); void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim); void AddGroupDim(const ScDPSaveGroupDimension& aGroupDim); diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index ea051785c59d..d97bf44957ee 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -575,12 +575,8 @@ void SAL_CALL ScXMLDPFilterContext::endFastElement( sal_Int32 /*nElement*/ ) aFilterFields.eSearchType = eSearchType; aFilterFields.bCaseSens = bIsCaseSensitive; aFilterFields.bDuplicate = !bSkipDuplicates; - if (bCopyOutputData) - pDataPilotTable->SetFilterOutputPosition(aOutputPosition); pDataPilotTable->SetSourceQueryParam(aFilterFields); - if (bConditionSourceRange) - pDataPilotTable->SetFilterSourceRange(aConditionSourceRangeAddress); } void ScXMLDPFilterContext::AddFilterField (const ScQueryEntry& aFilterField) diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index 936170a1624a..ce006dc9e399 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -187,7 +187,6 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, { // This is an external ref cache table. pExternalRefInfo.reset(new ScXMLExternalTabData); - pExternalRefInfo->maFileUrl = aExtUrl; ScDocument* pDoc = GetScImport().GetDocument(); if (pDoc) { diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 5ada4b365f50..2b194d172d16 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -30,7 +30,6 @@ namespace sax_fastparser { class FastAttributeList; } struct ScXMLExternalTabData { - OUString maFileUrl; ScExternalRefCache::TableTypeRef mpCacheTable; sal_Int32 mnRow; sal_Int32 mnCol; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 878bb48aed10..81b8cf79460e 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -584,8 +584,6 @@ struct ScShapeRange ScShapeChildVec maBackShapes; ScShapeChildVec maForeShapes; // inclusive internal shapes ScShapeChildVec maControls; - tools::Rectangle maPixelRect; - MapMode maMapMode; ScIAccessibleViewForwarder maViewForwarder; }; @@ -1010,8 +1008,6 @@ void ScShapeChildren::FillShapes(const tools::Rectangle& aPixelPaintRect, const tools::Rectangle aRect2(Point(0,0), mpAccDoc->GetBoundingBoxOnScreen().GetSize()); aClippedPixelPaintRect = aPixelPaintRect.GetIntersection(aRect2); } - maShapeRanges[nRangeId].maPixelRect = aClippedPixelPaintRect; - maShapeRanges[nRangeId].maMapMode = aMapMode; ScIAccessibleViewForwarder aViewForwarder(mpViewShell, mpAccDoc, aMapMode); maShapeRanges[nRangeId].maViewForwarder = aViewForwarder; const size_t nCount(pPage->GetObjCount()); diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 0cd1d7ac24d5..4370cbb66db2 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -284,7 +284,6 @@ void ScAccessibleSpreadsheet::ConstructScAccessibleSpreadsheet( mnTab = nTab; mbDelIns = false; mbIsFocusSend = false; - maVisCells = GetVisCells(GetVisArea(mpViewShell, meSplitPos)); if (mpViewShell) { mpViewShell->AddAccessibilityObject(*this); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 7f36443d802d..e7fc510ef308 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1411,10 +1411,9 @@ ScExternalRefCache::DocItem* ScExternalRefCache::getDocItem(sal_uInt16 nFileId) return &itrDoc->second; } -ScExternalRefLink::ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId, const OUString& rFilter) : +ScExternalRefLink::ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId) : ::sfx2::SvBaseLink(::SfxLinkUpdateMode::ONCALL, SotClipboardFormatId::SIMPLE_FILE), mnFileId(nFileId), - maFilterName(rFilter), mpDoc(pDoc), mbDoRefresh(true) { @@ -1458,7 +1457,6 @@ void ScExternalRefLink::Closed() ScDocShell* pDocShell = ScDocShell::GetViewData()->GetDocShell(); ScDocShellModificator aMod(*pDocShell); pMgr->switchSrcFile(mnFileId, aFile, aFilter); - maFilterName = aFilter; aMod.SetDocumentModified(); } @@ -2591,7 +2589,7 @@ void ScExternalRefManager::maybeLinkExternalFile( sal_uInt16 nFileId, bool bDefe SAL_WARN( "sc.ui", "ScExternalRefManager::maybeLinkExternalFile: pLinkMgr==NULL"); return; } - ScExternalRefLink* pLink = new ScExternalRefLink(mpDoc, nFileId, aFilter); + ScExternalRefLink* pLink = new ScExternalRefLink(mpDoc, nFileId); OSL_ENSURE(pFileName, "ScExternalRefManager::maybeLinkExternalFile: file name pointer is NULL"); pLinkMgr->InsertFileLink(*pLink, OBJECT_CLIENT_FILE, *pFileName, (aFilter.isEmpty() && bDeferFilterDetection ? nullptr : &aFilter)); diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index b425e92faff1..543526bc596f 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -216,7 +216,6 @@ private: std::unique_ptr<ScRangeList> mpMarkedRanges; ScAccessibleDocument* mpAccDoc; rtl::Reference<ScAccessibleCell> mpAccCell; - tools::Rectangle maVisCells; ScSplitPos meSplitPos; ScAddress maActiveCell; SCTAB mnTab; diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index ac4e8f5ed6e8..f3595722398c 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -49,7 +49,6 @@ private: long nDisplayStart; // same as above, relative to the start of counting DateTime aDateTime; long nTotalPages; - Size aPageSize; // for GetOptimalZoom ScPrintState aState; std::unique_ptr<ScPreviewLocationData> pLocationData; // stores table layout for accessibility API std::unique_ptr<FmFormView> pDrawView; diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx index d55babb13174..38c9d6b4cabd 100644 --- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx +++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx @@ -37,10 +37,6 @@ class ScDataProviderBaseControl : public VclContainer, VclPtr<Edit> maEditID; VclPtr<PushButton> mpApplyBtn; - OUString maOldProvider; - OUString maURL; - OUString maID; - Link<Window*, void> const maImportCallback; DECL_LINK(ProviderSelectHdl, ListBox&, void); @@ -163,19 +159,16 @@ void ScDataProviderBaseControl::updateApplyBtn(bool bValidConfig) IMPL_LINK_NOARG(ScDataProviderBaseControl, ProviderSelectHdl, ListBox&, void) { isValid(); - maOldProvider = maProviderList->GetSelectedEntry(); } IMPL_LINK_NOARG(ScDataProviderBaseControl, IDEditHdl, Edit&, void) { isValid(); - maID = maEditID->GetText(); } IMPL_LINK_NOARG(ScDataProviderBaseControl, URLEditHdl, Edit&, void) { isValid(); - maURL = maEditURL->GetText(); } IMPL_LINK_NOARG(ScDataProviderBaseControl, ApplyBtnHdl, Button*, void) diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index ed885a16fa01..51390e200369 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -47,7 +47,6 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterfa { mxSheetConditionalEntries = lcl_getScVbaFormatConditionsPtr( moFormatConditions )->getSheetConditionalEntries(); - mxSheetConditionalEntry = _xSheetConditionalEntry; msStyleName = mxStyle->getName(); } diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index 892f6eb6e74e..dbf503bae84c 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -31,7 +31,6 @@ typedef ScVbaCondition< ov::excel::XFormatCondition > ScVbaFormatCondition_BASE class ScVbaFormatCondition final : public ScVbaFormatCondition_BASE { OUString msStyleName; - css::uno::Reference< css::sheet::XSheetConditionalEntry > mxSheetConditionalEntry; css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries; css::uno::Reference< ov::excel::XFormatConditions> moFormatConditions; css::uno::Reference< ov::excel::XStyle > mxStyle; diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 26b1f4fa6825..fe01ce5ad169 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -278,7 +278,6 @@ void ScPreview::CalcPages() nTabStart = nThisStart; aPrintFunc.GetPrintState( aState ); - aPageSize = aPrintFunc.GetPageSize(); } } diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index e144046b7fd7..96248b21bd31 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1032,7 +1032,6 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) if ( pRepeatCol ) { aAreaParam.bRepeatCol = true; - aAreaParam.aRepeatCol = *pRepeatCol; nRepeatStartCol = pRepeatCol->aStart.Col(); nRepeatEndCol = pRepeatCol->aEnd .Col(); } @@ -1045,7 +1044,6 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) if ( pRepeatRow ) { aAreaParam.bRepeatRow = true; - aAreaParam.aRepeatRow = *pRepeatRow; nRepeatStartRow = pRepeatRow->aStart.Row(); nRepeatEndRow = pRepeatRow->aEnd .Row(); } |