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

[Libreoffice Gerrit user]

 vcl/unx/kde5/KDE5FilePicker2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 993b8a6667fb0ca58ec1145cc1f9529c34f3266c
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon Feb 18 19:08:24 2019 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Feb 19 07:16:44 2019 +0100

    KDE5FilePicker: Fix build on 32 bit archs
    
    This fixes the following build error on 32 bit archs as reported by
    ricotz for LibreOffice 6.2.1.1 on #libreoffice-dev:
    
    [build CXX] vcl/unx/kde5/KDE5SalGraphics.cxx
    In file included from /<<PKGBUILDDIR>>/include/com/sun/star/uno/Any.h:29,
                     from /<<PKGBUILDDIR>>/workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/uno/XInterface.hdl:6,
                     from /<<PKGBUILDDIR>>/workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/lang/XTypeProvider.hdl:6,
                     from /<<PKGBUILDDIR>>/workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/lang/XTypeProvider.hpp:6,
                     from /<<PKGBUILDDIR>>/include/cppuhelper/compbase.hxx:25,
                     from /<<PKGBUILDDIR>>/vcl/unx/kde5/KDE5FilePicker.hxx:22,
                     from /<<PKGBUILDDIR>>/vcl/unx/kde5/KDE5FilePicker2.cxx:20:
    /<<PKGBUILDDIR>>/include/cppu/unotype.hxx: In instantiation of ‘static const com::sun::star::uno::Type& cppu::UnoType< <template-parameter-1-1> >::get() [with T = int]’:
    /<<PKGBUILDDIR>>/include/cppu/unotype.hxx:321:37:   required from ‘const com::sun::star::uno::Type& cppu::getTypeFavourUnsigned(const T*) [with T = int]’
    /<<PKGBUILDDIR>>/include/com/sun/star/uno/Any.hxx:268:55:   required from ‘void com::sun::star::uno::operator<<=(com::sun::star::uno::Any&, const C&) [with C = int]’
    /<<PKGBUILDDIR>>/vcl/unx/kde5/KDE5FilePicker2.cxx:664:22:   required from here
    /<<PKGBUILDDIR>>/include/cppu/unotype.hxx:296:38: error: no matching function for call to ‘cppu_detail_getUnoType(T1*)’
             return cppu_detail_getUnoType(static_cast< T1 * >(0));
                    ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
    
    Change-Id: I5b734160c4ce218a9a982ba4a595add13affa365
    Reviewed-on: https://gerrit.libreoffice.org/67983
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 848dfca8ad5a..64a9aa374c1b 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -662,7 +662,7 @@ uno::Any KDE5FilePicker::handleGetListValue(QComboBox* pQComboBox, sal_Int16 nAc
         case ControlActions::GET_SELECTED_ITEM_INDEX:
         {
             int nCurrent = pQComboBox->currentIndex();
-            aAny <<= nCurrent;
+            aAny <<= static_cast<sal_Int32>(nCurrent);
         }
         break;
         default: