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/svx | |
| parent | 983566119c926d0e2478f74548f00a789de55c15 (diff) | |
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/svx')
| -rw-r--r-- | include/svx/charmap.hxx | 2 | ||||
| -rw-r--r-- | include/svx/galctrl.hxx | 2 | ||||
| -rw-r--r-- | include/svx/sdrpagewindow.hxx | 3 | ||||
| -rw-r--r-- | include/svx/svdpagv.hxx | 3 |
4 files changed, 6 insertions, 4 deletions
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; |