diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:57:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-05 12:12:26 +0100 |
| commit | 191f85df5851473af270be486f95f940e3091fef (patch) | |
| tree | 753d9513ccda8ee2a132bdad74eedc47bd71b179 /include/svtools | |
| parent | Add support for <image> draw definition to draw a SVG image (diff) | |
| download | core-191f85df5851473af270be486f95f940e3091fef.tar.gz core-191f85df5851473af270be486f95f940e3091fef.zip | |
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>
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/brwbox.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/editbrowsebox.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/table/tablerenderer.hxx | 13 |
3 files changed, 10 insertions, 7 deletions
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 |