instsetoo_native/util/openoffice.lst | 24 ++++++++++++------------
shell/source/win32/zipfile/zipfile.cxx | 2 +-
solenv/inc/minor.mk | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 5c684e23e2421da1232a186c99c081c0d7983deb
Author: Andras Timar <andras.ti...@collabora.com>
Date: Wed Sep 17 15:58:20 2014 -0700
Bump for 4.0-27
Change-Id: Ib7f139bd9076c64f46e6bdaf985738af560e74b0
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index f445802..666c19c 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -33,7 +33,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
- WINDOWSPATCHLEVEL 26
+ WINDOWSPATCHLEVEL 27
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -26
+ PRODUCTEXTENSION -27
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
- ABOUTBOXPRODUCTVERSIONSUFFIX :build-326
+ ABOUTBOXPRODUCTVERSIONSUFFIX :build-327
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -26
+ PRODUCTEXTENSION -27
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
- ABOUTBOXPRODUCTVERSIONSUFFIX :build-326
+ ABOUTBOXPRODUCTVERSIONSUFFIX :build-327
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
PRODUCTVERSION 4.0
PACKAGEVERSION 4.0
PACKAGEREVISION 1
- PRODUCTEXTENSION -26
+ PRODUCTEXTENSION -27
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -26
+ PRODUCTEXTENSION -27
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -26
+ PRODUCTEXTENSION -27
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -26
+ PRODUCTEXTENSION -27
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -26
+ PRODUCTEXTENSION -27
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -26
+ PRODUCTEXTENSION -27
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
- ABOUTBOXPRODUCTVERSIONSUFFIX :build-326
+ ABOUTBOXPRODUCTVERSIONSUFFIX :build-327
BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index dbc4b57..712555a 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=400
-RSCREVISION=400m1(Build:326)
-BUILD=326
+RSCREVISION=400m1(Build:327)
+BUILD=327
LAST_MINOR=m0
SOURCEVERSION=OOO400
commit d6b43c3a228c527e20ac6be2706d7fb2215b39a7
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Sep 18 00:46:16 2014 +0200
bnc#887307 ODF files not showing up on Windows search
Under Windows 7, ODF and OpenOffice.org 1.1 files were not found,
when the folder containing them was not indexed, and full text
search was switched on. The problem did not occur under Windows 8.
Apparently there is a bug in Windows 7, reading beyond the end of a
BufferStream resulted in 0 bytes read. So we take care not to read
beyond the end of stream.
Change-Id: Id01b08922121dabbb7b49c54f8ef11cb0e4ac413
(cherry picked from commit ae4c836b49a8ac41312f855e24f20b0b050fcbd4)
diff --git a/shell/source/win32/zipfile/zipfile.cxx
b/shell/source/win32/zipfile/zipfile.cxx
index 270fbe1..5dcc02a 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -304,7 +304,7 @@ static bool findCentralDirectoryEnd(StreamInterface *stream)
try
{
- for (long nOffset = nLength - BLOCK_SIZE;
+ for (long nOffset = nLength - BLOCK_SIZE - 4;
nOffset > 0; nOffset -= BLOCK_SIZE)
{
if (findSignatureAtOffset(stream, nOffset))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
