[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/unx

[Michael Weghorn (via logerrit)]

 vcl/unx/kde4/KDESalInstance.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 82aaa2d5c1f40a011a8f2fe1ff4fdb5796251040
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Jul 10 20:34:56 2019 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Aug 4 19:43:31 2019 +0200

    kde4: Add missing include to fix build
    
    Fixes this build failure as reported e.g. by tinderbox [1]:
    
        In file included from /usr/include/c++/7/bits/locale_conv.h:41:0,
                         from /usr/include/c++/7/locale:43,
                         from /usr/include/c++/7/iomanip:43,
                         from include/com/sun/star/uno/Any.hxx:27,
                         from workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/uno/XInterface.hpp:9,
                         from workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/uno/Exception.hpp:8,
                         from workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/uno/RuntimeException.hpp:8,
                         from workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/lang/XTypeProvider.hpp:8,
                         from include/cppuhelper/compbase.hxx:25,
                         from vcl/unx/kde4/KDE4FilePicker.hxx:22,
                         from vcl/unx/kde4/KDESalInstance.cxx:20:
        /usr/include/c++/7/bits/unique_ptr.h: In instantiation of ‘void std::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = SalVirtualDevice]’:
        /usr/include/c++/7/bits/unique_ptr.h:268:17:   required from ‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = SalVirtualDevice; _Dp = std::default_delete<SalVirtualDevice>]’
        .../vcl/unx/kde4/KDESalInstance.cxx:70:107:   required from here
        /usr/include/c++/7/bits/unique_ptr.h:76:22: error: invalid application of ‘sizeof’ to incomplete type ‘SalVirtualDevice’
         static_assert(sizeof(_Tp)>0,
    
    [1] https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=libreoffice-6-2&brief-log=1562787602.2042
    
    Change-Id: I1da444b80447ec8896ff9898684ee14fd3933b18
    Reviewed-on: https://gerrit.libreoffice.org/75381
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit e84b9d0d5ac55a2f7a4936ca83a5eea5562f98a8)
    Reviewed-on: https://gerrit.libreoffice.org/76918
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/unx/kde4/KDESalInstance.cxx b/vcl/unx/kde4/KDESalInstance.cxx
index c11d62689b52..3f8294806c66 100644
--- a/vcl/unx/kde4/KDESalInstance.cxx
+++ b/vcl/unx/kde4/KDESalInstance.cxx
@@ -25,6 +25,8 @@
 #include "KDEXLib.hxx"
 #include "KDESalDisplay.hxx"
 
+#include "salvd.hxx"
+
 #include <QtGui/QApplication>
 #include <QtCore/QThread>
 #include <QX11Info>