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

[Caolán McNamara (via logerrit)]

 canvas/source/cairo/cairo_textlayout.cxx |   27 ---------------------------
 canvas/source/cairo/cairo_textlayout.hxx |    2 --
 2 files changed, 29 deletions(-)

New commits:
commit b59e0fc4faf42dab0fac46057c3b83ceaf54654e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat May 23 21:09:42 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun May 24 20:21:38 2020 +0200

    isCairoRenderable is newly unused
    
    Change-Id: I3234509406989661a2e5d3866bee057c17984437
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94738
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 04db33135578..d81a739b4956 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -256,33 +256,6 @@ namespace cairocanvas
         return maText;
     }
 
-  /**
-   * TextLayout::isCairoRenderable
-   *
-   * Features currently not supported by Cairo (VCL rendering is used as fallback):
-   * - vertical glyphs
-   *
-   * @return true, if text/font can be rendered with cairo
-   **/
-    bool TextLayout::isCairoRenderable(SystemFontData aSysFontData) const
-    {
-#if defined CAIRO_HAS_FT_FONT
-        // is font usable?
-        if (!aSysFontData.nFontId)
-            return false;
-#endif
-
-        // vertical glyph rendering is not supported in cairo for now
-        if (aSysFontData.bVerticalCharacterType)
-        {
-            SAL_WARN("canvas.cairo", ":cairocanvas::TextLayout::isCairoRenderable(): Vertical Character Style not supported");
-            return false;
-        }
-
-        return true;
-    }
-
-
   /**
    * TextLayout::draw
    *
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index c7dd023af1bf..6254108a50ad 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -101,8 +101,6 @@ namespace cairocanvas
         CanvasFont::Reference                      mpFont;
         SurfaceProviderRef                         mpRefDevice;
         sal_Int8                                   mnTextDirection;
-
-        bool isCairoRenderable(SystemFontData aSysFontData) const;
     };
 
 }