summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-03-04 08:56:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-03-04 08:56:11 +0200
commitc9bb48386bad7d2a40e6958883328145ae439cad (patch)
tree8576ed314b2d219fdd96b8c1990f16fb70847a54 /include/svx
parent9865440d217d975206a3f91612f0666312bc8fd8 (diff)
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.
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/charmap.hxx2
-rw-r--r--include/svx/galctrl.hxx2
-rw-r--r--include/svx/sdrpagewindow.hxx3
-rw-r--r--include/svx/svdpagv.hxx3
4 files changed, 4 insertions, 6 deletions
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 0551f2ad03c8..b513f1ab593b 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_UCS4 cNew );
+ void SelectCharacter( sal_uInt32 cNew );
virtual sal_UCS4 GetSelectCharacter() const;
void createContextMenu();
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 3dba3d9a487d..575db968193b 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( 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& 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 e43279e31e6c..9407c7eed60f 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -20,7 +20,6 @@
#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>
@@ -75,7 +74,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::B2IRectangle const*);
+ void RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector, basegfx::B2IRange 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 ea376dc8c035..aa6c5b325688 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -32,7 +32,6 @@
#include <memory>
#include <vector>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/range/b2irectangle.hxx>
namespace vcl { class Region; }
@@ -168,7 +167,7 @@ public:
void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr,
const tools::Rectangle& rRect = tools::Rectangle(),
- basegfx::B2IRectangle const* pPageFrame = nullptr);
+ basegfx::B2IRange const* pPageFrame = nullptr);
void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = COL_BLACK );
tools::Rectangle GetPageRect() const;