Revert "new loplugin typedefparam"

This reverts commit 9865440d217d975206a3f91612f0666312bc8fd8.

This is not ready to land yet, seems like the latest update
of the logic reveals a bunch more places I need to fix before it can land.

6 files changed, 9 insertions, 9 deletions

diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index defb0e260df1..e735cee9db59 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -55,7 +55,7 @@ friend class ImpItemEdit;
 
     virtual long GetRowCount() const override;
     virtual bool SeekRow(long nRow) override;
-    virtual void PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const override;
+    virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const override;
     virtual void DoubleClick(const BrowserMouseEvent&) override;
     virtual void KeyInput(const KeyEvent& rEvt) override;
     virtual void Select() override;
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index b0fa861ed605..e9bbaed89a6e 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3897,7 +3897,7 @@ void SAL_CALL FmXCheckBoxCell::removeItemListener( const Reference< css::awt::XI
 }
 
 
-void SAL_CALL FmXCheckBoxCell::setState( sal_Int16 n )
+void SAL_CALL FmXCheckBoxCell::setState( short n )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3909,14 +3909,14 @@ void SAL_CALL FmXCheckBoxCell::setState( sal_Int16 n )
 }
 
 
-sal_Int16 SAL_CALL FmXCheckBoxCell::getState()
+short SAL_CALL FmXCheckBoxCell::getState()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     if (m_pBox)
     {
         UpdateFromColumn();
-        return static_cast<sal_Int16>(m_pBox->GetState());
+        return static_cast<short>(m_pBox->GetState());
     }
     return TRISTATE_INDET;
 }
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index c73bb9b01e10..b2c137b038cf 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -594,7 +594,7 @@ namespace svxform
     }
 
 
-    SvTreeListEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uLong nRelPos )
+    SvTreeListEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos )
     {
 
         // insert current entry
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 0dd39a03ce9d..d1e1be7a8e1d 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -378,7 +378,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, SdrInventor nInvent)
 }
 
 bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
-    sal_Int16 nMinMov, const tools::Rectangle& rLogRect, SdrObject* pPreparedFactoryObject)
+    short nMinMov, const tools::Rectangle& rLogRect, SdrObject* pPreparedFactoryObject)
 {
     bool bRet=false;
     UnmarkAllObj();
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index ff07bd88e8ad..4e3f67431c22 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -328,7 +328,7 @@ OUString SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) cons
     return sRet;
 }
 
-void SdrItemBrowserControl::PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const
+void SdrItemBrowserControl::PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const
 {
     if (nCurrentPaintRow<0 || static_cast<std::size_t>(nCurrentPaintRow)>=aList.size()) {
         return;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 7d38f60d1e12..2441f6dc778e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1268,7 +1268,7 @@ SvxColorWindow::SvxColorWindow(const OUString&            rCommand,
                                const Reference< XFrame >& rFrame,
                                vcl::Window*               pParentWindow,
                                bool                       bReuseParentForPicker,
-                               ColorSelectFunction const & aFunction):
+                               std::function<void(const OUString&, const NamedColor&)> const & aFunction):
 
     ToolbarPopup( rFrame, pParentWindow, "palette_popup_window", "svx/ui/oldcolorwindow.ui" ),
     theSlotId( nSlotId ),
@@ -1382,7 +1382,7 @@ ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager
                          weld::Window*              pParentWindow,
                          weld::MenuButton*          pMenuButton,
                          bool                       bInterimBuilder,
-                         ColorSelectFunction const & aFunction)
+                         std::function<void(const OUString&, const NamedColor&)> const & aFunction)
     : ToolbarPopupBase(rFrame)
     , m_xBuilder(bInterimBuilder ? Application::CreateInterimBuilder(pMenuButton, "svx/ui/colorwindow.ui")
                                  : Application::CreateBuilder(pMenuButton, "svx/ui/colorwindow.ui"))