loplugin:methodcycles

Change-Id: Ie2eeba83bf176d5c2beadc4dc5286e827ddbadfc
Reviewed-on: https://gerrit.libreoffice.org/80155
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 74 insertions, 117 deletions

diff --git a/compilerplugins/clang/methodcycles.partition.results b/compilerplugins/clang/methodcycles.partition.results
index 91537c8ec813..e2d808845e1b 100644
--- a/compilerplugins/clang/methodcycles.partition.results
+++ b/compilerplugins/clang/methodcycles.partition.results
@@ -1,98 +1,14 @@
-callDict size 32
+callDict size 4
 
 
-void writerfilter::ooxml::OOXMLFastContextHandler::setParent(writerfilter::ooxml::OOXMLFastContextHandler *)
-writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:122
-
-int SdrMarkView::GetMarkedPointCount() const
-include/svx/svdmrkv.hxx:314
-
-void SvxTextForwarder::SetUpdateModeForAcc(bool)
-include/editeng/unoedsrc.hxx:218
-
-bool psp::PrinterInfoManager::writePrinterConfig()
-vcl/inc/printerinfomanager.hxx:172
-
-void sdr::overlay::OverlayManager::restoreBackground(const vcl::Region &) const
-include/svx/sdr/overlay/overlaymanager.hxx:107
-
-bool psp::PrinterInfoManager::setDefaultPrinter(const rtl::OUString &)
-vcl/inc/printerinfomanager.hxx:176
-
-SdrUndoAction * SdrUndoFactory::CreateUndoMoveLayer(unsigned short,SdrLayerAdmin &,SdrModel &,unsigned short)
-include/svx/svdundo.hxx:758
-
-void writerfilter::dmapper::TableManager::cellPropsByCell(unsigned int,const tools::SvRef<writerfilter::dmapper::TablePropertyMap> &)
-writerfilter/source/dmapper/TableManager.hxx:452
-
-double LwpVirtualLayout::GetColWidth(unsigned short)
-lotuswordpro/source/filter/lwplayout.hxx:102
-
-double slideshow::internal::ShapeAttributeLayer::getCharRotationAngle() const
-slideshow/source/inc/shapeattributelayer.hxx:385
-
-bool SwDrawBase::KeyInput(const KeyEvent &)
-sw/source/uibase/inc/drawbase.hxx:53
-
-void SdrObject::ReformatText()
-include/svx/svdobj.hxx:685
-
-void FormatterBase::SetLocale(const com::sun::star::lang::Locale &)
-include/vcl/field.hxx:78
-
 std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > writerfilter::ooxml::OOXMLFastContextHandler::getType() const
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:88
 
-bool sdr::contact::ObjectContact::isDrawModeBlackWhite() const
-include/svx/sdr/contact/objectcontact.hxx:154
-
-void ScVbaCondition::setFormula1(const com::sun::star::uno::Any &)
-sc/source/ui/vba/vbacondition.hxx:42
-
 void sax_fastparser::FastSaxSerializer::ForMerge::print()
 sax/source/tools/fastserializer.hxx:184
 
-bool SvxTextForwarder::GetUpdateModeForAcc() const
-include/editeng/unoedsrc.hxx:219
-
-rtl::OUString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec &) const
-include/svx/svdobj.hxx:695
-
-bool psp::PrinterInfoManager::removePrinter(const rtl::OUString &,bool)
-vcl/inc/printerinfomanager.hxx:168
-
-bool sdr::contact::ObjectContact::isOutputToWindow() const
-include/svx/sdr/contact/objectcontact.hxx:139
-
-void SfxStyleSheetBase::Load(SvStream &,unsigned short)
-include/svl/style.hxx:135
-
-void SfxObjectShell::PrepareReload()
-include/sfx2/objsh.hxx:440
-
-void SfxObjectShell::InPlaceActivate(bool)
-include/sfx2/objsh.hxx:583
-
-bool sdr::contact::ObjectContact::IsAreaVisible(const basegfx::B2DRange &) const
-include/svx/sdr/contact/objectcontact.hxx:116
+SvTreeListEntry * SvTabListBox::InsertEntryToColumn(const rtl::OUString &,unsigned long,unsigned short,void *)
+include/vcl/svtabbx.hxx:86
 
 void sfx2::sidebar::Deck::PrintWindowSubTree(vcl::Window *,int)
