compilerplugins/clang/virtualdead.unusedparams.results | 6 -----
cui/qa/unit/cui-dialogs-test.cxx | 2 -
cui/source/factory/dlgfact.cxx | 2 -
cui/source/factory/dlgfact.hxx | 2 -
include/svx/svdundo.hxx | 16 +++++++--------
include/svx/svxdlg.hxx | 2 -
svx/source/svdraw/svdundo.cxx | 18 ++++++++---------
svx/source/table/tablecontroller.cxx | 3 --
8 files changed, 22 insertions(+), 29 deletions(-)
New commits:
commit d5ec8bc929d243fbd707b916883d0a192d5bb072
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Oct 17 16:31:21 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Oct 21 08:32:27 2019 +0200
loplugin:virtualdead unused param in GetSdrRepeatComment
Change-Id: I0a27d1a200e8af50adf98de2c5ba7d3c7e199b00
Reviewed-on: https://gerrit.libreoffice.org/81180
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results
b/compilerplugins/clang/virtualdead.unusedparams.results
index 0e644962f556..08ae23369b67 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -187,9 +187,6 @@ include/svx/selectioncontroller.hxx:48
include/svx/svdhdl.hxx:242
void SdrHdl::onHelpRequest(const class HelpEvent &,)
0
-include/svx/svdundo.hxx:69
- class rtl::OUString SdrUndoAction::GetSdrRepeatComment(class SdrView
&,)const
- 0
include/vcl/accessibletable.hxx:91
class tools::Rectangle
vcl::table::IAccessibleTable::GetFieldCharacterBounds(int,int,int,)
001
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 7b100cb9314b..7a33a71297c6 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -66,7 +66,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rView) override;
virtual OUString GetRepeatComment(SfxRepeatTarget& rView) const override;
- virtual OUString GetSdrRepeatComment(SdrView& rView) const;
+ virtual OUString GetSdrRepeatComment() const;
virtual bool CanSdrRepeat(SdrView& rView) const;
virtual void SdrRepeat(SdrView& rView);
@@ -103,7 +103,7 @@ public:
void SetComment(const OUString& rStr) { aComment=rStr; }
void SetObjDescription(const OUString& rStr) { aObjDescription=rStr; }
virtual OUString GetComment() const override;
- virtual OUString GetSdrRepeatComment(SdrView& rView) const override;
+ virtual OUString GetSdrRepeatComment() const override;
virtual void Undo() override;
virtual void Redo() override;
@@ -172,7 +172,7 @@ public:
virtual void Redo() override;
virtual OUString GetComment() const override;
- virtual OUString GetSdrRepeatComment(SdrView& rView) const override;
+ virtual OUString GetSdrRepeatComment() const override;
};
/**
@@ -192,7 +192,7 @@ public:
virtual void Redo() override;
virtual OUString GetComment() const override;
- virtual OUString GetSdrRepeatComment(SdrView& rView) const override;
+ virtual OUString GetSdrRepeatComment() const override;
virtual void SdrRepeat(SdrView& rView) override;
virtual bool CanSdrRepeat(SdrView& rView) const override;
@@ -296,7 +296,7 @@ public:
virtual void Redo() override;
virtual OUString GetComment() const override;
- virtual OUString GetSdrRepeatComment(SdrView& rView) const override;
+ virtual OUString GetSdrRepeatComment() const override;
virtual void SdrRepeat(SdrView& rView) override;
virtual bool CanSdrRepeat(SdrView& rView) const override;
@@ -413,7 +413,7 @@ public:
virtual void Redo() override;
virtual OUString GetComment() const override;
- virtual OUString GetSdrRepeatComment(SdrView& rView) const override;
+ virtual OUString GetSdrRepeatComment() const override;
virtual void SdrRepeat(SdrView& rView) override;
virtual bool CanSdrRepeat(SdrView& rView) const override;
@@ -569,7 +569,7 @@ public:
virtual void Redo() override;
virtual OUString GetComment() const override;
- virtual OUString GetSdrRepeatComment(SdrView& rView) const override;
+ virtual OUString GetSdrRepeatComment() const override;
virtual void SdrRepeat(SdrView& rView) override;
virtual bool CanSdrRepeat(SdrView& rView) const override;
@@ -607,7 +607,7 @@ public:
SdrUndoCopyPage(SdrPage& rNewPg): SdrUndoNewPage(rNewPg) {}
virtual OUString GetComment() const override;
- virtual OUString GetSdrRepeatComment(SdrView& rView) const override;
+ virtual OUString GetSdrRepeatComment() const override;
virtual void SdrRepeat(SdrView& rView) override;
virtual bool CanSdrRepeat(SdrView& rView) const override;
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 8d79d0c65b20..e27e6cf42c58 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -84,7 +84,7 @@ void SdrUndoAction::Repeat(SfxRepeatTarget& rView)
OUString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const
{
SdrView* pV=dynamic_cast<SdrView*>( &rView );
- if (pV!=nullptr) return GetSdrRepeatComment(*pV);
+ if (pV!=nullptr) return GetSdrRepeatComment();
return OUString();
}
@@ -97,7 +97,7 @@ void SdrUndoAction::SdrRepeat(SdrView& /*rView*/)
{
}
-OUString SdrUndoAction::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoAction::GetSdrRepeatComment() const
{
return OUString();
}
@@ -187,7 +187,7 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView)
} // switch
}
-OUString SdrUndoGroup::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoGroup::GetSdrRepeatComment() const
{
return aComment.replaceAll("%1", SvxResId(STR_ObjNameSingulPlural));
}
@@ -492,7 +492,7 @@ OUString SdrUndoAttrObj::GetComment() const
}
}
-OUString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoAttrObj::GetSdrRepeatComment() const
{
if(bStyleSheet)
{
@@ -538,7 +538,7 @@ bool SdrUndoMoveObj::CanSdrRepeat(SdrView& rView) const
return rView.AreObjectsMarked();
}
-OUString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoMoveObj::GetSdrRepeatComment() const
{
return ImpGetDescriptionStr(STR_EditMove,true);
}
@@ -784,7 +784,7 @@ bool SdrUndoDelObj::CanSdrRepeat(SdrView& rView) const
return rView.AreObjectsMarked();
}
-OUString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoDelObj::GetSdrRepeatComment() const
{
return ImpGetDescriptionStr(STR_EditDelete,true);
}
@@ -1081,7 +1081,7 @@ OUString SdrUndoObjSetText::GetComment() const
return ImpGetDescriptionStr(STR_UndoObjSetText);
}
-OUString SdrUndoObjSetText::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoObjSetText::GetSdrRepeatComment() const
{
return ImpGetDescriptionStr(STR_UndoObjSetText);
}
@@ -1417,7 +1417,7 @@ OUString SdrUndoDelPage::GetComment() const
return ImpGetDescriptionStr(STR_UndoDelPage);
}
-OUString SdrUndoDelPage::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoDelPage::GetSdrRepeatComment() const
{
return ImpGetDescriptionStr(STR_UndoDelPage);
}
@@ -1512,7 +1512,7 @@ OUString SdrUndoCopyPage::GetComment() const
return ImpGetDescriptionStr(STR_UndoCopPage);
}
-OUString SdrUndoCopyPage::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoCopyPage::GetSdrRepeatComment() const
{
return ImpGetDescriptionStr(STR_UndoCopPage);
}
commit e8939b098b381605d12f08acef42ad0018e0a471
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Oct 17 16:23:58 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Oct 21 08:32:18 2019 +0200
loplugin:virtualdead unused param in CreateSvxFormatCellsDialog
Change-Id: I8455c10d62ae8c3c3e6e543301f8c69a1189456a
Reviewed-on: https://gerrit.libreoffice.org/81179
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
