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>

15 files changed, 32 insertions, 29 deletions

diff --git a/include/canvas/spriteredrawmanager.hxx b/include/canvas/spriteredrawmanager.hxx
index 3115fe5d3f84..093f1a32e392 100644
--- a/include/canvas/spriteredrawmanager.hxx
+++ b/include/canvas/spriteredrawmanager.hxx
@@ -24,6 +24,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2drectangle.hxx>
 
 #include <vector>
 #include <algorithm>
@@ -359,8 +360,8 @@ namespace canvas
 
         bool areSpritesChanged( const UpdateArea& rUpdateArea ) const;
 
-        bool isAreaUpdateNotOpaque( const ::basegfx::B2DRange&  rUpdateRect,
-                                    const AreaComponent&        rComponent ) const;
+        bool isAreaUpdateNotOpaque( const ::basegfx::B2DRectangle&  rUpdateRect,
+                                    const AreaComponent&            rComponent ) const;
 
         bool isAreaUpdateOpaque( const UpdateArea&  rUpdateArea,
                                  ::std::size_t      nNumSprites ) const;
@@ -378,8 +379,8 @@ namespace canvas
             @param rUpdateArea
             Area to check for scroll update optimization
          */
-        bool isAreaUpdateScroll( ::basegfx::B2DRange&   o_rMoveStart,
-                                 ::basegfx::B2DRange&   o_rMoveEnd,
+        bool isAreaUpdateScroll( ::basegfx::B2DRectangle& o_rMoveStart,
+                                 ::basegfx::B2DRectangle& o_rMoveEnd,
                                  const UpdateArea&      rUpdateArea,
                                  ::std::size_t          nNumSprites ) const;
 
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index cadb85297d8f..a92ea7ecd04b 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -216,14 +216,10 @@ namespace comphelper
     /** is a specialization of OListenerContainer which saves you some additional type casts,
         by making the required listener and event types template arguments.
     */
-    template< class LISTENER, class EVENT >
+    template< class ListenerClass, class EventClass >
     class OListenerContainerBase : public OListenerContainer
     {
     public:
-        typedef LISTENER    ListenerClass;
-        typedef EVENT       EventClass;
-
-    public:
         OListenerContainerBase( ::osl::Mutex& _rMutex ) : OListenerContainer( _rMutex )
         {
         }
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 8e75a0a0fc57..c06065117b75 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -211,7 +211,7 @@ namespace drawinglayer
             /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It
                 will construct a ViewInformation2D from the ViewParameters for that purpose
              */
-            virtual Primitive2DSequence SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
+            virtual css::uno::Sequence< ::css::uno::Reference< ::css::graphic::XPrimitive2D > > SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
 
             /** The getRange implementation for UNO API will use getRange from this implementation. It
                 will construct a ViewInformation2D from the ViewParameters for that purpose
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index e447004277a8..dc419df482cb 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -133,7 +133,7 @@ namespace drawinglayer
             /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It
                 will get the ViewInformation from the ViewParameters for that purpose
              */
-            virtual Primitive3DSequence SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
+            virtual css::uno::Sequence< ::css::uno::Reference< ::css::graphic::XPrimitive3D > > SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
 
             /** the getRange default implementation will use getDecomposition to create the range information from merging
                 getRange results from the single local decomposition primitives.
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 9355b7881788..4d4c4d3cf4f8 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -96,7 +96,7 @@ public:
     bool isNotesPage() const { return mbNotes; }
 
     void setLayoutValueToken( sal_Int32 nLayoutValueToken ) { mnLayoutValueToken = nLayoutValueToken; }
-    short getLayoutFromValueToken();
+    sal_Int16 getLayoutFromValueToken();
 
 
     const oox::drawingml::TextListStylePtr& getDefaultTextStyle() const { return maDefaultTextStylePtr; }
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index d7741b76e8c0..1f834835602a 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -130,7 +130,7 @@ public:
 
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(  const   css::util::URL &    aURL            ,
                                                                                   const   OUString &   sTargetFrameName,
-                                                                                  FrameSearchFlags            eSearchFlags    ) override ;
+                                                                                  sal_Int32            eSearchFlags    ) override ;
 
     virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) override ;
 
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 068fe89399c4..6022cb1c8142 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -331,7 +331,7 @@ protected:
     virtual bool    SeekRow( long nRow ) = 0;
     void            DrawCursor();
     void            PaintData(vcl::Window const & rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
-    virtual void    PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const = 0;
+    virtual void    PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const = 0;
     // Advice for the subclass: the visible scope of rows has changed.
     // The subclass is able to announce changes of the model with the
     // help of the methods RowInserted and RowRemoved. Because of the
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 01f1298f0ff3..12c754db95ae 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -622,7 +622,7 @@ namespace svt
         void    implCreateActiveAccessible( );
 
     private:
-        virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect,
+        virtual void PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect,
                                 sal_uInt16 nColumnId ) const override;
         using Control::ImplInitSettings;
         SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx
index ff738c6de623..4e0933686065 100644
--- a/include/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
@@ -32,6 +32,9 @@ namespace vcl { class Window; }
 
 class OutputDevice;
 class StyleSettings;
+namespace vcl {
+    typedef OutputDevice RenderContext;
+};
 
 
 namespace svt { namespace table
@@ -89,7 +92,7 @@ namespace svt { namespace table
                 the style to be used for drawing
         */
         virtual void    PaintHeaderArea(
-                            OutputDevice& _rDevice, const tools::Rectangle& _rArea,
+                            vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea,
                             bool _bIsColHeaderArea, bool _bIsRowHeaderArea,
                             const StyleSettings& _rStyle ) = 0;
 
@@ -108,7 +111,7 @@ namespace svt { namespace table
                 the style to be used for drawing
         */
         virtual void    PaintColumnHeader( ColPos _nCol, bool _bActive,
-                            OutputDevice& _rDevice, const tools::Rectangle& _rArea,
+                            vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea,
                             const StyleSettings& _rStyle ) = 0;
 
         /** prepares a row for painting
@@ -143,7 +146,7 @@ namespace svt { namespace table
                 the style to be used for drawing
         */
         virtual void    PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected,
-                            OutputDevice& _rDevice, const tools::Rectangle& _rRowArea,
+                            vcl::RenderContext& _rDevice, const tools::Rectangle& _rRowArea,
                             const StyleSettings& _rStyle ) = 0;
 
         /** paints the header of a row
@@ -172,7 +175,7 @@ namespace svt { namespace table
                 the style to be used for drawing
         */
         virtual void    PaintRowHeader( bool i_hasControlFocus, bool _bSelected,
-                            OutputDevice& _rDevice, tools::Rectangle const & _rArea,
+                            vcl::RenderContext& _rDevice, tools::Rectangle const & _rArea,
                             StyleSettings const & _rStyle ) = 0;
 
         /** paints a certain cell
@@ -203,7 +206,7 @@ namespace svt { namespace table
         */
         virtual void    PaintCell( ColPos const i_col,
                             bool i_hasControlFocus, bool _bSelected,
-                            OutputDevice& _rDevice, const tools::Rectangle& _rArea,
+                            vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea,
                             const StyleSettings& _rStyle ) = 0;
 
         /** draws a cell cursor in the given rectangle
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index b513f1ab593b..0551f2ad03c8 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -71,7 +71,7 @@ public:
 
     virtual void            RecalculateFont(vcl::RenderContext& rRenderContext);
 
-    void                    SelectCharacter( sal_uInt32 cNew );
+    void                    SelectCharacter( sal_UCS4 cNew );
     virtual sal_UCS4        GetSelectCharacter() const;
     void                    createContextMenu();
 
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 575db968193b..3dba3d9a487d 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -140,7 +140,7 @@ private:
 
     // BrowseBox
     virtual bool        SeekRow( long nRow ) override;
-    virtual void        PaintField( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override;
+    virtual void        PaintField( vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override;
     virtual void        DoubleClick( const BrowserMouseEvent& rEvt ) override;
     virtual void        Select() override;
     virtual sal_Int8    AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override;
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 9407c7eed60f..e43279e31e6c 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SVX_SDRPAGEWINDOW_HXX
 #define INCLUDED_SVX_SDRPAGEWINDOW_HXX
 
+#include <basegfx/range/b2irectangle.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/svdtypes.hxx>
 #include <svx/svxdllapi.h>
@@ -74,7 +75,7 @@ public:
     void PrePaint();
     void PrepareRedraw(const vcl::Region& rReg);
     void RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedirector );
-    void RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector, basegfx::B2IRange const*);
+    void RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector, basegfx::B2IRectangle const*);
 
     // Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...)
     void InvalidatePageWindow(const basegfx::B2DRange& rRange);
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index aa6c5b325688..ea376dc8c035 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -32,6 +32,7 @@
 #include <memory>
 #include <vector>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/range/b2irectangle.hxx>
 
 
 namespace vcl { class Region; }
@@ -167,7 +168,7 @@ public:
 
     void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr,
                    const tools::Rectangle& rRect = tools::Rectangle(),
-                   basegfx::B2IRange const* pPageFrame = nullptr);
+                   basegfx::B2IRectangle const* pPageFrame = nullptr);
     void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = COL_BLACK );
 
     tools::Rectangle GetPageRect() const;
diff --git a/include/vcl/cairo.hxx b/include/vcl/cairo.hxx
index 7ca45efba74f..87d820ab81ff 100644
--- a/include/vcl/cairo.hxx
+++ b/include/vcl/cairo.hxx
@@ -33,6 +33,8 @@ namespace cairo {
 
     typedef std::shared_ptr<cairo_surface_t> CairoSurfaceSharedPtr;
     typedef std::shared_ptr<cairo_t>         CairoSharedPtr;
+    struct Surface;
+    typedef std::shared_ptr<Surface>         SurfaceSharedPtr;
 
     /** Cairo surface interface
 
@@ -47,7 +49,7 @@ namespace cairo {
         // Query methods
         virtual CairoSharedPtr getCairo() const = 0;
         virtual CairoSurfaceSharedPtr getCairoSurface() const = 0;
-        virtual std::shared_ptr<Surface> getSimilar(int cairo_content_type, int width, int height) const = 0;
+        virtual SurfaceSharedPtr getSimilar(int cairo_content_type, int width, int height) const = 0;
 
         /// factory for VirDev on this surface
         virtual VclPtr<VirtualDevice> createVirtualDevice() const = 0;
@@ -60,7 +62,6 @@ namespace cairo {
         virtual void flush() const = 0;
     };
 
-    typedef std::shared_ptr<Surface> SurfaceSharedPtr;
 }
 
 #endif
diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx
index eeb8367ced6c..2a4e1dd08ff1 100644
--- a/include/vcl/fontcharmap.hxx
+++ b/include/vcl/fontcharmap.hxx
@@ -139,7 +139,7 @@ private:
 
     friend class ::OutputDevice;
 
-    int                 findRangeIndex( sal_uInt32 ) const;
+    int                 findRangeIndex( sal_UCS4 ) const;
 
                         FontCharMap( ImplFontCharMapRef const & pIFCMap );
 
@@ -153,9 +153,9 @@ class VCL_PLUGIN_PUBLIC CmapResult
 {
 public:
     explicit            CmapResult( bool bSymbolic = false,
-                            const sal_uInt32* pRangeCodes = nullptr, int nRangeCount = 0 );
+                            const sal_UCS4* pRangeCodes = nullptr, int nRangeCount = 0 );
 
-    const sal_uInt32*   mpRangeCodes;
+    const sal_UCS4*     mpRangeCodes;
     const int*          mpStartGlyphs;
     const sal_uInt16*   mpGlyphIds;
     int                 mnRangeCount;