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

Tomaž Vajngerl tomaz.vajngerl at collabora.co.uk
Mon Jul 17 12:47:00 UTC 2017


 vcl/win/gdi/DWriteTextRenderer.cxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit cf0a9b9c7a988b74102bcdd38710fb9e80521081
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Sun Jul 16 22:46:45 2017 +0200

    DWrite: resolve unreachable code warning
    
    Change-Id: I5b9ffefcf8022366236328f0ca89982172b76feb
    Reviewed-on: https://gerrit.libreoffice.org/40021
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx
index 487a9ef76ff9..f876f368e882 100755
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -344,16 +344,7 @@ std::vector<tools::Rectangle> D2DWriteTextOutRenderer::GetGlyphInkBoxes(uint16_t
 
 bool D2DWriteTextOutRenderer::GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** ppFontFace, float * lfSize) const
 {
-    bool succeeded = false;
-    try
-    {
-        succeeded = SUCCEEDED(CHECKHR(mpGdiInterop->CreateFontFaceFromHdc(hDC, ppFontFace)));
-    }
-    catch (const std::exception& e)
-    {
-        SAL_WARN("vcl.gdi", "Error in dwrite while creating font face: " << e.what());
-        return false;
-    }
+    bool succeeded = SUCCEEDED(CHECKHR(mpGdiInterop->CreateFontFaceFromHdc(hDC, ppFontFace)));
 
     if (succeeded)
     {


More information about the Libreoffice-commits mailing list