[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits - setup_native/source wizards/com

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Jan 8 17:30:10 PST 2010


 setup_native/source/packinfo/packinfo_office.txt        |   88 +++++++++++++++-
 setup_native/source/packinfo/spellchecker_selection.txt |   30 +++--
 wizards/com/sun/star/wizards/db/DBMetaData.java         |    4 
 3 files changed, 103 insertions(+), 19 deletions(-)

New commits:
commit 9077a4d7c4e841dcce168eeededcdfe319f98d70
Author: Oliver Bolte <obo at openoffice.org>
Date:   Fri Jan 8 14:24:31 2010 +0000

    CWS-TOOLING: integrate CWS dict32b
    2010-01-08 14:23:17 +0100 tl  r277885 : #i108111# added entries for ar, en-GB, pt installation sets
    2010-01-07 12:02:06 +0100 tl  r277876 : #i101887# extension update
    2010-01-07 11:48:43 +0100 tl  r277875 : #i101887# adding romanian to the list of supported locales
    2010-01-07 11:39:53 +0100 tl  r277874 : #i101963# removed unsupported locales from dictionary.xcu to avoid duplicate entries in EditModules dialog
    2010-01-06 17:30:56 +0100 tl  r277871 : #i101963#, #i101887# fix for missing Catalan and Romanian dictionaries
    2010-01-06 17:30:25 +0100 tl  r277870 : #i101963#, #i101887# fix for missing Catalan and Romanian dictionaries
    2010-01-06 15:57:47 +0100 tl  r277869 : #i74289# fixed readme/license for hyphenation dictionary
    2010-01-06 15:54:58 +0100 tl  r277868 : #i74290# fixed readme/license for hyphenation dictionary
    2010-01-06 15:51:13 +0100 tl  r277867 : #i74290# fixed readme/license for hyphenation dictionary
    2010-01-06 15:26:34 +0100 tl  r277866 : #i108111# fixed use of English dictionaries for nb, nn, ca and ro
    2010-01-06 15:24:49 +0100 tl  r277865 : #i105565# fixed use of split up German dictionaries
    2010-01-05 16:47:35 +0100 tl  r277861 : #i105565# 'de' dictionary extension fix (single extension split into three as in repository)
    2010-01-05 16:47:00 +0100 tl  r277860 : #i105565# 'de' dictionary extension fix (single extension split into three as in repository)
    2010-01-05 16:46:30 +0100 tl  r277859 : #i105565# 'de' dictionary extension fix (single extension split into three as in repository)
    2010-01-05 14:18:46 +0100 tl  r277858 : #i101945# fixed missing Norwegian dictionary packages
    2010-01-05 14:12:56 +0100 tl  r277857 : #i101945# fixed missing Norwegian dictionary packages
    2010-01-05 11:55:19 +0100 tl  r277855 : #96422# fixed dictionary list for 'sh' builds
    2010-01-05 11:49:44 +0100 tl  r277854 : #96422# duplicate entry in supported language list

diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index b3e68ac..d4ba6e1 100755
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -508,6 +508,22 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Ca"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ca"
+solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ca"
+requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+linuxpatchrequires = ""
+copyright = "1999-2009 by Sun Microsystems"
+solariscopyright = "solariscopyrightfile"
+vendor = "Sun Microsystems, Inc."
+description = "Ca dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Cs"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-cs"
@@ -540,17 +556,49 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
-module = "gid_Module_Root_Extension_Dictionary_De"
+module = "gid_Module_Root_Extension_Dictionary_De_AT"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-de-AT"
+solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-de-AT"
+requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+linuxpatchrequires = ""
+copyright = "1999-2009 by Sun Microsystems"
+solariscopyright = "solariscopyrightfile"
+vendor = "Sun Microsystems, Inc."
+description = "De-AT dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
+module = "gid_Module_Root_Extension_Dictionary_De_CH"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-de-CH"
+solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-de-CH"
+requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+linuxpatchrequires = ""
+copyright = "1999-2009 by Sun Microsystems"
+solariscopyright = "solariscopyrightfile"
+vendor = "Sun Microsystems, Inc."
+description = "De-CH dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
+module = "gid_Module_Root_Extension_Dictionary_De_DE"
 script = "shellscripts_extensions.txt"
-solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-de"
+solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-de-DE"
 solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-de"
+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-de-DE"
 requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2009 by Sun Microsystems"
 solariscopyright = "solariscopyrightfile"
 vendor = "Sun Microsystems, Inc."
-description = "De dictionary for %PRODUCTNAME %PRODUCTVERSION"
+description = "De-DE dictionary for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
@@ -732,6 +780,22 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_No"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-no"
+solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-no"
+requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+linuxpatchrequires = ""
+copyright = "1999-2009 by Sun Microsystems"
+solariscopyright = "solariscopyrightfile"
+vendor = "Sun Microsystems, Inc."
+description = "No dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Pl"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-pl"
@@ -764,6 +828,22 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Ro"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ro"
+solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ro"
+requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+linuxpatchrequires = ""
+copyright = "1999-2009 by Sun Microsystems"
+solariscopyright = "solariscopyrightfile"
+vendor = "Sun Microsystems, Inc."
+description = "Ro dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Ru"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ru"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 2abcc10..03d741b 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -4,34 +4,38 @@
 # Second column: Assigned spellchecker languages. Comma separated list.
 
 af = "af,en-US"
-ca = "ca,es,en,fr"
+ar = "en-US"
+ca = "ca,es,en-US,fr"
 cs = "cs,en-US"
-da = "da,de,en-US"
-de = "de,en-US,fr,it"
+da = "da,de-DE,en-US"
+de = "de-AT,de-CH,de-DE,en-US,fr,it"
 en-US = "en-US,es,fr"
+en-GB = "en-US,es,fr"
 es = "en-US,es,fr,pt"
 et = "en-US,et"
 fr = "en-US,es,fr"
 gl = "en-US,pt,es,gl"
 he = "en-US,he"
-hu = "de,en-US,hu"
-it = "de,en-US,fr,it"
+hu = "de-DE,en-US,hu"
+it = "de-DE,en-US,fr,it"
 ja = "en-US"
 ko = "en-US"
 lt = "en-US,lt"
-nb = "no,en,fr,de,es"
+nb = "no,en-US,fr,de-DE,es"
 ne = "en-US,ne"
-nl = "en-US,fr,de,nl"
-nn = "no,en,fr,de,es"
-pl = "de,en-US,pl,ru"
+nl = "en-US,fr,de-DE,nl"
+nn = "no,en-US,fr,de-DE,es"
+pl = "de-DE,en-US,pl,ru"
 pt-BR = "en-US,es,pt"
-ro = "ro,en,de,hu"
-ru = "de,en-US,ru"
+pt = "en-US,es,pt"
+ro = "ro,en-US,de-DE,hu"
+ru = "de-DE,en-US,ru"
 sk = "en-US,sk"
 sl = "en-US,sl"
-sv = "de,en-US,sv"
+sv = "de-DE,en-US,sv"
 sr = "sr,en-US"
-sh = "sh,en-US"
+# ! Note the package 'sr' also holds the dictionaries for 'sh' !
+sh = "sr,en-US"
 sw = "en-US,sw"
 th = "en-US,th"
 vi = "en-US,fr,vi"
commit 86df0cb91f080c36f6c60b00b0d51c1818f19493
Author: Oliver Bolte <obo at openoffice.org>
Date:   Fri Jan 8 09:22:30 2010 +0000

    CWS-TOOLING: integrate CWS dba32k
    2010-01-07 10:56:59 +0100 fs  r277873 : #i108123# getDataSourcePrefixFromMediaType: care for types where the config says 'no extension', but the actual file contains an extension
    2010-01-05 18:11:23 +0100 pl  r277862 : #i108068# always release solar mutex before calling into UNO
    2010-01-05 12:47:51 +0100 oj  r277856 : #i107793# set props in endDoc
    2010-01-05 09:59:29 +0100 fs  r277852 : #i10000#
    2010-01-05 08:51:21 +0100 oj  r277851 : #i107794# fix for WChar
    2010-01-04 14:58:14 +0100 fs  r277849 : #i108019#
    2010-01-04 14:57:49 +0100 fs  r277848 : #i108040#
    2010-01-04 13:56:14 +0100 fs  r277843 : #i107917# do not access xDataSource for reading, but use getDataSource()
    2010-01-04 12:08:25 +0100 fs  r277841 : #i107845# when composing the new filter, *first* use the old filter, then the new one - order matters
    2010-01-04 11:57:05 +0100 fs  r277840 : manual CWS creation: create CWS dba32k from OOO320_m8 tag

diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 88cbfdf..69e6ba2 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -599,8 +599,8 @@ public class DBMetaData
 
     public void getDataSourceInterfaces() throws Exception
     {
-        xCompleted = (XCompletedConnection) UnoRuntime.queryInterface(XCompletedConnection.class, xDataSource);
-        xDataSourcePropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xDataSource);
+        xCompleted = (XCompletedConnection) UnoRuntime.queryInterface(XCompletedConnection.class, getDataSource());
+        xDataSourcePropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, getDataSource());
         bPasswordIsRequired = ((Boolean) xDataSourcePropertySet.getPropertyValue("IsPasswordRequired")).booleanValue();
     }
 


More information about the ooo-build-commit mailing list