[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/qt5 vcl/unx

[Noel Grandin (via logerrit)]

 vcl/headless/svpcairotextrender.cxx   |    4 ++--
 vcl/inc/headless/svpgdi.hxx           |    8 ++++----
 vcl/qt5/QtSvpSurface.cxx              |    2 +-
 vcl/unx/gtk3/gtkcairo.cxx             |    2 +-
 vcl/unx/gtk3/salnativewidgets-gtk.cxx |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 463c851ac898a81465632d090a1d2c8fcc3ca297
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Mar 24 09:05:07 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Mar 24 19:54:04 2022 +0100

    loplugin:constantparam
    
    Change-Id: I6bfbd0cb5c2eac60bdac69fd862154fb2f537a89
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132030
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/headless/svpcairotextrender.cxx 
b/vcl/headless/svpcairotextrender.cxx
index 9abd5902864d..c64bafae0969 100644
--- a/vcl/headless/svpcairotextrender.cxx
+++ b/vcl/headless/svpcairotextrender.cxx
@@ -16,7 +16,7 @@ SvpCairoTextRender::SvpCairoTextRender(SvpSalGraphics& 
rParent)
 {
 }
 
-cairo_t* SvpCairoTextRender::getCairoContext() { return 
mrParent.getCairoContext(false); }
+cairo_t* SvpCairoTextRender::getCairoContext() { return 
mrParent.getCairoContext(); }
 
 void SvpCairoTextRender::getSurfaceOffset(double& nDX, double& nDY)
 {
@@ -28,7 +28,7 @@ void SvpCairoTextRender::clipRegion(cairo_t* cr) { 
mrParent.clipRegion(cr); }
 
 void SvpCairoTextRender::releaseCairoContext(cairo_t* cr)
 {
-    mrParent.releaseCairoContext(cr, false, basegfx::B2DRange());
+    mrParent.releaseCairoContext(cr, basegfx::B2DRange());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index b3b932cc3d73..a63e7f289abf 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -105,14 +105,14 @@ public:
     virtual css::uno::Any   GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& 
rSurface, const basegfx::B2ISize& rSize) const override;
 #endif // ENABLE_CAIRO_CANVAS
 
-    cairo_t* getCairoContext(bool bXorModeAllowed) const
+    cairo_t* getCairoContext() const
     {
-        return m_aCairoCommon.getCairoContext(bXorModeAllowed, getAntiAlias());
+        return m_aCairoCommon.getCairoContext(/*bXorModeAllowed*/false, 
getAntiAlias());
     }
 
-    void releaseCairoContext(cairo_t* cr, bool bXorModeAllowed, const 
basegfx::B2DRange& rExtents) const
+    void releaseCairoContext(cairo_t* cr, const basegfx::B2DRange& rExtents) 
const
     {
-        return m_aCairoCommon.releaseCairoContext(cr, bXorModeAllowed, 
rExtents);
+        return m_aCairoCommon.releaseCairoContext(cr, 
/*bXorModeAllowed*/false, rExtents);
     }
 
     void clipRegion(cairo_t* cr)
diff --git a/vcl/qt5/QtSvpSurface.cxx b/vcl/qt5/QtSvpSurface.cxx
index 456de177ce2c..a2a39c12b387 100644
--- a/vcl/qt5/QtSvpSurface.cxx
+++ b/vcl/qt5/QtSvpSurface.cxx
@@ -42,7 +42,7 @@ QtSvpSurface::QtSvpSurface(const CairoSurfaceSharedPtr& 
pSurface)
 
 QtSvpSurface::QtSvpSurface(const QtSvpGraphics* pGraphics, int x, int y, int 
width, int height)
     : m_pGraphics(pGraphics)
-    , m_pCairoContext(pGraphics->getCairoContext(false))
+    , m_pCairoContext(pGraphics->getCairoContext())
 {
     cairo_surface_t* surface = cairo_get_target(m_pCairoContext);
     m_pSurface.reset(cairo_surface_create_for_rectangle(surface, x, y, width, 
height),
diff --git a/vcl/unx/gtk3/gtkcairo.cxx b/vcl/unx/gtk3/gtkcairo.cxx
index 8c684295f046..202e3244d617 100644
--- a/vcl/unx/gtk3/gtkcairo.cxx
+++ b/vcl/unx/gtk3/gtkcairo.cxx
@@ -55,7 +55,7 @@ namespace cairo
      **/
     Gtk3Surface::Gtk3Surface(const GtkSalGraphics* pGraphics, int x, int y, 
int width, int height)
         : mpGraphics(pGraphics)
-        , cr(pGraphics->getCairoContext(false))
+        , cr(pGraphics->getCairoContext())
     {
         cairo_surface_t* surface = cairo_get_target(cr);
         mpSurface.reset(
diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index 0505010bea81..e2cef41100ec 100644
--- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -1802,7 +1802,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart, co
         return false;
     }
 
-    cairo_t *cr = getCairoContext(false);
+    cairo_t *cr = getCairoContext();
     clipRegion(cr);
     cairo_translate(cr, rControlRegion.Left(), rControlRegion.Top());