[Libreoffice-commits] core.git: 2 commits - sc/source xmlsecurity/inc

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 4 06:28:08 UTC 2019


 sc/source/core/opencl/op_spreadsheet.cxx |    2 ++
 xmlsecurity/inc/xmlsignaturehelper.hxx   |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bb847b448f8b04e40ba66e7feab42f2b697383b4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Jun 3 18:46:51 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jun 4 08:27:38 2019 +0200

    Missing include
    
    Change-Id: I4c733df9c5a01f911c6a99fca21a2dd70aeecf18
    Reviewed-on: https://gerrit.libreoffice.org/73407
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sc/source/core/opencl/op_spreadsheet.cxx b/sc/source/core/opencl/op_spreadsheet.cxx
index 10b22b045aa6..9df0447d7e1d 100644
--- a/sc/source/core/opencl/op_spreadsheet.cxx
+++ b/sc/source/core/opencl/op_spreadsheet.cxx
@@ -11,6 +11,8 @@
 
 #include <rtl/math.hxx>
 #include <formula/vectortoken.hxx>
+
+#include <algorithm>
 #include <sstream>
 
 using namespace formula;
commit 1ae6523a3aded9fef63c688f63fa6e80c0592502
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Jun 3 18:47:16 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jun 4 08:27:26 2019 +0200

    XSecController must be a complete type here (Windows --disable-pch)
    
    ...when instantiating implicitly defined special member functions of
    XMLSECURITY_DLLPUBLIC XMLSignatureHelper, due to mpXSecController member
    
    Change-Id: Ifd504c1b215a8a1a86d7a9d660aa569b75e07d50
    Reviewed-on: https://gerrit.libreoffice.org/73406
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 2e6c2ce7f2b9..0fcbd665251f 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -26,10 +26,10 @@
 #include <svl/sigstruct.hxx>
 #include "xmlsecuritydllapi.h"
 #include "xmlsignaturehelper.hxx"
+#include "xsecctl.hxx"
 
 class DateTime;
 class UriBindingHelper;
-class XSecController;
 
 namespace com {
 namespace sun {


More information about the Libreoffice-commits mailing list