basebmp/inc/basebmp/packedpixeliterator.hxx | 6 ++--
instsetoo_native/util/openoffice.lst | 40 ++++++++++++++--------------
odk/util/makefile.pmk | 2 -
solenv/bin/srcrelease.xml | 2 -
solenv/inc/minor.mk | 8 ++---
solenv/inc/version.lst | 2 -
sysui/desktop/productversion.mk | 2 -
7 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 1a3cf32e8cd4bc5106a5362ebdd41b9a34c2f77c
Author: Mechtilde Stehmann <mechti...@apache.org>
AuthorDate: Wed Jan 9 20:57:59 2019 +0000
Commit: Mechtilde Stehmann <mechti...@apache.org>
CommitDate: Wed Jan 9 20:57:59 2019 +0000
set 0u - so it build under Debian 9 too - thanks Damjan ffor the hint
diff --git a/basebmp/inc/basebmp/packedpixeliterator.hxx
b/basebmp/inc/basebmp/packedpixeliterator.hxx
index a06b0921df9a..1b8d40d67ad5 100644
--- a/basebmp/inc/basebmp/packedpixeliterator.hxx
+++ b/basebmp/inc/basebmp/packedpixeliterator.hxx
@@ -83,7 +83,7 @@ public:
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
/** Bit mask for one pixel (least significant bits)
*/
- bit_mask=~(~0 << bits_per_pixel)
+ bit_mask=~(~0u << bits_per_pixel)
};
private:
@@ -253,7 +253,7 @@ public:
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
/** Bit mask for one pixel (least significant bits)
*/
- bit_mask=~(~0 << bits_per_pixel)
+ bit_mask=~(~0u << bits_per_pixel)
};
private:
@@ -506,7 +506,7 @@ public:
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
/** Bit mask for one pixel (least significant bits)
*/
- bit_mask=~(~0 << bits_per_pixel)
+ bit_mask=~(~0u << bits_per_pixel)
};
// TODO(F2): direction of iteration (ImageIterator can be made to
commit 78baac7df6e8f57efef58993bb9ad29a093d2540
Author: Jim Jagielski <j...@apache.org>
AuthorDate: Wed Jan 9 20:26:58 2019 +0000
Commit: Jim Jagielski <j...@apache.org>
CommitDate: Wed Jan 9 20:26:58 2019 +0000
bump all
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 3fb830864217..ef658540c351 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -6,8 +6,8 @@ Globals
{
APACHEPROJECTNAME Apache OpenOffice
OOOBASEVERSION 4.2
- OOOPACKAGEVERSION 4.2.0
- UREPACKAGEVERSION 4.2.0
+ OOOPACKAGEVERSION 4.5.0
+ UREPACKAGEVERSION 4.5.0
URELAYERVERSION 1
BASISROOTNAME OpenOffice
UNIXBASISROOTNAME openoffice
@@ -59,7 +59,7 @@ Apache_OpenOffice
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.2.0
+ PRODUCTVERSION 4.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -67,15 +67,15 @@ Apache_OpenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.2.0
- BASEPRODUCTVERSION 4.2
+ ABOUTBOXPRODUCTVERSION 4.5.0
+ BASEPRODUCTVERSION 4.5
PCPFILENAME openoffice.pcp
UPDATEURL https://ooo-updates.apache.org/aoonext/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 4.2.0
+ PACKAGEVERSION 4.5.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -120,7 +120,7 @@ Apache_OpenOffice_Dev
{
FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 4.2.0
+ PRODUCTVERSION 4.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -130,8 +130,8 @@ Apache_OpenOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.2.0
- BASEPRODUCTVERSION 4.2
+ ABOUTBOXPRODUCTVERSION 4.5.0
+ BASEPRODUCTVERSION 4.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
@@ -140,7 +140,7 @@ Apache_OpenOffice_Dev
UPDATEURL https://ooo-updates.apache.org/aoonextdev/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
- PACKAGEVERSION 4.2.0
+ PACKAGEVERSION 4.5.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -191,14 +191,14 @@ Apache_OpenOffice_SDK
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
PRODUCTDIRNAME OpenOffice_SDK
- PRODUCTVERSION 4.2.0
+ PRODUCTVERSION 4.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.2.0
+ PACKAGEVERSION 4.5.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -239,13 +239,13 @@ Apache_OpenOffice_Beta_SDK
FULLPRODUCTNAME Apache OpenOffice Beta
PRODUCTNAME OpenOffice Beta
PRODUCTDIRNAME OpenOffice_SDK_Beta
- PRODUCTVERSION 4.2.0
+ PRODUCTVERSION 4.5.0
PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.2.0
+ PACKAGEVERSION 4.5.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -285,7 +285,7 @@ Apache_OpenOffice_Dev_SDK
{
FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 4.2.0
+ PRODUCTVERSION 4.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -294,7 +294,7 @@ Apache_OpenOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.2.0
+ PACKAGEVERSION 4.5.0
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
@@ -338,7 +338,7 @@ Apache_OpenOffice_Beta
{
FULLPRODUCTNAME Apache OpenOffice Beta
PRODUCTNAME OpenOffice Beta
- PRODUCTVERSION 4.2.0
+ PRODUCTVERSION 4.5.0
PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
BASISROOTNAME AOOBeta
@@ -348,14 +348,14 @@ Apache_OpenOffice_Beta
POSTVERSIONEXTENSION
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.2.0
- BASEPRODUCTVERSION 4.2
+ ABOUTBOXPRODUCTVERSION 4.5.0
+ BASEPRODUCTVERSION 4.5
UPDATEURL https://ooo-updates.apache.org/aoonextbeta/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 0
EVAL
- PACKAGEVERSION 4.2.0
+ PACKAGEVERSION 4.5.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 3f00a0dea862..2c241ac09199 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -22,7 +22,7 @@
# used for sdk common files
-PRODUCT_RELEASE=4.2.0
+PRODUCT_RELEASE=4.5.0
OFFICENAME=OpenOffice
.IF "$(GUI)"=="WNT"
SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK
diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index 43c380e1960b..40cf52cadf0e 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -27,7 +27,7 @@
<property name="out.dir" value="."/>
<property name="aoo.name" value="apache-openoffice"/>
<property name="aoo.short.name" value="aoo"/>
- <property name="aoo.ver" value="4.2.0"/>
+ <property name="aoo.ver" value="4.5.0"/>
<property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn
**/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log,
config.parms, config.status, bootstrap, autom4te.cache/**, LinuxX86Env.*,
LinuxX86-64Env.*, MacOSXX86Env.*, MacOSXX64Env.*, winmingw.*, winenv.*,
external/unowinreg/unowinreg.dll" />
<property name="excludes.executables"
value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize,
solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn,
solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate,
solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe,
configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/>
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index aad3a556502e..e2deca5cb30e 100644
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -47,7 +47,7 @@ PRODUCTLIST = openoffice
# default values to minimize maintenance effort
# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 4.2
+PRODUCTVERSION = 4.5
# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
PRODUCTVERSIONSHORT = 4
commit bc86d565eb0ee8dd4420b6b44ef7b9d5eded9638
Author: Jim Jagielski <j...@apache.org>
AuthorDate: Wed Jan 9 19:41:21 2019 +0000
Commit: Jim Jagielski <j...@apache.org>
CommitDate: Wed Jan 9 19:41:21 2019 +0000
and keep with the idea that trunk is 4.5.x
diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
index e1243e58dcb3..22fe050ba8a8 100755
--- a/solenv/inc/version.lst
+++ b/solenv/inc/version.lst
@@ -20,7 +20,7 @@
#**************************************************************
OOOBASEVERSIONMAJOR=4
-OOOBASEVERSIONMINOR=2
+OOOBASEVERSIONMINOR=5
OOOBASEVERSIONMICRO=0
OOOBASEVERSIONDAY=1
commit c67ac5ac0bee7112a36a73891d5bc7c6cff8bf9f
Author: Jim Jagielski <j...@apache.org>
AuthorDate: Wed Jan 9 19:40:25 2019 +0000
Commit: Jim Jagielski <j...@apache.org>
CommitDate: Wed Jan 9 19:40:25 2019 +0000
bump up to outrageous numbers...
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 7cdc1a21eb67..d2c9684586ca 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -20,8 +20,8 @@
# *************************************************************
# $Id$
-RSCVERSION=420
-RSCREVISION=420m1(Build:9800)
-BUILD=9800
+RSCVERSION=450
+RSCREVISION=450m1(Build:1009800)
+BUILD=1009800
LAST_MINOR=m1
-SOURCEVERSION=AOO420
+SOURCEVERSION=AOO450
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