-include/sfx2/sidebar/Deck.hxx:70
-
-void pdfi::PageElement::updateParagraphGeometry(pdfi::Element *)
-sdext/source/pdfimport/inc/genericelements.hxx:257
-
-bool sdr::contact::ObjectContact::isOutputToVirtualDevice() const
-include/svx/sdr/contact/objectcontact.hxx:142
-
-tools::Rectangle SvxViewForwarder::GetVisArea() const
-include/editeng/unoedsrc.hxx:470
-
-bool psp::PrinterInfoManager::addPrinter(const rtl::OUString &,const rtl::OUString &)
-vcl/inc/printerinfomanager.hxx:161
-
-SdrUndoAction * SdrUndoFactory::CreateUndoMoveObject(SdrObject &)
-include/svx/svdundo.hxx:733
-
-SdrObject * SdrObjList::NbcReplaceObject(SdrObject *,unsigned long)
-include/svx/svdpage.hxx:126
+include/sfx2/sidebar/Deck.hxx:69
diff --git a/compilerplugins/clang/methodcycles.py b/compilerplugins/clang/methodcycles.py
index 18b63c71f777..77c812d4ab9a 100755
--- a/compilerplugins/clang/methodcycles.py
+++ b/compilerplugins/clang/methodcycles.py
@@ -33,7 +33,7 @@ def normalizeTypeParams( line ):
 # --------------------------------------------------------------------------------------------
 
 cnt = 0
-with io.open("workdir/loplugin.methodcycles.log2", "rb", buffering=1024*1024) as txt:
+with io.open("workdir/loplugin.methodcycles.log", "rb", buffering=1024*1024) as txt:
     for line in txt:
         tokens = line.strip().split("\t")
         if tokens[0] == "definition:":
diff --git a/compilerplugins/clang/methodcycles.results b/compilerplugins/clang/methodcycles.results
index 19e874c77d27..5b8414cea0fb 100644
--- a/compilerplugins/clang/methodcycles.results
+++ b/compilerplugins/clang/methodcycles.results
@@ -1,16 +1,39 @@
 found cycle
+    unsigned long slideshow::internal::hash::operator()(const type-parameter-?-? &) const
+    slideshow/source/inc/tools.hxx:84
+
+    unsigned long com::sun::star::uno::hash_value(const Reference<type-parameter-?-?> &)
+    slideshow/source/inc/tools.hxx:94
+
+found cycle
     void (anonymous namespace)::traceValue(_typelib_TypeDescriptionReference *,void *)
-    cppu/source/LogBridge/LogBridge.cxx:132
+    cppu/source/LogBridge/LogBridge.cxx:128
 
     void uno_ext_getMapping(_uno_Mapping **,_uno_Environment *,_uno_Environment *)
-    cppu/source/UnsafeBridge/UnsafeBridge.cxx:133
+    bridges/source/jni_uno/jni_bridge.cxx:514
 
     void LogProbe(bool,void *,void *,_typelib_TypeDescriptionReference *,_typelib_MethodParameter *,int,const _typelib_TypeDescription *,void *,void **,_uno_Any **)
-    cppu/source/LogBridge/LogBridge.cxx:192
+    cppu/source/LogBridge/LogBridge.cxx:188
+
+found cycle
+    void chart::ChartTypeDialogController::adjustParameterToMainType(chart::ChartTypeParameter &)
+    chart2/source/controller/dialogs/ChartTypeDialogController.hxx:116
+
+    chart::ChartTypeTabPage::ChartTypeTabPage(weld::Container *,weld::DialogController *,const com::sun::star::uno::Reference<com::sun::star::chart2::XChartDocument> &,bool)
+    chart2/source/controller/dialogs/tp_ChartType.hxx:48
+
+    void chart::ChartTypeTabPage::selectMainType()
+    chart2/source/controller/dialogs/tp_ChartType.hxx:67
+
+    void chart::ChartTypeTabPage::LinkStubSelectMainTypeHdl(void *,weld::TreeView &)
+    chart2/source/controller/dialogs/tp_ChartType.hxx:69
+
+    void chart::ChartTypeTabPage::SelectMainTypeHdl(weld::TreeView &)
+    chart2/source/controller/dialogs/tp_ChartType.hxx:69
 
 found cycle
     void SbxVariable::Dump(SvStream &,bool)
-    include/basic/sbxvar.hxx:260
+    include/basic/sbxvar.hxx:262
 
     void SbxObject::Dump(SvStream &,bool)
     include/basic/sbxobj.hxx:80
@@ -19,16 +42,52 @@ found cycle
     basic/source/inc/rtlproto.hxx:293
 
 found cycle
-    unsigned long slideshow::internal::hash::operator()(const type-parameter-?-? &) const
-    slideshow/source/inc/tools.hxx:83
+    SvxMenuConfigPage::SvxMenuConfigPage(weld::Container *,weld::DialogController *,const SfxItemSet &,bool)
+    cui/source/inc/SvxMenuConfigPage.hxx:59
 
-    unsigned long com::sun::star::uno::hash_value(const Reference<type-parameter-?-?> &)
-    slideshow/source/inc/tools.hxx:93
+    void SvxMenuConfigPage::LinkStubGearHdl(void *,const rtl::OString &)
+    cui/source/inc/SvxMenuConfigPage.hxx:35
+
+    rtl::OUString SvxConfigPageHelper::generateCustomMenuURL(std::::vector<SvxConfigEntry *, std::allocator<SvxConfigEntry *> > *,int)
+    cui/source/inc/SvxConfigPageHelper.hxx:46
+
+    SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(weld::Window *,std::::vector<SvxConfigEntry *, std::allocator<SvxConfigEntry *> > *,const SvxConfigEntry *,bool)
+    cui/source/inc/cfg.hxx:507
+
+    void SvxMenuConfigPage::GearHdl(const rtl::OString &)
+    cui/source/inc/SvxMenuConfigPage.hxx:35
+
+found cycle
+    sd::UndoAnimationPath::UndoAnimationPath(SdDrawDocument *,SdPage *,const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> &)
+    sd/inc/undoanim.hxx:55
+
+    sd::UndoAnimationPathImpl::UndoAnimationPathImpl(SdPage *,const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> &)
+    sd/source/core/undoanim.cxx:119
+
+    int sd::EffectSequenceHelper::getOffsetFromEffect(const std::shared_ptr<sd::CustomAnimationEffect> &) const
+    sd/inc/CustomAnimationEffect.hxx:324
+
+found cycle
+    sd::UndoAnimationPath::UndoAnimationPath(SdDrawDocument *,SdPage *,const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> &)
+    sd/inc/undoanim.hxx:55
+
+    std::shared_ptr<sd::CustomAnimationEffect> sd::EffectSequenceHelper::findEffect(const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> &) const
+    sd/inc/CustomAnimationEffect.hxx:288
+
+    sd::UndoAnimationPathImpl::UndoAnimationPathImpl(SdPage *,const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> &)
+    sd/source/core/undoanim.cxx:119
+
+found cycle
+    void GtkInstanceAssistant::find_sidebar(_GtkWidget *,void *)
+    vcl/unx/gtk3/gtk3gtkinst.cxx:4162
+
+    GtkInstanceAssistant::GtkInstanceAssistant(_GtkAssistant *,GtkInstanceBuilder *,bool)
+    vcl/unx/gtk3/gtk3gtkinst.cxx:4185
 
 found cycle
     void ScDPResultDimension::DumpState(const ScDPResultMember *,ScDocument *,ScAddress &) const
-    sc/inc/dptabres.hxx:583
+    sc/inc/dptabres.hxx:573
 
     void ScDPResultMember::DumpState(const ScDPResultMember *,ScDocument *,ScAddress &) const
-    sc/inc/dptabres.hxx:413
+    sc/inc/dptabres.hxx:405
 
diff --git a/include/vcl/svtabbx.hxx b/include/vcl/svtabbx.hxx
index abc37bdf198b..2abc0a9b28a1 100644
--- a/include/vcl/svtabbx.hxx
+++ b/include/vcl/svtabbx.hxx
@@ -83,8 +83,6 @@ public:
                                          bool bChildrenOnDemand = false,
                                          sal_uLong nPos = TREELIST_APPEND, void* pUserData = nullptr ) override;
 
-    virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND,
-                                 sal_uInt16 nCol = 0xffff, void* pUserData = nullptr );
     virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent,
                                  sal_uLong nPos, sal_uInt16 nCol, void* pUserData = nullptr );
     virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, const Image& rExpandedEntryBmp,
@@ -141,8 +139,6 @@ public:
     HeaderBar*      GetHeaderBar();
     static bool     IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol );
 
-    virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND,
-                                 sal_uInt16 nCol = 0xffff, void* pUserData = nullptr ) override;
     virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent,
                                  sal_uLong nPos, sal_uInt16 nCol, void* pUserData = nullptr ) override;
     virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, const Image& rExpandedEntryBmp,
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index 204ccc1c3143..93a508a7a7be 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -217,12 +217,6 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const OUString& rStr,
         pParent, false, nPos, pUser );
 }
 
-SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const OUString& rStr, sal_uLong nPos,
-    sal_uInt16 nCol, void* pUser )
-{
-    return InsertEntryToColumn( rStr,nullptr,nPos, nCol, pUser );
-}
-
 OUString SvTabListBox::GetEntryText( SvTreeListEntry* pEntry ) const
 {
     return GetEntryText( pEntry, 0xffff );
@@ -512,14 +506,6 @@ bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol
 }
 
 SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
-    const OUString& rStr, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
-{
-    SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, nPos, nCol, pUserData );
-    RecalculateAccessibleChildren();
-    return pEntry;
-}
-
-SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
     const OUString& rStr, SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
 {
     SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, pParent, nPos, nCol, pUserData );