re-land "new loplugin typedefparam""

This reverts commit c9bb48386bad7d2a40e6958883328145ae439cad,
and adds a bunch more fixes.

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

12 files changed, 18 insertions, 22 deletions

diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
index 4c01deb06172..e7b35ea5dfd5 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -53,7 +53,7 @@ public:
     void removeSegment(SCCOLROW nPos1, SCCOLROW nPos2);
     void insertSegment(SCCOLROW nPos, SCCOLROW nSize, bool bSkipStartBoundary);
 
-    SCROW findLastTrue(ValueType nValue) const;
+    SCCOLROW findLastTrue(ValueType nValue) const;
 
     // range iteration
     bool getFirst(RangeData& rData);
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 8abfeb098bdf..6be071381023 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1458,7 +1458,7 @@ void XclExpComments::SaveXml( XclExpXmlStream& rStrm )
     Authors::const_iterator aAuthorsBegin = aAuthors.begin();
     for( size_t i = 0; i < nNotes; ++i )
     {
-        XclExpNoteList::RecordRefType xNote = mrNotes.GetRecord( i );
+        XclExpRecordList< XclExpNote >::RecordRefType xNote = mrNotes.GetRecord( i );
         Authors::const_iterator aAuthor = aAuthors.find(
                 XclXmlUtils::ToOUString( xNote->GetAuthor() ) );
         sal_Int32 nAuthorId = distance( aAuthorsBegin, aAuthor );
diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx
index 4fbbd12a9665..ee0253dbffac 100644
--- a/sc/source/filter/inc/lotrange.hxx
+++ b/sc/source/filter/inc/lotrange.hxx
@@ -94,9 +94,9 @@ private:
 public:
     LotusRangeList();
     ~LotusRangeList();
-    inline sal_uInt16       GetIndex( SCCOL nCol, SCROW nRow );
-    inline sal_uInt16       GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
-    sal_uInt16              GetIndex( const LotusRange& );
+    inline LR_ID        GetIndex( SCCOL nCol, SCROW nRow );
+    inline LR_ID        GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
+    LR_ID               GetIndex( const LotusRange& );
     void                Append( std::unique_ptr<LotusRange> pLR );
 };
 
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index b7f09aeef717..7a9dbbda3f36 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -125,7 +125,7 @@ public:
     /** Sets the VBA project storage used to import VBA source code and forms. */
     void                setVbaProjectStorage( const StorageRef& rxVbaPrjStrg );
     /** Sets the index of the current Calc sheet, if filter currently processes a sheet. */
-    void                setCurrentSheetIndex( sal_Int16 nSheet );
+    void                setCurrentSheetIndex( SCTAB nSheet );
     /** Final conversion after importing the workbook. */
     void                finalizeWorkbookImport();
     void                useInternalChartDataTable( bool bInternal );
diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index af88892c02bb..8f135e05ea9c 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -175,7 +175,7 @@ public:
                             const WorkbookHelper& rHelper,
                             const ISegmentProgressBarRef& rxProgressBar,
                             WorksheetType eSheetType,
