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.

4 files changed, 5 insertions, 10 deletions

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index a732b8b8b669..98895e664963 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -802,7 +802,7 @@ public:
     void SetAutoUpdateCells( bool bFlag )       { m_bAutoUpdateCells = bFlag; }
 
     bool GetShadowCursorPos( const Point& rPt, SwFillMode eFillMode,
-                            SwRect& rRect, sal_Int16& rOrient );
+                            SwRect& rRect, short& rOrient );
     bool SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode );
 
     const SwRangeRedline* SelNextRedline();
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index b32263289b2b..e9b3023ce5be 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1151,7 +1151,7 @@ public:
     */
     const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts,  // HeadlineNoBorder
                                 const SwPosition& rPos, sal_uInt16 nRows,
-                                sal_uInt16 nCols, sal_Int16 eAdjust,
+                                sal_uInt16 nCols, short eAdjust,
                                 const SwTableAutoFormat* pTAFormat = nullptr,
                                 const std::vector<sal_uInt16> *pColArr = nullptr,
                                 bool bCalledFromShell = false,
@@ -1164,7 +1164,7 @@ public:
     // Create a balanced table out of the selected range.
     const SwTable* TextToTable( const SwInsertTableOptions& rInsTableOpts, // HeadlineNoBorder,
                                 const SwPaM& rRange, sal_Unicode cCh,
-                                sal_Int16 eAdjust,
+                                short eAdjust,
                                 const SwTableAutoFormat* );
 
     // text to table conversion - API support
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index d446dcddcc51..397887d09429 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -128,10 +128,6 @@ class SwTableBoxNumFormat;
 class SwTableBoxFormula;
 class SwTableBoxValue;
 
-namespace vcl {
-    typedef OutputDevice RenderContext;
-};
-
 class SwAttrPool : public SfxItemPool
 {
 private:
@@ -322,7 +318,7 @@ public:
 //Helper for filters to find true lineheight of a font
 SW_DLLPUBLIC long AttrSetToLineHeight( const IDocumentSettingAccess& rIDocumentSettingAccess,
                           const SwAttrSet &rSet,
-                          const vcl::RenderContext &rOut, sal_Int16 nScript);
+                          const OutputDevice &rOut, sal_Int16 nScript);
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index dee697c2eed8..b37c36407a72 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -26,7 +26,6 @@
 #include "swdllapi.h"
 #include <o3tl/typed_flags_set.hxx>
 #include <i18nlangtag/lang.h>
-#include <vcl/outdev.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace linguistic2{
@@ -131,7 +130,7 @@ css::uno::Reference< css::linguistic2::XThesaurus >     GetThesaurus();
 css::uno::Reference< css::linguistic2::XLinguProperties > GetLinguPropertySet();
 
 // Returns the twip size of this graphic.
-SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, vcl::RenderContext* pOutDev );
+SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev );
 
 // Separator for jumps to different content types in document.
 const sal_Unicode cMarkSeparator = '|';