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

[Jan Holesovsky]

 vcl/source/outdev/font.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 07e7e545960b688dcc63c55a6465c95307f19136
Author: Jan Holesovsky <ke...@collabora.com>
Date:   Mon May 12 00:30:12 2014 +0200

    coverity#1209003: Unchecked return value
    
    Just silence coverity, the code is OK.
    
    Change-Id: I0968800d67ab53cbbc942fa495d08adc4e94de0d

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 7a34317..541df8ef 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -292,8 +292,11 @@ SystemFontData OutputDevice::GetSysFontData(int 
nFallbacklevel) const
     SystemFontData aSysFontData;
     aSysFontData.nSize = sizeof(aSysFontData);
 
-    if (!mpGraphics) AcquireGraphics();
-    if (mpGraphics) aSysFontData = mpGraphics->GetSysFontData(nFallbacklevel);
+    if (!mpGraphics)
+        (void) AcquireGraphics();
+
+    if (mpGraphics)
+        aSysFontData = mpGraphics->GetSysFontData(nFallbacklevel);
 
     return aSysFontData;
 }
commit 11eb3330ea72d994ab2b901a45a3417432364972
Author: Jan Holesovsky <ke...@collabora.com>
Date:   Mon May 12 00:23:32 2014 +0200

    fdo#78567: Revert "coverity#1209003: Unchecked return value"
    
    This reverts commit 24ec38a96fa33b75435786caaca04f9cef86c289.
    
    The commit has unfortunately caused a regression, reverting it.
    
    Change-Id: If3098d4fce05b3bf95e3ffe021ff4f35e1cc42fc

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 78f8204..7a34317 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -292,11 +292,8 @@ SystemFontData OutputDevice::GetSysFontData(int 
nFallbacklevel) const
     SystemFontData aSysFontData;
     aSysFontData.nSize = sizeof(aSysFontData);
 
-    if (!mpGraphics)
-    {
-        if (AcquireGraphics())
-            aSysFontData = mpGraphics->GetSysFontData(nFallbacklevel);
-    }
+    if (!mpGraphics) AcquireGraphics();
+    if (mpGraphics) aSysFontData = mpGraphics->GetSysFontData(nFallbacklevel);
 
     return aSysFontData;
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits