diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-17 16:23:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-21 08:32:18 +0200 |
commit | e8939b098b381605d12f08acef42ad0018e0a471 (patch) | |
tree | c7c3021d1bd9abb8adf8bb63ea0657658f06bc76 | |
parent | de4839e66d3d195315729b95cc144cdab96b6e74 (diff) |
loplugin:virtualdead unused param in CreateSvxFormatCellsDialog
Change-Id: I8455c10d62ae8c3c3e6e543301f8c69a1189456a
Reviewed-on: https://gerrit.libreoffice.org/81179
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | compilerplugins/clang/virtualdead.unusedparams.results | 3 | ||||
-rw-r--r-- | cui/qa/unit/cui-dialogs-test.cxx | 2 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 2 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.hxx | 2 | ||||
-rw-r--r-- | include/svx/svxdlg.hxx | 2 | ||||
-rw-r--r-- | svx/source/table/tablecontroller.cxx | 3 |
6 files changed, 5 insertions, 9 deletions
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 353e844c8218..0e644962f556 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -190,9 +190,6 @@ include/svx/svdhdl.hxx:242 include/svx/svdundo.hxx:69 class rtl::OUString SdrUndoAction::GetSdrRepeatComment(class SdrView &,)const 0 -include/svx/svxdlg.hxx:463 - class VclPtr<class SfxAbstractTabDialog> SvxAbstractDialogFactory::CreateSvxFormatCellsDialog(class weld::Window *,const class SfxItemSet *,const class SdrModel &,const class SdrObject *,) - 1110 include/vcl/accessibletable.hxx:91 class tools::Rectangle vcl::table::IAccessibleTable::GetFieldCharacterBounds(int,int,int,) 001 diff --git a/cui/qa/unit/cui-dialogs-test.cxx b/cui/qa/unit/cui-dialogs-test.cxx index 781dc364a960..fe8091a8e33e 100644 --- a/cui/qa/unit/cui-dialogs-test.cxx +++ b/cui/qa/unit/cui-dialogs-test.cxx @@ -75,7 +75,7 @@ VclPtr<VclAbstractDialog> CuiDialogsTest::createDialogByID(sal_uInt32 nID) case 0: // "cui/ui/formatcellsdialog.ui" { pReturnDialog = mpFact->CreateSvxFormatCellsDialog( - nullptr, mxAttr.get(), *mxModel, nullptr); + nullptr, mxAttr.get(), *mxModel); break; } diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 1e422f1fa85e..80e28b271b63 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1597,7 +1597,7 @@ VclPtr<SfxAbstractLinksDialog> AbstractDialogFactory_Impl::CreateLinksDialog(wel return VclPtr<AbstractLinksDialog_Impl>::Create(std::move(xLinkDlg)); } -VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel, const SdrObject* /*pObj*/) +VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel) { return VclPtr<CuiAbstractTabController_Impl>::Create(std::make_unique<SvxFormatCellsDialog>(pParent, pAttr, rModel)); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 207405024dde..174417214907 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -922,7 +922,7 @@ public: const sal_uInt16 _nInitiallySelectedEvent ) override; - virtual VclPtr<SfxAbstractTabDialog> CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel, const SdrObject* pObj) override; + virtual VclPtr<SfxAbstractTabDialog> CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel) override; virtual VclPtr<SvxAbstractSplitTableDialog> CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, long nMaxVertical) override; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index b3aab075feae..fab6290d849e 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -460,7 +460,7 @@ public: const sal_uInt16 _nInitiallySelectedEvent ) = 0; - virtual VclPtr<SfxAbstractTabDialog> CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel, const SdrObject* pObj )=0; + virtual VclPtr<SfxAbstractTabDialog> CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel )=0; virtual VclPtr<SvxAbstractSplitTableDialog> CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, long nMaxVertical) = 0; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index efec00fdd95f..9c893531b451 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -919,8 +919,7 @@ void SvxTableController::onFormatTable(const SfxRequest& rReq) ScopedVclPtr<SfxAbstractTabDialog> xDlg( pFact->CreateSvxFormatCellsDialog( rReq.GetFrameWeld(), &aNewAttr, - rModel, - &rTableObj) ); + rModel) ); // Even Cancel Button is returning positive(101) value, if (xDlg->Execute() == RET_OK) |