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

[Michael Weghorn (via logerrit)]

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

New commits:
commit 48e44b367a6fde947963de0d896e5d276a7f231e
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed May 15 13:28:15 2019 +0200
Commit:     Rene Engelhard <rene at debian.org>
CommitDate: Wed May 15 19:11:57 2019 +0200

    qt5: Fix build error on 32 bit archs
    
    ... as observed in [1]:
    
    > [...]
    > In file included from /usr/include/c++/8/algorithm:61,
    >                  from /usr/include/i386-linux-gnu/qt5/QtCore/qglobal.h:142,
    >                  from /usr/include/i386-linux-gnu/qt5/QtGui/qtguiglobal.h:43,
    >                  from /usr/include/i386-linux-gnu/qt5/QtWidgets/qtwidgetsglobal.h:43,
    >                  from /usr/include/i386-linux-gnu/qt5/QtWidgets/qwidget.h:43,
    >                  from /usr/include/i386-linux-gnu/qt5/QtWidgets/QWidget:1,
    >                  from /<<PKGBUILDDIR>>/vcl/inc/qt5/Qt5Widget.hxx:22,
    >                  from /<<PKGBUILDDIR>>/vcl/qt5/Qt5Widget.cxx:20:
    > /usr/include/c++/8/bits/stl_algobase.h:265:5: note: candidate: ‘template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)’
    >      max(const _Tp& __a, const _Tp& __b, _Compare __comp)
    >      ^~~
    > /usr/include/c++/8/bits/stl_algobase.h:265:5: note:   template argument deduction/substitution failed:
    > /<<PKGBUILDDIR>>/vcl/qt5/Qt5Widget.cxx:502:69: note:   deduced conflicting types for parameter ‘const _Tp’ (‘int’ and ‘sal_Int32’ {aka ‘long int’})
    >          std::vector<ExtTextInputAttr> aTextAttrs(std::max(1, nLength), ExtTextInputAttr::NONE);
    
    [1] https://buildd.debian.org/status/fetch.php?pkg=libreoffice&arch=i386&ver=1%3A6.3.0%7Ealpha1-1&stamp=1557890923&raw=0
    
    Change-Id: Ic0e3e0b8bc65d9755b3d62385673f8d1e357b122
    Reviewed-on: https://gerrit.libreoffice.org/72352
    Tested-by: Jenkins
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Tested-by: Rene Engelhard <rene at debian.org>

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 23afbea688fd..88ce1b18f0e7 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -499,7 +499,8 @@ void Qt5Widget::inputMethodEvent(QInputMethodEvent* pEvent)
 
         const sal_Int32 nLength = aInputEvent.maText.getLength();
         const QList<QInputMethodEvent::Attribute>& rAttrList = pEvent->attributes();
-        std::vector<ExtTextInputAttr> aTextAttrs(std::max(1, nLength), ExtTextInputAttr::NONE);
+        std::vector<ExtTextInputAttr> aTextAttrs(std::max(sal_Int32(1), nLength),
+                                                 ExtTextInputAttr::NONE);
         aInputEvent.mpTextAttr = &aTextAttrs[0];
 
         for (int i = 0; i < rAttrList.size(); ++i)