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

[Libreoffice Gerrit user]

 vcl/source/outdev/font.cxx |    3 ++-
 vcl/source/outdev/text.cxx |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b932577ba0325144bcdeb91725a51000f7ef3eca
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Nov 4 16:20:54 2018 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 5 13:32:19 2018 +0100

    coverity#1440837 Unchecked return value
    
    Change-Id: I88ad412a55bad26adc1a83ea8e9b310b05513d0d
    Reviewed-on: https://gerrit.libreoffice.org/62853
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 8cdaebb612df..09e7bdcd2987 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -974,7 +974,8 @@ bool OutputDevice::InitFont() const
 
 const LogicalFontInstance* OutputDevice::GetFontInstance() const
 {
-    InitFont();
+    if (!InitFont())
+        return nullptr;
     return mpFontInstance.get();
 }
 
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index e2e135812ff8..5ebd16294fa2 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -227,7 +227,8 @@ bool OutputDevice::ImplDrawRotateText( SalLayout& 
rSalLayout )
     pVDev->SetTextColor( COL_BLACK );
     pVDev->SetTextFillColor();
     pVDev->ImplNewFont();
-    pVDev->InitFont();
+    if (!pVDev->InitFont())
+        return false;
     pVDev->ImplInitTextColor();
 
     // draw text into upper left corner
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits