diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-24 16:05:34 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-25 08:25:09 +0200 |
commit | 85c758a4618d3a485f778bda5b20a8221161e399 (patch) | |
tree | cdd2e94f660d10af379d27dfcf216f499b353acb /sc/source | |
parent | a78182a993288680b04d1329536af5953e8ca31c (diff) |
loplugin:unusedfields in include/sfx2/
Change-Id: I3eb27ed10e82ee56b33866ac576c1b1f8c9756b9
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/ui/attrdlg/attrdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 28 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/attrdlg.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/inc/hfedtdlg.hxx | 22 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/hfedtdlg.cxx | 45 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tphf.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsha.cxx | 2 |
9 files changed, 54 insertions, 60 deletions
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 0002c815ecd7..8c5005f60e63 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -34,8 +34,8 @@ #include <editeng/flstitem.hxx> #include <sfx2/app.hxx> -ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, vcl::Window* pParent, const SfxItemSet* pCellAttrs) - : SfxTabDialog(pFrameP, pParent, "FormatCellsDialog", "modules/scalc/ui/formatcellsdialog.ui", pCellAttrs) +ScAttrDlg::ScAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs) + : SfxTabDialog(pParent, "FormatCellsDialog", "modules/scalc/ui/formatcellsdialog.ui", pCellAttrs) { SvtCJKOptions aCJKOptions; SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 3f7e5a0eb8e6..c517901aa198 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -904,15 +904,13 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions return new AbstractScImportOptionsDlg_Impl( pDlg ); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg(SfxViewFrame* pFrame, - vcl::Window* pParent, const SfxItemSet* pCellAttrs) +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs) { - VclPtr<SfxTabDialog> pDlg = VclPtr<ScAttrDlg>::Create(pFrame, pParent, pCellAttrs); + VclPtr<SfxTabDialog> pDlg = VclPtr<ScAttrDlg>::Create(pParent, pCellAttrs); return new ScAbstractTabDialog_Impl(pDlg); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame, - vcl::Window* pParent, +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId ) @@ -923,36 +921,36 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF { case RID_SCDLG_HFED_HEADER: case RID_SCDLG_HFEDIT_HEADER: - pDlg = VclPtr<ScHFEditHeaderDlg>::Create(pFrame, pParent, rCoreSet, rPageStyle); + pDlg = VclPtr<ScHFEditHeaderDlg>::Create(pParent, rCoreSet, rPageStyle); break; case RID_SCDLG_HFED_FOOTER: case RID_SCDLG_HFEDIT_FOOTER: - pDlg = VclPtr<ScHFEditFooterDlg>::Create(pFrame, pParent, rCoreSet, rPageStyle); + pDlg = VclPtr<ScHFEditFooterDlg>::Create(pParent, rCoreSet, rPageStyle); break; case RID_SCDLG_HFEDIT_LEFTHEADER: - pDlg = VclPtr<ScHFEditLeftHeaderDlg>::Create(pFrame, pParent, rCoreSet, rPageStyle); + pDlg = VclPtr<ScHFEditLeftHeaderDlg>::Create(pParent, rCoreSet, rPageStyle); break; case RID_SCDLG_HFEDIT_RIGHTHEADER: - pDlg = VclPtr<ScHFEditRightHeaderDlg>::Create(pFrame, pParent, rCoreSet, rPageStyle); + pDlg = VclPtr<ScHFEditRightHeaderDlg>::Create(pParent, rCoreSet, rPageStyle); break; case RID_SCDLG_HFEDIT_LEFTFOOTER: - pDlg = VclPtr<ScHFEditLeftFooterDlg>::Create(pFrame, pParent, rCoreSet, rPageStyle); + pDlg = VclPtr<ScHFEditLeftFooterDlg>::Create(pParent, rCoreSet, rPageStyle); break; case RID_SCDLG_HFEDIT_RIGHTFOOTER: - pDlg = VclPtr<ScHFEditRightFooterDlg>::Create(pFrame, pParent, rCoreSet, rPageStyle); + pDlg = VclPtr<ScHFEditRightFooterDlg>::Create(pParent, rCoreSet, rPageStyle); break; case RID_SCDLG_HFEDIT_SHDR: - pDlg = VclPtr<ScHFEditSharedHeaderDlg>::Create(pFrame, pParent, rCoreSet, rPageStyle); + pDlg = VclPtr<ScHFEditSharedHeaderDlg>::Create(pParent, rCoreSet, rPageStyle); break; case RID_SCDLG_HFEDIT_SFTR: - pDlg = VclPtr<ScHFEditSharedFooterDlg>::Create(pFrame, pParent, rCoreSet, rPageStyle); + pDlg = VclPtr<ScHFEditSharedFooterDlg>::Create(pParent, rCoreSet, rPageStyle); break; case RID_SCDLG_HFEDIT_ALL: - pDlg = VclPtr<ScHFEditAllDlg>::Create(pFrame, pParent, rCoreSet, rPageStyle); + pDlg = VclPtr<ScHFEditAllDlg>::Create(pParent, rCoreSet, rPageStyle); break; default: case RID_SCDLG_HFEDIT: - pDlg = VclPtr<ScHFEditActiveDlg>::Create(pFrame, pParent, rCoreSet, rPageStyle); + pDlg = VclPtr<ScHFEditActiveDlg>::Create(pParent, rCoreSet, rPageStyle); break; } diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 5971f6c8ec7f..40ef31749c9b 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -528,12 +528,10 @@ public: bool bMultiByte = false, bool bOnlyDbtoolsEncodings = false, bool bImport = true ) override; - virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, - vcl::Window* pParent, + virtual SfxAbstractTabDialog * CreateScAttrDlg( vcl::Window* pParent, const SfxItemSet* pCellAttrs ) override; - virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, - vcl::Window* pParent, + virtual SfxAbstractTabDialog * CreateScHFEditDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId = RID_SCDLG_HFEDIT ) override; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index d35f4f835d66..0a0a7c394b0d 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1714,7 +1714,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller, ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg( SfxViewFrame::Current(), + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg( GetActiveDialogParent(), rStyleSet, aStr, diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 2056c99806d4..e790bc78f1fa 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -29,8 +29,7 @@ class SfxItemSet; class ScAttrDlg : public SfxTabDialog { public: - ScAttrDlg( SfxViewFrame* pFrame, - vcl::Window* pParent, + ScAttrDlg( vcl::Window* pParent, const SfxItemSet* pCellAttrs ); virtual ~ScAttrDlg(); diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index dfacb8e37031..712b0902d9f1 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -29,7 +29,7 @@ class ScHFEditDlg : public SfxTabDialog { SvxNumType eNumType; protected: - ScHFEditDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, const OUString& rID, const OUString& rUIXMLDescription ); public: @@ -39,70 +39,70 @@ public: class ScHFEditHeaderDlg : public ScHFEditDlg { public: - ScHFEditHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditHeaderDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditFooterDlg : public ScHFEditDlg { public: - ScHFEditFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditFooterDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditLeftHeaderDlg : public ScHFEditDlg { public: - ScHFEditLeftHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditLeftHeaderDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditRightHeaderDlg : public ScHFEditDlg { public: - ScHFEditRightHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditRightHeaderDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditLeftFooterDlg : public ScHFEditDlg { public: - ScHFEditLeftFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditLeftFooterDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditRightFooterDlg : public ScHFEditDlg { public: - ScHFEditRightFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditRightFooterDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditSharedHeaderDlg : public ScHFEditDlg { public: - ScHFEditSharedHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditSharedHeaderDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditSharedFooterDlg : public ScHFEditDlg { public: - ScHFEditSharedFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditSharedFooterDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditAllDlg : public ScHFEditDlg { public: - ScHFEditAllDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditAllDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditActiveDlg : public ScHFEditDlg { public: - ScHFEditActiveDlg(SfxViewFrame* pFrame, vcl::Window* pParent, + ScHFEditActiveDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 14ddddbf1df4..637532239e70 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -41,12 +41,11 @@ static_cast<const SvxSetItem&>((set).Get(ATTR_PAGE_FOOTERSET)).GetItemSet(). \ Get(ATTR_PAGE_SHARED)).GetValue() -ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, - vcl::Window* pParent, +ScHFEditDlg::ScHFEditDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, const OUString& rID, const OUString& rUIXMLDescription ) - : SfxTabDialog( pFrameP, pParent, rID, rUIXMLDescription, &rCoreSet ) + : SfxTabDialog( pParent, rID, rUIXMLDescription, &rCoreSet ) { eNumType = static_cast<const SvxPageItem&>(rCoreSet.Get(ATTR_PAGE)).GetNumType(); @@ -57,73 +56,73 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, SetText( aTmp ); } -ScHFEditHeaderDlg::ScHFEditHeaderDlg( SfxViewFrame* pFrameP, +ScHFEditHeaderDlg::ScHFEditHeaderDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) - : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, + : ScHFEditDlg( pParent, rCoreSet, rPageStyle, "HeaderDialog", "modules/scalc/ui/headerdialog.ui" ) { AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr ); AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr ); } -ScHFEditFooterDlg::ScHFEditFooterDlg( SfxViewFrame* pFrameP, +ScHFEditFooterDlg::ScHFEditFooterDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) - : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, + : ScHFEditDlg( pParent, rCoreSet, rPageStyle, "FooterDialog", "modules/scalc/ui/footerdialog.ui" ) { AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr ); AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr ); } -ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( SfxViewFrame* pFrameP, +ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) - : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, + : ScHFEditDlg( pParent, rCoreSet, rPageStyle, "LeftHeaderDialog", "modules/scalc/ui/leftheaderdialog.ui" ) { AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr ); } -ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( SfxViewFrame* pFrameP, +ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) - : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, + : ScHFEditDlg( pParent, rCoreSet, rPageStyle, "RightHeaderDialog", "modules/scalc/ui/rightheaderdialog.ui" ) { AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr ); } -ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( SfxViewFrame* pFrameP, +ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) - : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, + : ScHFEditDlg( pParent, rCoreSet, rPageStyle, "LeftFooterDialog", "modules/scalc/ui/leftfooterdialog.ui" ) { AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr ); } -ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( SfxViewFrame* pFrameP, +ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) - : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, + : ScHFEditDlg( pParent, rCoreSet, rPageStyle, "RightFooterDialog", "modules/scalc/ui/rightfooterdialog.ui" ) { AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr ); } -ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( SfxViewFrame* pFrameP, +ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) - : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, + : ScHFEditDlg( pParent, rCoreSet, rPageStyle, "SharedHeaderDialog", "modules/scalc/ui/sharedheaderdialog.ui" ) { AddTabPage( "header", ScRightHeaderEditPage::Create, nullptr ); @@ -131,11 +130,11 @@ ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( SfxViewFrame* pFrameP, AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr ); } -ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( SfxViewFrame* pFrameP, +ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) - : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, + : ScHFEditDlg( pParent, rCoreSet, rPageStyle, "SharedFooterDialog", "modules/scalc/ui/sharedfooterdialog.ui" ) { AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr ); @@ -143,11 +142,11 @@ ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( SfxViewFrame* pFrameP, AddTabPage( "footer", ScRightFooterEditPage::Create, nullptr ); } -ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP, +ScHFEditAllDlg::ScHFEditAllDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) - : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, + : ScHFEditDlg( pParent, rCoreSet, rPageStyle, "AllHeaderFooterDialog", "modules/scalc/ui/allheaderfooterdialog.ui" ) { AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr ); @@ -156,11 +155,11 @@ ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP, AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr ); } -ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP, +ScHFEditActiveDlg::ScHFEditActiveDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) - : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, + : ScHFEditDlg( pParent, rCoreSet, rPageStyle, "HeaderFooterDialog", "modules/scalc/ui/headerfooterdialog.ui" ) { const SvxPageItem& rPageItem = static_cast<const SvxPageItem&>( diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 614da79e5395..f69edd00c25a 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -187,7 +187,7 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void) OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg( - pViewSh->GetViewFrame(), this, aDataSet, aStrPageStyle, nResId)); + this, aDataSet, aStrPageStyle, nResId)); OSL_ENSURE(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 9c451be934ee..7eebef015072 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -517,7 +517,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - pDlg.reset(pFact->CreateScAttrDlg(GetViewFrame(), GetDialogParent(), pOldSet.get())); + pDlg.reset(pFact->CreateScAttrDlg(GetDialogParent(), pOldSet.get())); if (!rName.isEmpty()) pDlg->SetCurPageId(rName); |