[Libreoffice-commits] .: 7 commits - forms/source setup_native/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Sun Oct 24 09:45:59 PDT 2010
forms/source/component/ListBox.cxx | 4 ++++
setup_native/source/java/javaversion.dat | 26 +++++++++++++-------------
setup_native/source/java/javaversion2.dat | 26 +++++++++++++-------------
3 files changed, 30 insertions(+), 26 deletions(-)
New commits:
commit c16d1db2c8ed36dba7923fb64b9fe2e86e42102c
Merge: c9f3630... 03cfe2c...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sun Oct 24 15:36:39 2010 +0200
Merge commit 'ooo/OOO330_m12'
commit 03cfe2c9032b9236d283735f95c58ba917e2786f
Merge: 6a15348... 8de8dac...
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Oct 20 16:41:18 2010 +0200
CWS-TOOLING: integrate CWS dba33k
commit 6a1534819edb7276bbc18056df92bbed2015e0d3
Merge: 3bc9d66... ea7d547...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Thu Oct 14 16:04:21 2010 +0200
CWS-TOOLING: integrate CWS native338
commit ea7d547c4e26b9d025de502596d0ba2c8e2af773
Author: Ingo Schmidt <is at openoffice.org>
Date: Wed Oct 13 14:56:29 2010 +0200
native338 #i115046# new jre6u22
diff --git a/setup_native/source/java/javaversion.dat b/setup_native/source/java/javaversion.dat
index bb935ac..a647694 100755
--- a/setup_native/source/java/javaversion.dat
+++ b/setup_native/source/java/javaversion.dat
@@ -26,30 +26,30 @@
#*************************************************************************
# GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 21
-WINDOWSJAVAVERSION=Java 6 Update 21
+JAVAVERSION=Java 6 Update 22
+WINDOWSJAVAVERSION=Java 6 Update 22
# Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u21-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_21
+WINDOWSJAVAFILENAME=jre-6u22-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_22
# Linux (scp2)
-LINUXJAVAFILENAME=jre-6u21-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u22-linux-i586.rpm
# Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_21-fcs
+LINUXJAVANAME=jre-1.6.0_22-fcs
# Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u21-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u22-linux-amd64.rpm
# Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_21_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_21_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_21_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_22_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_22_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_22_sparc.tar.gz
# Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_21_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_21_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_21_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_22_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_22_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_22_x86.tar.gz
# Solaris (pkgUnit.xml, needs only to be changed in major changes)
SOLARISJAVART=SUNWj6rt
diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
index bb935ac..a647694 100644
--- a/setup_native/source/java/javaversion2.dat
+++ b/setup_native/source/java/javaversion2.dat
@@ -26,30 +26,30 @@
#*************************************************************************
# GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 21
-WINDOWSJAVAVERSION=Java 6 Update 21
+JAVAVERSION=Java 6 Update 22
+WINDOWSJAVAVERSION=Java 6 Update 22
# Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u21-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_21
+WINDOWSJAVAFILENAME=jre-6u22-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_22
# Linux (scp2)
-LINUXJAVAFILENAME=jre-6u21-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u22-linux-i586.rpm
# Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_21-fcs
+LINUXJAVANAME=jre-1.6.0_22-fcs
# Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u21-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u22-linux-amd64.rpm
# Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_21_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_21_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_21_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_22_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_22_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_22_sparc.tar.gz
# Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_21_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_21_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_21_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_22_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_22_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_22_x86.tar.gz
# Solaris (pkgUnit.xml, needs only to be changed in major changes)
SOLARISJAVART=SUNWj6rt
commit 8de8dac8d7ad32dc992ac061d8f4960b43c1436a
Merge: 3a3bcbd... 720a931...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Sep 28 13:36:17 2010 +0200
dba33k: merge
commit 3a3bcbdc1bf3dc804b738552c1c9f8bcf0ee74f8
Merge: b0f8524... 414f166...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Sep 28 12:32:26 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba33j
commit 720a931f98327e2ae92ed5c68c1b1504c8d4bcad
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Tue Sep 28 11:45:50 2010 +0200
dba33j: #i113631# loadData: restore m_nNULLPos/m_nBoundColumnType when old list data is still cached
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index fe24fc2..d15125d 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -647,6 +647,8 @@ namespace frm
DBG_ASSERT( m_eListSourceType != ListSourceType_VALUELIST, "OListBoxModel::loadData: cannot load value list from DB!" );
DBG_ASSERT( !hasExternalListSource(), "OListBoxModel::loadData: cannot load from DB when I have an external list source!" );
+ const sal_Int16 nNULLPosBackup( m_nNULLPos );
+ const sal_Int32 nBoundColumnTypeBackup( m_nBoundColumnType );
m_nNULLPos = -1;
m_nBoundColumnType = DataType::SQLNULL;
@@ -782,6 +784,8 @@ namespace frm
// if none of the settings of the row set changed, compared to the last
// invocation of loadData, then don't re-fill the list. Instead, assume
// the list entries are the same.
+ m_nNULLPos = nNULLPosBackup;
+ m_nBoundColumnType = nBoundColumnTypeBackup;
return;
}
xListCursor.reset( m_aListRowSet.execute() );
More information about the Libreoffice-commits
mailing list