[Libreoffice-commits] core.git: canvas/source

Noel (via logerrit) logerrit at kemper.freedesktop.org
Sat Jan 16 19:08:50 UTC 2021


 canvas/source/cairo/cairo_canvashelper_text.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 4499eb5b868b54512751b4e73c68df2a79e22606
Author:     Noel <noel.grandin at collabora.co.uk>
AuthorDate: Sat Jan 16 19:03:57 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Jan 16 20:08:14 2021 +0100

    return value from setupOutDevState is unused
    
    Change-Id: Ic3006e3f73c5b1233076706d5982fefe12b8d511
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109448
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 056ae519201f..2763800d5283 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -108,7 +108,7 @@ namespace cairocanvas
         return true;
     }
 
-    static int
+    static void
     setupOutDevState( OutputDevice&                 rOutDev,
                       const rendering::XCanvas*     pOwner,
                       const rendering::ViewState&   viewState,
@@ -120,8 +120,6 @@ namespace cairocanvas
                                       2,
                                       3 /* text */ );
 
-        int nTransparency(0);
-
         // TODO(P2): Don't change clipping all the time, maintain current clip
         // state and change only when update is necessary
         ::canvas::tools::clipOutDev(viewState, renderState, rOutDev);
@@ -135,12 +133,9 @@ namespace cairocanvas
 
         // extract alpha, and make color opaque
         // afterwards. Otherwise, OutputDevice won't draw anything
-        nTransparency = 255 - aColor.GetAlpha();
         aColor.SetAlpha(255);
 
         rOutDev.SetTextColor( aColor );
-
-        return nTransparency;
     }
 
     namespace {


More information about the Libreoffice-commits mailing list