[Libreoffice-commits] core.git: 2 commits - oox/source vcl/unx

[Caolán McNamara (via logerrit)]

 oox/source/drawingml/fillproperties.cxx |    1 +
 vcl/unx/generic/gdi/cairotextrender.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ac8c1acbd1d908f506618c05d02c7cbebefa5077
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Apr 9 12:48:48 2023 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Apr 9 17:41:46 2023 +0200

    cid#1524676 try to convince coverity of the error of its ways
    
    Change-Id: I098636732a3f704c9743cce93d7ba248455c9212
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150168
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 34a0db6dc940..cc69e04f6359 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -486,6 +486,7 @@ void FillProperties::pushToPropMap(ShapePropertyMap& 
rPropMap, const GraphicHelp
             {
                 // use awt::Gradient2, prepare ColorStops
                 awt::Gradient2 aGradient;
+                assert(aGradient.ColorStops.get() && "cid#1524676 
aGradient.ColorStops._pSequence won't be null here");
                 basegfx::ColorStops aColorStops;
                 basegfx::ColorStops aTransparencyStops;
                 bool bContainsTransparency(false);
commit f0210c8f18956b9ff2c1a76661bc5190b1cf9061
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Apr 9 12:28:03 2023 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Apr 9 17:41:39 2023 +0200

    cid#1524699 silence Uninitialized scalar variable
    
    Change-Id: I32fc2570e8553be356e5c5c059b92791f5e9106a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150164
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index ae75cbc26abb..e7689c1028e1 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -210,6 +210,7 @@ static CairoFontsCache::CacheId makeCacheId(const 
GenericSalLayout& rLayout)
     aId.maFace = aFace;
     aId.mpOptions = rFont.GetFontOptions();
     aId.mbEmbolden = rInstance.NeedsArtificialBold();
+    aId.mbVerticalMetrics = false;
 
     return aId;
 }
@@ -335,7 +336,6 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
         rFSD.maTargetName == "OpenSymbol" && !glyph_extrarotation.back() && 
!rLayout.GetOrientation())
     {
         CairoFontsCache::CacheId aId = makeCacheId(rLayout);
-        aId.mbVerticalMetrics = false;
 
         ApplyFont(cr, aId, nWidth, nHeight, 0, rLayout);
         cairo_text_extents_t stretched_extents;