From ec3f72415850bd865eb030cf2b7edb55b99d4756 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 26 Nov 2015 16:01:56 +0200 Subject: loplugin:unusedfields Change-Id: Icac4ac1a2614e72bc9ff070819533e09eeb1a864 --- sc/source/filter/excel/xiformula.cxx | 5 +---- sc/source/filter/inc/orcusinterface.hxx | 4 ---- sc/source/filter/inc/qproform.hxx | 2 -- sc/source/filter/inc/richstringcontext.hxx | 1 - sc/source/ui/attrdlg/scdlgfact.cxx | 4 ++-- sc/source/ui/attrdlg/scdlgfact.hxx | 2 +- sc/source/ui/condformat/condformatmgr.cxx | 3 +-- sc/source/ui/inc/acredlin.hxx | 1 - sc/source/ui/inc/condformatmgr.hxx | 3 +-- sc/source/ui/inc/highred.hxx | 2 -- sc/source/ui/miscdlgs/acredlin.cxx | 1 - sc/source/ui/miscdlgs/highred.cxx | 1 - sc/source/ui/view/cellsh1.cxx | 2 +- 13 files changed, 7 insertions(+), 24 deletions(-) (limited to 'sc/source') diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index 346621455788..9a919cbabc17 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -38,13 +38,10 @@ public: const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr ); -private: - XclFunctionProvider maFuncProv; /// Excel function data provider. }; XclImpFmlaCompImpl::XclImpFmlaCompImpl( const XclImpRoot& rRoot ) : - XclImpRoot( rRoot ), - maFuncProv( rRoot ) + XclImpRoot( rRoot ) { } diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index 36dcbdcbedf2..eb0011c5e209 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -139,7 +139,6 @@ private: ScDocument& mrDoc; std::unique_ptr mpCurrentFormat; - std::unique_ptr mpCurrentEntry; condformat::ScFormatEntryType meEntryType; }; @@ -197,9 +196,6 @@ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet ScOrcusSheetProperties maProperties; ScOrcusConditionalFormat maConditionalFormat; - typedef std::map SharedFormulaContainer; - SharedFormulaContainer maSharedFormulas; - int mnCellCount; void cellInserted(); diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index dbf575aa9c07..b26efe01daa2 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -55,8 +55,6 @@ class QProToSc : public ConverterBase { private: TokenId mnAddToken; - TokenId mnSubToken; - TokenId mn0Token; SvStream& maIn; public: diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index 67685c8f9c93..43ddb9aa0dab 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -41,7 +41,6 @@ private: RichStringRef mxString; /// Processed string. RichStringPortionRef mxPortion; /// Processed portion in the string. RichStringPhoneticRef mxPhonetic; /// Processed phonetic text portion. - FontRef mxFont; /// Processed font of the portion. }; template< typename ParentType > diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index c517901aa198..a7a2540006f1 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -632,13 +632,13 @@ AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( } AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - const ScAddress& rPos, int nId ) + int nId ) { VclPtr pDlg; switch( nId ) { case RID_SCDLG_COND_FORMAT_MANAGER: - pDlg = VclPtr::Create( pParent, pDoc, pFormatList, rPos ); + pDlg = VclPtr::Create( pParent, pDoc, pFormatList ); break; default: break; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 40ef31749c9b..014057e5d3d3 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -409,7 +409,7 @@ public: virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) override; virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - const ScAddress& rPos, int nId ) override; + int nId ) override; virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) override; diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index e3afe8807db4..30c213b43d41 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -102,11 +102,10 @@ void ScCondFormatManagerWindow::setColSizes() SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } -ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos): +ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList): ModalDialog(pParent, "CondFormatManager", "modules/scalc/ui/condformatmanager.ui"), mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : nullptr), mpDoc(pDoc), - maPos(rPos), mbModified(false) { SvSimpleTableContainer *pContainer = get("CONTAINER"); diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 64cae06eb11c..c5ce73de1693 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -61,7 +61,6 @@ private: VclPtr m_pAcceptChgCtr; ScViewData* pViewData; ScDocument* pDoc; - ScRangeName aLocalRangeName; VclPtr pTPFilter; VclPtr pTPView; VclPtr pTheView; // #i48648 now SvHeaderTabListBox diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 003746475f08..013f71622a04 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -47,7 +47,7 @@ public: class ScCondFormatManagerDlg : public ModalDialog { public: - ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos); + ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList); virtual ~ScCondFormatManagerDlg(); virtual void dispose() override; @@ -65,7 +65,6 @@ private: VclPtr m_pCtrlManager; ScDocument* mpDoc; - ScAddress maPos; DECL_LINK_TYPED(RemoveBtnHdl, Button*, void); DECL_LINK_TYPED(EditBtnClickHdl, Button*, void); diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 1b9220a8e5a0..b53d51edf9cf 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -54,8 +54,6 @@ private: ScViewData* pViewData; ScDocument* pDoc; - ScRangeName aLocalRangeName; - ScRangeList aRangeList; ScChangeViewSettings aChangeViewSet; void Init(); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 1eff56088626..9afd0aa1ae42 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -85,7 +85,6 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui"), pViewData ( ptrViewData ), pDoc ( ptrViewData->GetDocument() ), - aLocalRangeName ( *(pDoc->GetRangeName()) ), aStrInsertCols (SC_RESSTR(STR_CHG_INSERT_COLS)), aStrInsertRows (SC_RESSTR(STR_CHG_INSERT_ROWS)), aStrInsertTabs (SC_RESSTR(STR_CHG_INSERT_TABS)), diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 020066d7c99f..dd8f2fc98e9f 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -44,7 +44,6 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl: "modules/scalc/ui/showchangesdialog.ui") , pViewData(ptrViewData) , pDoc(ptrViewData->GetDocument()) - , aLocalRangeName(*(pDoc->GetRangeName())) { m_pFilterCtr = VclPtr::Create(get("box")); get(m_pHighlightBox, "showchanges"); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 4c332daaeeca..e4c790b7bb93 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2438,7 +2438,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScConditionalFormatList* pList = pDoc->GetCondFormList( aPos.Tab() ); std::unique_ptr pDlg(pFact->CreateScCondFormatMgrDlg( - pTabViewShell->GetDialogParent(), pDoc, pList, aPos, RID_SCDLG_COND_FORMAT_MANAGER)); + pTabViewShell->GetDialogParent(), pDoc, pList, RID_SCDLG_COND_FORMAT_MANAGER)); short nRet = pDlg->Execute(); if(nRet == RET_OK && pDlg->CondFormatsChanged()) { -- cgit v1.2.3