vcl/qt5/Qt5Widget.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 02bee5f5d846f40f244c5acab044177576a6d869
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sun Jun 2 20:04:28 2019 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Sun Jun 2 22:16:06 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/73349
Tested-by: Jenkins
Tested-by: Rene Engelhard <r...@debian.org>
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
