[Libreoffice-commits] core.git: vcl/inc vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/Qt5FontFace.hxx |    5 ++++-
 vcl/qt5/Qt5FontFace.cxx     |   42 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 9 deletions(-)

New commits:
commit 90dd969e7db5aaa76117547d7892f3a9dc1db46f
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Oct 22 11:56:45 2020 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Thu Oct 22 15:53:24 2020 +0200

    tdf#136915 correctly create QFont from Qt5FontFace
    
    Store the origin of the Qt5FontFace and therefore the type of the
    font ID and use either QFont::fromString or QFontDatabase::font to
    generate the correct QFont instance.
    
    Interestingly the QFont::fromString worked with the minimal font
    string, ignoring the font style, but now fails with error messages
    when including the point size. Guess Qt supports partial font
    strings, as long as they match the segment types from the start.
    
    Change-Id: I6b30423a5ae9abd8ee50d6087a3ec61d85f6320f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104652
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx
index 9c893d4f88c8..e5b05e5b6f50 100644
--- a/vcl/inc/qt5/Qt5FontFace.hxx
+++ b/vcl/inc/qt5/Qt5FontFace.hxx
@@ -56,10 +56,13 @@ public:
     CreateFontInstance(const FontSelectPattern& rFSD) const override;
 
 private:
+    typedef enum { Font, FontDB } FontIdType;
+
     Qt5FontFace(const Qt5FontFace&);
-    Qt5FontFace(const FontAttributes& rFA, const QString& rFontID);
+    Qt5FontFace(const FontAttributes&, const QString& rFontID, const FontIdType);
 
     const QString m_aFontId;
+    const FontIdType m_eFontIdType;
     mutable FontCharMapRef m_xCharMap;
     mutable vcl::FontCapabilities m_aFontCapabilities;
     mutable bool m_bFontCapabilitiesRead;
diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/Qt5FontFace.cxx
index ce349099030a..e8f13c412e91 100644
--- a/vcl/qt5/Qt5FontFace.cxx
+++ b/vcl/qt5/Qt5FontFace.cxx
@@ -41,6 +41,7 @@ using namespace vcl;
 Qt5FontFace::Qt5FontFace(const Qt5FontFace& rSrc)
     : PhysicalFontFace(rSrc)
     , m_aFontId(rSrc.m_aFontId)
+    , m_eFontIdType(rSrc.m_eFontIdType)
 {
     if (rSrc.m_xCharMap.is())
         m_xCharMap = rSrc.m_xCharMap;
@@ -123,13 +124,14 @@ Qt5FontFace* Qt5FontFace::fromQFont(const QFont& rFont)
 {
     FontAttributes aFA;
     fillAttributesFromQFont(rFont, aFA);
-    return new Qt5FontFace(aFA, rFont.toString());
+    return new Qt5FontFace(aFA, rFont.toString(), FontIdType::Font);
 }
 
 Qt5FontFace* Qt5FontFace::fromQFontDatabase(const QString& aFamily, const QString& aStyle)
 {
     QFontDatabase aFDB;
     FontAttributes aFA;
+
     aFA.SetFamilyName(toOUString(aFamily));
     if (IsStarSymbol(aFA.GetFamilyName()))
         aFA.SetSymbolFlag(true);
@@ -137,12 +139,21 @@ Qt5FontFace* Qt5FontFace::fromQFontDatabase(const QString& aFamily, const QStrin
     aFA.SetPitch(aFDB.isFixedPitch(aFamily, aStyle) ? PITCH_FIXED : PITCH_VARIABLE);
     aFA.SetWeight(Qt5FontFace::toFontWeight(aFDB.weight(aFamily, aStyle)));
     aFA.SetItalic(aFDB.italic(aFamily, aStyle) ? ITALIC_NORMAL : ITALIC_NONE);
-    return new Qt5FontFace(aFA, aFamily + "," + aStyle);
+
+    int nPointSize = 0;
+    QList<int> aPointList = aFDB.pointSizes(aFamily, aStyle);
+    if (!aPointList.empty())
+        nPointSize = aPointList[0];
+
+    return new Qt5FontFace(aFA, aFamily + "," + aStyle + "," + QString::number(nPointSize),
+                           FontIdType::FontDB);
 }
 
-Qt5FontFace::Qt5FontFace(const FontAttributes& rFA, const QString& rFontID)
+Qt5FontFace::Qt5FontFace(const FontAttributes& rFA, const QString& rFontID,
+                         const FontIdType eFontIdType)
     : PhysicalFontFace(rFA)
     , m_aFontId(rFontID)
+    , m_eFontIdType(eFontIdType)
     , m_bFontCapabilitiesRead(false)
 {
 }
@@ -152,7 +163,24 @@ sal_IntPtr Qt5FontFace::GetFontId() const { return reinterpret_cast<sal_IntPtr>(
 QFont Qt5FontFace::CreateFont() const
 {
     QFont aFont;
-    aFont.fromString(m_aFontId);
+    switch (m_eFontIdType)
+    {
+        case FontDB:
+        {
+            QFontDatabase aFDB;
+            QStringList aStrList = m_aFontId.split(",");
+            if (3 == aStrList.size())
+                aFont = aFDB.font(aStrList[0], aStrList[1], aStrList[2].toInt());
+            else
+                SAL_WARN("vcl.qt5", "Invalid QFontDatabase font ID " << m_aFontId);
+            break;
+        }
+        case Font:
+            bool bRet = aFont.fromString(m_aFontId);
+            SAL_WARN_IF(!bRet, "vcl.qt5", "Failed to create QFont from ID: " << m_aFontId);
+            Q_UNUSED(bRet);
+            break;
+    }
     return aFont;
 }
 
@@ -167,8 +195,7 @@ FontCharMapRef Qt5FontFace::GetFontCharMap() const
     if (m_xCharMap.is())
         return m_xCharMap;
 
-    QFont aFont;
-    aFont.fromString(m_aFontId);
+    QFont aFont = CreateFont();
     QRawFont aRawFont(QRawFont::fromFont(aFont));
     QByteArray aCMapTable = aRawFont.fontTable("cmap");
     if (aCMapTable.isEmpty())
@@ -195,8 +222,7 @@ bool Qt5FontFace::GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities)
     }
     m_bFontCapabilitiesRead = true;
 
-    QFont aFont;
-    aFont.fromString(m_aFontId);
+    QFont aFont = CreateFont();
     QRawFont aRawFont(QRawFont::fromFont(aFont));
     QByteArray aOS2Table = aRawFont.fontTable("OS/2");
     if (!aOS2Table.isEmpty())