configure.ac | 2 +- sot/source/sdstor/stgstrms.cxx | 4 ++-- sw/source/filter/ww8/ww8toolbar.cxx | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit 1931563efd1cb3673d1b25a689e98e7818aa315e Author: Andras Timar <[email protected]> Date: Sun Apr 22 23:15:54 2018 -0700 Bump version to 5.1-27 Change-Id: Id25601a27c794de19a4e4609e70e2ed55a412c57 diff --git a/configure.ac b/configure.ac index 93eef1348603..6e647d43a498 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.1.10.26],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.27],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) commit 835e085d94b42048eff51299af5d199be83befb4 Author: Caolán McNamara <[email protected]> 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 <[email protected]> Reviewed-by: David Tardon <[email protected]> (cherry picked from commit 1e9c954ffb1bca7f07509331802dd4ac85a7b11b) diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 2a742925dcd0..8d0ab881a8cf 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -166,7 +166,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 2c73895d8d5f89ad19d55ef75f52a620390b7523 Author: Caolán McNamara <[email protected]> Date: Sat Jan 27 19:38:12 2018 +0000 ofz#5747 short->sal_Int32 like in StgDataStrm Change-Id: I254c00b1142d7187beabe5d18532efec036de494 Reviewed-on: https://gerrit.libreoffice.org/48756 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 14b227e3707f041f31446d7eead0884ff8326a62) diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index a67a663101f4..d63f34626b69 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -1034,7 +1034,7 @@ sal_Int32 StgSmallStrm::Read( void* pBuf, sal_Int32 n ) // small stream is likely to be < 64 KBytes. if( ( m_nPos + n ) > m_nSize ) n = m_nSize - m_nPos; - short nDone = 0; + sal_Int32 nDone = 0; while( n ) { short nBytes = m_nPageSize - m_nOffset; @@ -1065,7 +1065,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( ( m_nPos + n ) > m_nSize ) { sal_Int32 nOld = m_nPos; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
