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

[Libreoffice Gerrit user]

 vcl/qt5/Qt5AccessibleWidget.cxx |    4 ++--
 vcl/qt5/Qt5Font.cxx             |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b8835ad978b1295a01105c587e601163cd9ff725
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Mon Oct 8 18:03:47 2018 +0000
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Tue Oct 9 07:32:46 2018 +0200

    Qt5: fix build with Qt 5.11
    
    And while at it annotate Qt5Font fall-throughs.
    
    Change-Id: I31a73407f3228f303236983df17c66bc88eef6c5
    Reviewed-on: https://gerrit.libreoffice.org/61557
    Tested-by: Jenkins
    Tested-by: Rene Engelhard <rene at debian.org>
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
index be3480aa3f77..748dda66f625 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -116,8 +116,8 @@ void lcl_appendRelation(QVector<QPair<QAccessibleInterface*, QAccessible::Relati
     for (sal_uInt32 i = 0; i < nTargetCount; i++)
     {
         Reference<XAccessible> xAccessible(aRelation.TargetSet[i], uno::UNO_QUERY);
-        relations->append(QPair(
-            QAccessible::queryAccessibleInterface(new Qt5XAccessible(xAccessible)), aQRelation));
+        relations->append(
+            { QAccessible::queryAccessibleInterface(new Qt5XAccessible(xAccessible)), aQRelation });
     }
 }
 }
diff --git a/vcl/qt5/Qt5Font.cxx b/vcl/qt5/Qt5Font.cxx
index 60287d9a6093..de4d10fdf13b 100644
--- a/vcl/qt5/Qt5Font.cxx
+++ b/vcl/qt5/Qt5Font.cxx
@@ -35,8 +35,11 @@ static QFont::Weight GetQFontWeight(FontWeight eWeight)
             return QFont::Light;
         case FontWeight_FORCE_EQUAL_SIZE:
             assert(false && "FontWeight_FORCE_EQUAL_SIZE not implementable for QFont");
+            SAL_FALLTHROUGH;
         case WEIGHT_SEMILIGHT:
+            SAL_FALLTHROUGH;
         case WEIGHT_DONTKNOW:
+            SAL_FALLTHROUGH;
         case WEIGHT_NORMAL:
             return QFont::Normal;
         case WEIGHT_MEDIUM: