core.git: 2 commits - tools/source vcl/source

[Caolán McNamara (via logerrit)]

 tools/source/generic/config.cxx |    6 ++----
 vcl/source/outdev/font.cxx      |    6 ++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit bfbae5ddd52cf80af94b250b9de349f0340dbe34
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Dec 7 08:47:15 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Dec 7 12:29:32 2023 +0100

    cid#1558798 Unchecked return value
    
    Change-Id: Iddb702f40ced018c104a8a42847bc396ba258ff8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160420
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 0e37c7613ded..2086db7f6341 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1024,11 +1024,13 @@ bool OutputDevice::ForceFallbackFont(vcl::Font const& 
rFallbackFont)
 {
     vcl::Font aOldFont = GetFont();
     SetFont(rFallbackFont);
-    InitFont();
+    if (!InitFont())
+        return false;
 
     mpForcedFallbackInstance = mpFontInstance;
     SetFont(aOldFont);
-    InitFont();
+    if (!InitFont())
+        return false;
 
     if (mpForcedFallbackInstance)
         return true;
commit 49d88e99a20f0c746beddc713c03289d5c64546a
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Dec 7 09:05:24 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Dec 7 12:29:19 2023 +0100

    cid#1545320 Unused value
    
    Change-Id: I772a5d7608b92634b7cfed1c1e1730eab34bee89
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160421
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index b2eb546c0ef7..cc5cce9c3b16 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -205,7 +205,6 @@ static void ImplMakeConfigList( ImplConfigData* pData,
     sal_uInt64 i;
     const sal_uInt8*    pLine;
     ImplKeyData*    pPrevKey = nullptr;
-    ImplKeyData*    pKey;
     ImplGroupData*  pPrevGroup = nullptr;
     ImplGroupData*  pGroup = nullptr;
     i = 0;
@@ -250,7 +249,6 @@ static void ImplMakeConfigList( ImplConfigData* pData,
                 pData->mpFirstGroup = pGroup;
             pPrevGroup  = pGroup;
             pPrevKey    = nullptr;
-            pKey        = nullptr;
 
             // filter group names
             pLine++;
@@ -292,7 +290,7 @@ static void ImplMakeConfigList( ImplConfigData* pData,
                 {
                     while ( pGroup->mnEmptyLines )
                     {
-                        pKey                = new ImplKeyData;
+                        ImplKeyData* pKey = new ImplKeyData;
                         pKey->mbIsComment   = true;
                         pPrevKey->mpNext    = pKey;
                         pPrevKey            = pKey;
@@ -301,7 +299,7 @@ static void ImplMakeConfigList( ImplConfigData* pData,
                 }
 
                 // Generate new key
-                pKey        = new ImplKeyData;
+                ImplKeyData* pKey = new ImplKeyData;
                 pKey->mpNext = nullptr;
                 if ( pPrevKey )
                     pPrevKey->mpNext = pKey;