[Libreoffice-commits] core.git: vcl/inc vcl/quartz

[Stephan Bergmann]

 vcl/inc/osx/salinst.h   |    4 ++--
 vcl/quartz/ctlayout.cxx |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0bab74d6357c6438cfb38d56dd8f75217af6bd2a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Aug 8 11:46:36 2016 +0200

    loplugin:overrideparam
    
    Change-Id: I34fc490407f2bdac036dced5360b438ffb1cb4e2

diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 2047ec5..805ce3a 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -85,12 +85,12 @@ public:
     virtual SalFrame*       CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
     virtual void            DestroyFrame( SalFrame* pFrame ) override;
     virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData,
-                                          bool bShow = true ) override;
+                                          bool bShow ) override;
     virtual void            DestroyObject( SalObject* pObject ) override;
     virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
                                                    long &nDX, long &nDY,
                                                    DeviceFormat eFormat,
-                                                   const SystemGraphicsData *pData ) override;
+                                                   const SystemGraphicsData *pData = nullptr ) override;
     virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
                                                ImplJobSetup* pSetupData ) override;
     virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter ) override;
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 0c46c95..d4eed46 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -42,12 +42,12 @@ public:
     virtual bool    DrawTextSpecial( SalGraphics& rGraphics, sal_uInt32 flags ) const override;
 
     virtual int     GetNextGlyphs( int nLen, sal_GlyphId* pOutGlyphIds, Point& rPos, int&,
-                                   DeviceCoordinate* pGlyphAdvances, int* pCharIndexes,
-                                   const PhysicalFontFace** pFallbackFonts ) const override;
+                                   DeviceCoordinate* pGlyphAdvances = nullptr, int* pCharIndexes = nullptr,
+                                   const PhysicalFontFace** pFallbackFonts = nullptr ) const override;
 
     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;
     virtual bool    GetBoundRect( SalGraphics&, Rectangle& ) const override;