[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Widget.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e2fdcd2ac03d3c916eccdd38c4025fdbd5d442f6
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sun Jun 2 20:04:28 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon Jun 3 12:13:04 2019 +0200

    Qt5 return expected QVariants int sizes
    
    Grep'ing the Qt source code, most of the places call toInt()
    on the QVariants returned from Qt::ImCursorPosition and
    Qt::ImAnchorPosition (toUInt() is probably a bug). So actually
    deliver these (and fix the 32bit build with the sal_Int32
    ambiguity - there is no "signed long" QVariant constructor).
    
    Change-Id: Id6b8fbabb8156692592bdef48437db140c6b7cca
    Reviewed-on: https://gerrit.libreoffice.org/73356
    Tested-by: Rene Engelhard <rene at debian.org>
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index d2a2d8140026..a6b3d29e69a8 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -629,7 +629,7 @@ QVariant Qt5Widget::inputMethodQuery(Qt::InputMethodQuery property) const
         {
             sal_Int32 nCursorPos, nAnchor;
             if (lcl_retrieveSurrounding(nCursorPos, nAnchor, nullptr, nullptr))
-                return QVariant(nCursorPos);
+                return QVariant(static_cast<int>(nCursorPos));
             [[fallthrough]];
         }
         case Qt::ImCursorRectangle:
@@ -643,7 +643,7 @@ QVariant Qt5Widget::inputMethodQuery(Qt::InputMethodQuery property) const
         {
             sal_Int32 nCursorPos, nAnchor;
             if (lcl_retrieveSurrounding(nCursorPos, nAnchor, nullptr, nullptr))
-                return QVariant(nAnchor);
+                return QVariant(static_cast<int>(nAnchor));
             [[fallthrough]];
         }
         case Qt::ImCurrentSelection: