[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 3 commits - desktop/unx solenv/gbuild svx/source

[Michael Stahl]

 desktop/unx/source/pagein.c            |    1 +
 solenv/gbuild/platform/com_GCC_defs.mk |   14 ++++++++++++++
 svx/source/tbxctrls/layctrl.cxx        |    2 ++
 3 files changed, 17 insertions(+)

New commits:
commit a8e2790c9b16d939011bdae86cdf3c41b391ad94
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 13 15:01:09 2017 +0200

    gbuild: suppress -Werror on new GCC 7 warnings for release branch
    
    These are endemic and fixes too many to backport.
    
    Change-Id: I07b3c18c4fe654a840dcbd395bfc05e80649d574
    Reviewed-on: https://gerrit.libreoffice.org/42247
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 387974a78a68d54db38e3b74a1ac687928cd04a4)

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 6b697fc9461c..0b8911436347 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -96,6 +96,20 @@ gb_CXXFLAGS_COMMON += \
     -Wunused-const-variable=1
 endif
 
+# for release branch, exclude all new GCC7 warnings from Werror
+ifeq ($(shell expr '$(GCC_VERSION)' '>=' 700),1)
+gb_CFLAGS_COMMON += \
+	-Wno-deprecated \
+	-Wno-error=implicit-fallthrough \
+
+gb_CXXFLAGS_COMMON += \
+	-Wno-deprecated \
+	-Wno-error=implicit-fallthrough \
+	-Wno-error=format-truncation \
+	-Wno-error=int-in-bool-context \
+
+endif
+
 ifeq ($(COM_IS_CLANG),TRUE)
 gb_CXXFLAGS_COMMON += -Wimplicit-fallthrough
 endif
commit e239a3a32791f3232b1a5e0ac5cda76f6a9420be
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Mar 8 10:37:38 2017 +0100

    WaE: include needed header
    
    "error: In the GNU C Library, "major" is defined
    by <sys/sysmacros.h>. For historical compatibility, it is
    currently defined by <sys/types.h> as well, but we plan to
    remove this soon. To use "major", include <sys/sysmacros.h>
    directly. If you did not intend to use a system-defined macro
    "major", you should undefine it after including <sys/types.h>."
    
    Change-Id: I7f5741d4c2eae277e316c5fc97aa73b9430fbdc1
    (cherry picked from commit 01bf741a79241829b0d5c048e8f45e3cf6914d3e)
    Reviewed-on: https://gerrit.libreoffice.org/42246
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 831c187d831972ed96ac4d535ef5773503c3db00)

diff --git a/desktop/unx/source/pagein.c b/desktop/unx/source/pagein.c
index 56baffa79ca3..a401419fc162 100644
--- a/desktop/unx/source/pagein.c
+++ b/desktop/unx/source/pagein.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 
 /* do_pagein */
commit 74a8c6e6f0d426c521b6d5d02eefd87289b79839
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 12 12:12:19 2017 +0100

    Resolves: tdf#106163 safe fix for wrong final row/col selection in rtl
    
    Change-Id: I773de03768b0a5b28e6b4f63bd65dd270dc975cd
    Reviewed-on: https://gerrit.libreoffice.org/42199
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit a3ea07e14bab234ee04c441e0dca7a9d12dc7a9b)

diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index c6acafaffbe0..2138b00d9cd7 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -161,6 +161,8 @@ void TableWindow::dispose()
 void TableWindow::MouseMove( const MouseEvent& rMEvt )
 {
     SfxPopupWindow::MouseMove( rMEvt );
+    if (IsInCleanUp())
+        return;
     Point aPos = rMEvt.GetPosPixel();
     Point aMousePos( aPos );