[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 4 commits - configure.ac solenv/gbuild sot/source sw/source

[Andras Timar]

 configure.ac                                   |    2 +-
 solenv/gbuild/platform/filter-showIncludes.awk |    7 +++++++
 sot/source/sdstor/stgstrms.cxx                 |    4 ++--
 sw/source/filter/ww8/ww8toolbar.cxx            |    4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 9ee57811e2eecc1059eb9d12240687196d8e922c
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Apr 24 01:40:27 2018 -0700

    Bump version to 5.0-44
    
    Change-Id: I6cd258caa6453394ce72ab62fd7f34535ce51c27

diff --git a/configure.ac b/configure.ac
index 93616767d9c9..c18fbd50f1b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([Collabora Office],[5.0.10.43],[],[],[https://CollaboraOffice.com/])
+AC_INIT([Collabora Office],[5.0.10.44],[],[],[https://CollaboraOffice.com/])
 
 AC_PREREQ([2.59])
 
commit a2c89f80b374877376f6e80a3d7ce049e93d6b3a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 9 10:49:39 2018 +0000

    ofz#6173 check index before use
    
    Change-Id: I09d15ab324af0a8b3566f11868eb3266a68c4afe
    Reviewed-on: https://gerrit.libreoffice.org/49499
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 1e9c954ffb1bca7f07509331802dd4ac85a7b11b)

diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index c13a813d0a14..9f4231c8d0a1 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -164,7 +164,9 @@ bool SwCTBWrapper::Read( SvStream& rS )
     std::vector< sal_Int16 >::iterator it_end = dropDownMenuIndices.end();
     for ( std::vector< sal_Int16 >::iterator it = dropDownMenuIndices.begin(); it != it_end; ++it )
     {
-        rCustomizations[ *it ].bIsDroppedMenuTB = true;
+        if (*it < 0 || static_cast<size_t>(*it) >= rCustomizations.size())
+            continue;
+        rCustomizations[*it].bIsDroppedMenuTB = true;
     }
     return rS.good();
 }
commit ea109817c48816ba83ac74d523707a14d094b062
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 27 19:38:12 2018 +0000

    ofz#5747 short->sal_Int32 like in StgDataStrm
    
    Reviewed-on: https://gerrit.libreoffice.org/48756
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 14b227e3707f041f31446d7eead0884ff8326a62)
    
    Change-Id: I254c00b1142d7187beabe5d18532efec036de494

diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index cd99b76f7388..b038e5f04018 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -1052,7 +1052,7 @@ sal_Int32 StgSmallStrm::Read( void* pBuf, sal_Int32 n )
     // small stream is likely to be < 64 KBytes.
     if( ( nPos + n ) > nSize )
         n = nSize - nPos;
-    short nDone = 0;
+    sal_Int32 nDone = 0;
     while( n )
     {
         short nBytes = nPageSize - nOffset;
@@ -1083,7 +1083,7 @@ sal_Int32 StgSmallStrm::Write( const void* pBuf, sal_Int32 n )
 {
     // you can safely assume that reads are not huge, since the
     // small stream is likely to be < 64 KBytes.
-    short nDone = 0;
+    sal_Int32 nDone = 0;
     if( ( nPos + n ) > nSize )
     {
         sal_Int32 nOld = nPos;
commit 5b8f8110183852a3f86f631bec49b8247ba558b4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jul 26 15:50:09 2017 +0200

    gbuild: strip away unexpected CR char at the end of Windows filenames
    
    As reported at e.g.
    <https://ask.libreoffice.org/en/question/90346/building-libreoffice-in-cygwin-leads-to-infinite-loop/>,
    sometimes MSVC (seen with 2013 on libreoffice-5-2, but there is no
    indication that 2015 on master would be different) emits CR characters
    at the end of filenames, resulting in unnecessary rebuilds at per-module
    builds, and actually to an infinite loop when doing toplevel make.
    
    Given that CR characters are unexpected in any filenames, it should be
    safe to just strip those away unconditionally.
    
    Change-Id: I3d56670b4d930a32489f889085711bfd436de82a
    Reviewed-on: https://gerrit.libreoffice.org/40452
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit e9b9a456221b4b0660f90efa1ee092ea00c2c728)

diff --git a/solenv/gbuild/platform/filter-showIncludes.awk b/solenv/gbuild/platform/filter-showIncludes.awk
index 06788a94d368..bfefd97d58b2 100755
--- a/solenv/gbuild/platform/filter-showIncludes.awk
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -44,6 +44,13 @@ BEGIN {
     if (index($0, showincludes_prefix) == 1) {
         $0 = substr($0, length(showincludes_prefix) + 1)
         sub(/^ */, "")
+
+        # The output from MSVC may contain a carriage return character at the
+        # end of filenames, in which case the translation unit will depend on a
+        # non-existing header, resulting in constant rebuild of all files,
+        # prevent that.
+        sub(/
/, "")
+
         gsub(/\\/, "/")
         gsub(/ /, "\\ ")
         if ($0 ~ whitelist) { # filter out system headers