-                            sal_Int16 nSheet );
+                            SCTAB nSheet );
 
     // horrible accessor for hidden WorksheetGlobals ...
     static IWorksheetProgress *getWorksheetInterface( const WorksheetGlobalsRef &xRef );
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 6d30de9b553e..f45ebbf79bcf 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -365,16 +365,13 @@ private:
 class XclExpComments : public XclExpRecord
 {
 public:
-    typedef XclExpRecordList< XclExpNote >
-                        XclExpNoteList;
-
-                        XclExpComments( SCTAB nTab, XclExpNoteList& rNotes );
+                        XclExpComments( SCTAB nTab, XclExpRecordList< XclExpNote >& rNotes );
 
     virtual void        SaveXml( XclExpXmlStream& rStrm ) override;
 
 private:
     SCTAB const         mnTab;
-    XclExpNoteList&     mrNotes;
+    XclExpRecordList< XclExpNote >& mrNotes;
 };
 
 // object manager =============================================================
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index d2c5de0997ce..331fb28bb9ee 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -267,7 +267,6 @@ typedef ::cppu::ImplHelper2<
 class ScAccessibleCsvGrid : public ScAccessibleCsvControl, public ScAccessibleCsvGridImpl
 {
 protected:
-    typedef css::uno::Reference< css::accessibility::XAccessibleTable > XAccessibleTableRef;
     typedef std::map< sal_Int32, rtl::Reference<ScAccessibleCsvControl> > XAccessibleSet;
 
 private:
@@ -325,10 +324,10 @@ public:
     virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** Returns the row headers as an AccessibleTable. */
-    virtual XAccessibleTableRef SAL_CALL getAccessibleRowHeaders() override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders() override;
 
     /** Returns the column headers as an AccessibleTable. */
-    virtual XAccessibleTableRef SAL_CALL getAccessibleColumnHeaders() override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders() override;
 
     /** Returns the selected rows as a sequence. */
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() override;
diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx
index fe5e0e24d75a..d231dda5f08a 100644
--- a/sc/source/ui/inc/colrowba.hxx
+++ b/sc/source/ui/inc/colrowba.hxx
@@ -73,7 +73,7 @@ public:
     virtual OUString    GetEntryText( SCCOLROW nEntryNo ) const override;
 
     virtual bool        IsMirrored() const override;
-    virtual SCROW       GetHiddenCount( SCROW nEntryNo ) const override;
+    virtual SCCOLROW    GetHiddenCount( SCCOLROW nEntryNo ) const override;
 
     virtual void        SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ) override;
     virtual void        HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) override;
diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx
index bf0319b5f530..0c7fc699ab00 100644
--- a/sc/source/ui/inc/condformatuno.hxx
+++ b/sc/source/ui/inc/condformatuno.hxx
@@ -203,9 +203,9 @@ public:
 
     virtual ~ScColorScaleEntryObj() override;
 
-    virtual css::util::Color SAL_CALL getColor() override;
+    virtual sal_Int32 SAL_CALL getColor() override;
 
-    virtual void SAL_CALL setColor(css::util::Color aColor) override;
+    virtual void SAL_CALL setColor(sal_Int32 aColor) override;
 
     virtual sal_Int32 SAL_CALL getType() override;
 
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index 0dd142b4e92f..7e807d9a5ad0 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -116,7 +116,7 @@ public:
 
     static sal_uInt16   DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts );
 
-    void            OnLOKShowHideColRow(bool bColumns, SCROW nStartRow);
+    void            OnLOKShowHideColRow(bool bColumns, SCCOLROW nStartRow);
 };
 
 #endif
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index 4685fd0387c4..69dd2b708453 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -1011,13 +1011,13 @@ ScColorScaleEntry* ScColorScaleEntryObj::getCoreObject()
     return pFormat->GetEntry(mnPos);
 }
 
-util::Color ScColorScaleEntryObj::getColor()
+sal_Int32 ScColorScaleEntryObj::getColor()
 {
     Color aColor = getCoreObject()->GetColor();
     return sal_Int32(aColor);
 }
 
-void ScColorScaleEntryObj::setColor(util::Color aColor)
+void ScColorScaleEntryObj::setColor(sal_Int32 aColor)
 {
     getCoreObject()->SetColor(Color(aColor));
 }
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 61581d513e7a..8a7c786a9a3e 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -360,7 +360,7 @@ OUString ScRowBar::GetDragHelp( long nVal )
     return lcl_MetricString( nTwips, ScResId(STR_TIP_HEIGHT) );
 }
 
-SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo ) const // override only for rows
+SCCOLROW ScRowBar::GetHiddenCount( SCCOLROW nEntryNo ) const // override only for rows
 {
     const ScViewData& rViewData = pTabView->GetViewData();
     ScDocument* pDoc = rViewData.GetDocument();