diff options
author | Noel Grandin <noel@peralex.com> | 2016-07-22 14:35:27 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-25 06:09:17 +0000 |
commit | 938821fb08e427864db6a10642f385bde9803f6c (patch) | |
tree | 759da9d0d0905a90f6dac2f0bf750721c17421c4 /vcl/inc | |
parent | 4d4d77a1aad1bcae18bad35dad5308d33d6b2e51 (diff) |
new loplugin overrideparam
verify that parameters on override methods have the same set of default
values for their params as their parent/super-methods do.
Change-Id: Ibdbc1c6e417fbaa680ea025a6bbf5ba9c2e5bcd2
Reviewed-on: https://gerrit.libreoffice.org/27437
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/brdwin.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/graphite_serverfont.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/headless/svpgdi.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/sallayout.hxx | 8 | ||||
-rw-r--r-- | vcl/inc/unx/genpspgraphics.h | 2 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkdata.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/saldata.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/salgdi.h | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 2557025568c0..09d0796ae95f 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -268,7 +268,7 @@ public: virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override; virtual long CalcTitleWidth() const override; - virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset) override; + virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset = nullptr) override; }; class ImplSmallBorderWindowView : public ImplBorderWindowView @@ -290,7 +290,7 @@ public: virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override; virtual long CalcTitleWidth() const override; - virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset) override; + virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset = nullptr) override; }; class ImplStdBorderWindowView : public ImplBorderWindowView @@ -313,7 +313,7 @@ public: virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override; virtual long CalcTitleWidth() const override; - virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset) override; + virtual void DrawWindow(vcl::RenderContext& rRenderContext, BorderWindowDraw nDrawFlags, const Point* pOffset = nullptr) override; }; #endif // INCLUDED_VCL_INC_BRDWIN_HXX diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx index 137cb14ba5e7..25a5bf657fc4 100644 --- a/vcl/inc/graphite_serverfont.hxx +++ b/vcl/inc/graphite_serverfont.hxx @@ -76,7 +76,7 @@ public: { return maImpl.FillDXArray(dxa); } - virtual sal_Int32 GetTextBreak(DeviceCoordinate max_width, DeviceCoordinate extra, int factor) const override + virtual sal_Int32 GetTextBreak(DeviceCoordinate max_width, DeviceCoordinate extra=0, int factor=1) const override { return maImpl.GetTextBreak(max_width, extra, factor); } diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 76e446064b18..e0d2a9de1631 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -137,7 +137,7 @@ public: virtual void SetTextColor( SalColor nSalColor ) override; virtual void SetFont( FontSelectPattern*, int nFallbackLevel ) override; - virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel = 0 ) override; virtual const FontCharMapPtr GetFontCharMap() const override; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; virtual void GetDevFontList( PhysicalFontCollection* ) override; diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 6e0cc307876c..b348ace8fb21 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -234,12 +234,12 @@ class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout { public: virtual void DrawText( SalGraphics& ) const override; - virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const override; + virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra=0, int nFactor=1) const override; virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const override; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const override; virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, - int&, DeviceCoordinate* pGlyphAdvAry, int* pCharPosAry, - const PhysicalFontFace** pFallbackFonts ) const override; + int&, DeviceCoordinate* pGlyphAdvAry = nullptr, int* pCharPosAry = nullptr, + const PhysicalFontFace** pFallbackFonts = nullptr ) const override; virtual bool GetOutline( SalGraphics&, basegfx::B2DPolyPolygonVector& ) const override; // used only by OutputDevice::ImplLayout, TODO: make friend @@ -336,7 +336,7 @@ public: // used by upper layers virtual DeviceCoordinate GetTextWidth() const override; virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const override; - virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const override; + virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra=0, int nFactor=1) const override; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const override; // used by display layers diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index f38dc0e5b9f7..ecafc8eac3fd 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -93,7 +93,7 @@ public: virtual void SetTextColor( SalColor nSalColor ) override; virtual void SetFont( FontSelectPattern*, int nFallbackLevel ) override; - virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel = 0 ) override; virtual const FontCharMapPtr GetFontCharMap() const override; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; virtual void GetDevFontList( PhysicalFontCollection* ) override; diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 037d213c5716..4e29401b366c 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -119,7 +119,7 @@ public: inline GdkDisplay *GetGdkDisplay(); virtual void ErrorTrapPush() override; - virtual bool ErrorTrapPop( bool bIgnoreError ) override; + virtual bool ErrorTrapPop( bool bIgnoreError = true ) override; inline GtkSalDisplay *GetGtkDisplay() const; bool BlockIdleTimeout() const { return blockIdleTimeout; } diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 01e8ca643f10..38640847ca61 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -217,7 +217,7 @@ public: virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics*, long &nDX, long &nDY, DeviceFormat eFormat, - const SystemGraphicsData* ) override; + const SystemGraphicsData* = nullptr ) override; virtual SalBitmap* CreateSalBitmap() override; virtual SalYieldResult DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) override; diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx index e1294ad23566..72e82df89f71 100644 --- a/vcl/inc/unx/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -76,7 +76,7 @@ public: // X errors virtual void ErrorTrapPush() override; - virtual bool ErrorTrapPop( bool bIgnoreError ) override; + virtual bool ErrorTrapPop( bool bIgnoreError = true ) override; void XError( Display *pDisp, XErrorEvent *pEvent ); bool HasXErrorOccurred() const { return m_aXErrorHandlerStack.back().m_bWas; } diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index a9c91ed0e114..1c48f0514ec2 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -117,7 +117,7 @@ public: virtual void SetTextColor( SalColor nSalColor ) override; virtual void SetFont( FontSelectPattern*, int nFallbackLevel ) override; - virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontMetricDataPtr&, int nFallbackLevel = 0 ) override; virtual const FontCharMapPtr GetFontCharMap() const override; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; virtual void GetDevFontList( PhysicalFontCollection* ) override; |