Hello community, here is the log from the commit of package libreoffice-components for openSUSE:Factory checked in at Mon Feb 21 15:24:50 CET 2011.
-------- --- libreoffice-components/libreoffice-components.changes 2011-01-11 17:36:37.000000000 +0100 +++ libreoffice-components/libreoffice-components.changes 2011-02-16 16:46:36.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Feb 16 16:27:04 CET 2011 - [email protected] + +- updated to libreoffice-3.3.1.2 (3.3.1-rc2) + +------------------------------------------------------------------- +Tue Feb 8 20:53:59 CET 2011 - [email protected] + +- updated to libreoffice-3.3.1.1 (3.3.1-rc1) + +------------------------------------------------------------------- +Mon Jan 31 20:32:38 CET 2011 - [email protected] + +- libreoffice-build-3.3.0.4 == 3.3.0-rc4 == final + +------------------------------------------------------------------- +Wed Jan 19 12:58:21 CET 2011 - [email protected] + +- updated to libreoffice-3.3.0.4 (3.3-rc4) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-components-3.3.0.3.tar.bz2 New: ---- libreoffice-components-3.3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-components.spec ++++++ --- /var/tmp/diff_new_pack.iQIPA4/_old 2011-02-21 15:24:20.000000000 +0100 +++ /var/tmp/diff_new_pack.iQIPA4/_new 2011-02-21 15:24:20.000000000 +0100 @@ -21,11 +21,11 @@ Name: libreoffice-components # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.3.0.3 +Version: 3.3.1.2 Release: 1 %define piece components -%define ooo_build_version 3.3.0.3 -%define ooo_piece_version 3.3.0.3 +%define ooo_build_version 3.3.1.2 +%define ooo_piece_version 3.3.1.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-components-3.3.0.3.tar.bz2 -> libreoffice-components-3.3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.3/ChangeLog new/libreoffice-components-3.3.1.2/ChangeLog --- old/libreoffice-components-3.3.0.3/ChangeLog 2011-01-10 19:57:29.000000000 +0100 +++ new/libreoffice-components-3.3.1.2/ChangeLog 2011-02-15 20:11:57.000000000 +0100 @@ -1,3 +1,143 @@ +2011-02-15 Petr Mladek <[email protected]> [a2948caa8c99a1b5dd76402e79c5b1e2b31b3e7b] + +Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) + + +2011-02-08 Petr Mladek <[email protected]> [0038bc6128921ad380912b18634212681578abfd] + +Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) + + +2011-02-08 [email protected] <Bjoern Michaelsen> [d7771bc638587e49ea7225312933c73cfc041439] + +lp#696527: enable human icon theme in LibreOffice (cherry picked from commit cfa7e88f5959a8b3b729107d61351410be80f49b) + +Signed-off-by: Thorsten Behrens <[email protected]> +(cherry picked from commit c1d45fdb7f6380a0e6640a336cd790027e903b4f) + +Signed-off-by: Cedric Bosdonnat <[email protected]> +Signed-off-by: Petr Mladek <[email protected]> + +2011-02-07 Jan Holesovsky <[email protected]> [474fbc4e896114f138061af9002b88cd675c8f01] + +Branch libreoffice-3-3-1 + +This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. +Only very safe changes, reviewed by three people are allowed. + +If you want to commit more complicated fix for the next 3.3.x release, +please use the 'libreoffice-3-3' branch. + +If you want to build something cool, unstable, and risky, use master. + +2011-02-06 Petr Mladek <[email protected]> [94a2ea07194893531b93b78c2903d96bbc5526ce] + +add Ukrainian also into packinfo_office.txt + + +2011-02-06 Petr Mladek <[email protected]> [e6e8d8ebbe2ef54704a467cf4930494fdf3be6ff] + +add Occitan also into packinfo_office.txt + +build fails witout it + +2011-02-05 Thorsten Behrens <[email protected]> [7754d67735a8e698d2b7106cae4c6e35eaf3b75b] + +New mimetype icons for LibreOffice + +Update from design team, source svg is +http://wiki.documentfoundation.org/cgi_img_auth.php/d/d4/LibreOffice_Initial_Icons-pre_final.svg + +2011-02-03 Caolán McNamara <[email protected]> [adbc618d68569d5b63d1ec87c5d7a9d7f5ba5761] + +Resolves: rhbz#673819 crash on changing position of drawing object in header + +The header/footer objects are cunning wrappers to pretend to some parts +of the drawing stuff that there are multiple objects, while in reality +there is only one. So call HasText actually gets a totally different +object from the cast :-( + +Signed-off-by: David Tardon <[email protected]> + +2011-02-03 Rene Engelhard <[email protected]> [13519789cd6c9f86067251c5566f29a96bdaac44] + +another s/OpenOffice.org/LibreOffice/ in nsplugin + + +2011-02-01 Andras Timar <[email protected]> [c0c2964c3ad1a42a5cd3548b9fcdd1c256c077bf] + +Added Occitan dictionary + + +2011-02-01 Andras Timar <[email protected]> [eacd19b0e2eeba91aa1b2387d93e99996c0efae2] + +Added Ukrainian dictionaries + + +2011-02-01 Tor Lillqvist <[email protected]> [ecf859006048314ef1c4a4202a642e74a443ebce] + +Fix overflow problem in the custom action for UI language de-selection + +In the _all_ installer we have slightly over 100 LibreOffice UI +languages. The code in the custom action that de-selects UI languages +based on the Windows UI language(s) and the user's locale had a limit +of 100. + +The consequence was that a few of the alphabetically last LibreOffice +UI languages: Ukrainan, Urdu, Uzbek, Venda and Xhosa, were not +de-selected even if none of those languages was used by the user or +Windows, and thus got installed in a "quick" install and also in a +"custom" install unless the person running the installer noticed. + +Reported by aseques_ on IRC, no bug filed yet. + +Signed-off-by: Fridrich Štrba <[email protected]> + +2011-01-26 Thorsten Behrens <[email protected]> [a73c1cff1b27dbef84f0d85d594f9628bb48a827] + +Revert "Initial LibO mimetype icon design" + +This reverts commit bf7cc5f6751d566bccb45b09fb15f82e56fe3333. + +2011-01-26 Alexander Thurgood <[email protected]> [88a6c07dc231ed3508ffe81ec624a753f4c49e75] + +Fix window focus for langpack installation on Mac fdo# 33056 + +Signed-off-by: Thorsten Behrens <[email protected]> + +2011-01-20 Thorsten Behrens <[email protected]> [bf7cc5f6751d566bccb45b09fb15f82e56fe3333] + +Initial LibO mimetype icon design + +As per http://luxate.blogspot.com/2011/01/libreoffice-initial-icons-milestone.html +updating the LibO mimetype and app icons (and the installer icon, for coherence). + +2011-01-14 Kohei Yoshida <[email protected]> [f7d7948cbe9e38e2e219f6024c0add130a5f6480] + +Remove pesky on-line registration menu entry. (fdo#33112) + + +2011-01-11 Petr Mladek <[email protected]> [3097feb2f56b19a1b10b167f5c5869e2c7920be9] + +Please, ignore the previous message; it was for the libreoffice-3-3-0 branch + +This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. +Only safe changes, reviewed by anoter person are allowed. + +If you want to build something cool, unstable, and risky, use master. + +2011-01-11 Petr Mladek <[email protected]> [1b83f908126d09ef6e0015eb531bbd8c4cf57034] + +Branch libreoffice-3-3-0 + +This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. +Only very safe changes, reviewed by three people are allowed. + +If you want to commit more complicated fix for the next 3.3.x release, +please use the 'libreoffice-3-3' branch. + +If you want to build something cool, unstable, and risky, use master. + 2011-01-10 Petr Mladek <[email protected]> [ccb6459c4e16693c8416a5ac21269491f539f1a8] Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.3/cui/source/options/optgdlg.src new/libreoffice-components-3.3.1.2/cui/source/options/optgdlg.src --- old/libreoffice-components-3.3.0.3/cui/source/options/optgdlg.src 2011-01-05 19:03:36.000000000 +0100 +++ new/libreoffice-components-3.3.1.2/cui/source/options/optgdlg.src 2011-02-11 22:12:35.000000000 +0100 @@ -270,6 +270,7 @@ < "Tango" ; > ; < "Oxygen" ; > ; < "Classic" ; > ; + < "Human" ; > ; }; }; CheckBox CB_SYSTEM_FONT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.3/cui/source/tabpages/swpossizetabpage.cxx new/libreoffice-components-3.3.1.2/cui/source/tabpages/swpossizetabpage.cxx --- old/libreoffice-components-3.3.0.3/cui/source/tabpages/swpossizetabpage.cxx 2010-11-11 20:08:57.000000000 +0100 +++ new/libreoffice-components-3.3.1.2/cui/source/tabpages/swpossizetabpage.cxx 2011-02-04 16:02:06.000000000 +0100 @@ -1930,7 +1930,10 @@ } // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE - if( rMarkList.GetMarkCount() == 1 ) + if( rMarkList.GetMarkCount() != 1 ) + m_bIsMultiSelection = true; +#if OSL_DEBUG_LEVEL > 1 + else { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier(); @@ -1941,8 +1944,7 @@ DBG_ERROR("AutoWidth/AutoHeight should be enabled"); } } - else - m_bIsMultiSelection = true; +#endif // use page offset and recalculate Point aPt( m_pSdrView->GetSdrPageView()->GetPageOrigin() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.3/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml new/libreoffice-components-3.3.1.2/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml --- old/libreoffice-components-3.3.0.3/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2010-11-11 16:12:41.000000000 +0100 +++ new/libreoffice-components-3.3.1.2/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2011-01-14 21:23:53.000000000 +0100 @@ -85,7 +85,6 @@ <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.3/extensions/source/nsplugin/source/nsplugin_oo.rc new/libreoffice-components-3.3.1.2/extensions/source/nsplugin/source/nsplugin_oo.rc --- old/libreoffice-components-3.3.0.3/extensions/source/nsplugin/source/nsplugin_oo.rc 2010-11-11 16:12:41.000000000 +0100 +++ new/libreoffice-components-3.3.1.2/extensions/source/nsplugin/source/nsplugin_oo.rc 2011-02-04 16:02:06.000000000 +0100 @@ -26,5 +26,5 @@ ************************************************************************/ #define ADDITIONAL_VERINFO1 value "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\ value "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0" -#define ADDITIONAL_VERINFO2 value "FileDescription", "OpenOffice.org Plug-in handles all its documents" value "ProductName", "OpenOffice.org Plug-in" value "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|" +#define ADDITIONAL_VERINFO2 value "FileDescription", "LibreOffice Plug-in handles all its documents" value "ProductName", "LibreOffice Plug-in" value "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|" #define ADDITIONAL_VERINFO3 "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.3/setup_native/scripts/osx_install_languagepack.applescript new/libreoffice-components-3.3.1.2/setup_native/scripts/osx_install_languagepack.applescript --- old/libreoffice-components-3.3.0.3/setup_native/scripts/osx_install_languagepack.applescript 2010-11-11 16:12:41.000000000 +0100 +++ new/libreoffice-components-3.3.1.2/setup_native/scripts/osx_install_languagepack.applescript 2011-02-02 13:16:36.000000000 +0100 @@ -39,6 +39,7 @@ set sourcedir to (do shell script "dirname " & quoted form of POSIX path of (path to of me)) +activate display dialog intro buttons {AbortLabel, InstallLabel} default button 2 if (button returned of result) is AbortLabel then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.3/setup_native/source/packinfo/packinfo_office.txt new/libreoffice-components-3.3.1.2/setup_native/source/packinfo/packinfo_office.txt --- old/libreoffice-components-3.3.0.3/setup_native/source/packinfo/packinfo_office.txt 2011-01-04 11:24:33.000000000 +0100 +++ new/libreoffice-components-3.3.1.2/setup_native/source/packinfo/packinfo_office.txt 2011-02-06 18:20:38.000000000 +0100 @@ -828,6 +828,22 @@ End Start +module = "gid_Module_Root_Extension_Dictionary_Oc" +script = "shellscripts_extensions.txt" +solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-oc" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-oc" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +linuxpatchrequires = "" +copyright = "1990-2011 by Dicollecte" +solariscopyright = "solariscopyrightfile" +vendor = "Dicollecte" +description = "Occitan-languedocian dictionary for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start module = "gid_Module_Root_Extension_Dictionary_Pl" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pl" @@ -986,6 +1002,22 @@ destpath = "/opt" packageversion = "%PACKAGEVERSION" End + +Start +module = "gid_Module_Root_Extension_Dictionary_Uk" +script = "shellscripts_extensions.txt" +solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-uk" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-uk" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +linuxpatchrequires = "" +copyright = "1999-2009 by Vladimir Yakovchuk, Oleg Podgurniy, Dmytro Kovalyov, Maksym Polyakov, Andriy Rysin, Valentyn Solomko, Volodymyr M. Lisivka, Eugeniy Meshcheryakov" +solariscopyright = "solariscopyrightfile" +vendor = "Document Foundation" +description = "Ukrainian dictionary for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End Start module = "gid_Module_Root_Extension_Dictionary_Vi" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.3/setup_native/source/packinfo/spellchecker_selection.txt new/libreoffice-components-3.3.1.2/setup_native/source/packinfo/spellchecker_selection.txt --- old/libreoffice-components-3.3.0.3/setup_native/source/packinfo/spellchecker_selection.txt 2010-11-11 16:12:41.000000000 +0100 +++ new/libreoffice-components-3.3.1.2/setup_native/source/packinfo/spellchecker_selection.txt 2011-02-02 13:16:36.000000000 +0100 @@ -32,6 +32,7 @@ ne = "ne,en-US" nl = "nl,en-US,fr,de-DE" nn = "no,en-US,fr,de-DE,es" +oc = "oc,fr,en-US" pl = "pl,de-DE,en-US,ru" pt-BR = "pt,en-US,es" pt = "pt,en-US,es" @@ -45,7 +46,7 @@ sh = "sr,en-US" sw = "sw,en-US" th = "th,en-US" -uk = "ru,en-US" +uk = "uk,ru,en-US" vi = "vi,en-US,fr" zh-TW = "EMPTY,en-US" zh-CN = "EMPTY,en-US" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.3/setup_native/source/win32/customactions/sellang/sellang.cxx new/libreoffice-components-3.3.1.2/setup_native/source/win32/customactions/sellang/sellang.cxx --- old/libreoffice-components-3.3.0.3/setup_native/source/win32/customactions/sellang/sellang.cxx 2010-11-11 16:12:41.000000000 +0100 +++ new/libreoffice-components-3.3.1.2/setup_native/source/win32/customactions/sellang/sellang.cxx 2011-02-02 13:16:36.000000000 +0100 @@ -28,28 +28,23 @@ * ************************************************************************/ +/* Currently the "all" installer has a bit over 100 UI languages, and + * I doubt it will grow a lot over that. + */ +#define MAX_LANGUAGES 200 + #define WIN32_LEAN_AND_MEAN #define _WIN32_WINNT 0x0500 #undef WINVER #define WINVER 0x0500 -#pragma warning(push, 1) /* disable warnings within system headers as - * warnings are now treated as errors... - */ #include <windows.h> #include <msiquery.h> #include <malloc.h> -#ifdef UNICODE -#define _UNICODE -#define _tstring wstring -#else -#define _tstring string -#endif -#include <tchar.h> -#include <string> #include <stdio.h> -#pragma warning(pop) +#include <stdlib.h> +#include <string.h> #include <sal/macros.h> #include <systools/win32/uwinapi.h> @@ -59,10 +54,10 @@ static const char * langid_to_string( LANGID langid, int *have_default_lang ) { - /* Map from LANGID to string. The languages below are in the same - * seemingly random order as in - * setup_native/source/win32/msi-encodinglist.txt. - * Only the language part is returned in the string. + /* Map from LANGID to string. The languages below are now in + * alphabetical order of codes as in + * setup_native/source/win32/msi-encodinglist.txt. Only the + * language part is returned in the string. */ switch (PRIMARYLANGID (langid)) { case LANG_ENGLISH: @@ -70,112 +65,110 @@ langid == MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT)) *have_default_lang = 1; return "en"; -#define CASE(primary, name) \ +#define CASE(name, primary) \ case LANG_##primary: return #name - CASE(PORTUGUESE, pt); - CASE(RUSSIAN, ru); - CASE(GREEK, el); - CASE(DUTCH, nl); - CASE(FRENCH, fr); - CASE(SPANISH, es); - CASE(FINNISH, fi); - CASE(HUNGARIAN, hu); - CASE(CATALAN, ca); - CASE(ITALIAN, it); - CASE(CZECH, cs); - CASE(SLOVAK, sk); - CASE(DANISH, da); - CASE(SWEDISH, sv); - CASE(POLISH, pl); - CASE(GERMAN, de); - CASE(THAI, th); - CASE(ESTONIAN, et); - CASE(JAPANESE, ja); - CASE(KOREAN, ko); - // CASE(KHMER, km); - // CASE(WELSH, cy); - CASE(CHINESE, zh); - CASE(TURKISH, tr); - CASE(HINDI, hi); - CASE(PUNJABI, pa); - CASE(TAMIL, ta); - CASE(ARABIC, ar); - CASE(HEBREW, he); - CASE(AFRIKAANS, af); - CASE(ALBANIAN, sq); - CASE(ARMENIAN, hy); - CASE(BASQUE, eu); - CASE(BELARUSIAN, be); - CASE(BENGALI, bn); - CASE(BULGARIAN, bg); - CASE(ICELANDIC, is); - CASE(INDONESIAN, id); - // CASE(LAO, lo); - CASE(LATVIAN, lv); - CASE(LITHUANIAN, lt); - // CASE(MALTESE, mt); - // CASE(ROMANSH, rm); - CASE(ROMANIAN, ro); - // CASE(KINYARWANDA, rw); - CASE(SANSKRIT, sa); - // CASE(SETSWANA, tn); - CASE(FARSI, fa); - CASE(FAEROESE, fo); - CASE(SLOVENIAN, sl); - // CASE(SORBIAN, sb); - // CASE(SUTU, st); - CASE(SWAHILI, sw); - CASE(TATAR, tt); - // CASE(TSONGA, ts); - CASE(UKRAINIAN, uk); - CASE(URDU, ur); - CASE(VIETNAMESE, vi); - // CASE(XHOSA, xh); - // CASE(YIDDISH, yi); - // CASE(ZULU, zu); - CASE(GUJARATI, gu); - // CASE(BRETON, br); - CASE(NEPALI, ne); - // CASE(NDEBELE, nr); - // CASE(SWAZI, ss); - // CASE(VENDA, ve); - // CASE(IRISH, ga); - CASE(MACEDONIAN, mk); - CASE(TELUGU, te); - CASE(MALAYALAM, ml); - CASE(MARATHI, mr); - CASE(ORIYA, or); - // CASE(KURDISH, ku); - // CASE(TAGALOG, tg); - // CASE(TIGRINYA, ti); - CASE(GALICIAN, gl); - CASE(KANNADA, kn); - CASE(MALAY, ms); - // CASE(TAJIK, tg); - CASE(GEORGIAN, ka); - // CASE(ESPERANTO, eo); + CASE(af, AFRIKAANS); + CASE(ar, ARABIC); + CASE(as, ASSAMESE); + CASE(be, BELARUSIAN); + CASE(bg, BULGARIAN); + CASE(bn, BENGALI); + CASE(br, BRETON); + CASE(ca, CATALAN); + CASE(cs, CZECH); + CASE(cy, WELSH); + CASE(da, DANISH); + CASE(de, GERMAN); + CASE(el, GREEK); + CASE(es, SPANISH); + CASE(et, ESTONIAN); + CASE(eu, BASQUE); + CASE(fa, FARSI); + CASE(fi, FINNISH); + CASE(fo, FAEROESE); + CASE(fr, FRENCH); + CASE(ga, IRISH); + CASE(gl, GALICIAN); + CASE(gu, GUJARATI); + CASE(he, HEBREW); + CASE(hi, HINDI); + CASE(hu, HUNGARIAN); + CASE(hy, ARMENIAN); + CASE(id, INDONESIAN); + CASE(is, ICELANDIC); + CASE(it, ITALIAN); + CASE(ja, JAPANESE); + CASE(ka, GEORGIAN); + CASE(km, KHMER); + CASE(kn, KANNADA); + CASE(ko, KOREAN); + CASE(ks, KASHMIRI); + CASE(lo, LAO); + CASE(lt, LITHUANIAN); + CASE(lv, LATVIAN); + CASE(mk, MACEDONIAN); + CASE(ml, MALAYALAM); + CASE(mn, MONGOLIAN); + CASE(mr, MARATHI); + CASE(ms, MALAY); + CASE(mt, MALTESE); + CASE(ne, NEPALI); + CASE(nl, DUTCH); + CASE(ns, SOTHO); + CASE(or, ORIYA); + CASE(pa, PUNJABI); + CASE(pl, POLISH); + CASE(pt, PORTUGUESE); + CASE(rm, ROMANSH); + CASE(ro, ROMANIAN); + CASE(ru, RUSSIAN); + CASE(rw, KINYARWANDA); + CASE(sa, SANSKRIT); + CASE(sb, UPPER_SORBIAN); + CASE(sd, SINDHI); + CASE(sk, SLOVAK); + CASE(sl, SLOVENIAN); + CASE(sq, ALBANIAN); + CASE(sv, SWEDISH); + CASE(sw, SWAHILI); + CASE(ta, TAMIL); + CASE(te, TELUGU); + CASE(tg, TAJIK); + CASE(th, THAI); + CASE(ti, TIGRIGNA); + CASE(tn, TSWANA); + CASE(tr, TURKISH); + CASE(tt, TATAR); + CASE(uk, UKRAINIAN); + CASE(ur, URDU); + CASE(uz, UZBEK); + CASE(vi, VIETNAMESE); + CASE(xh, XHOSA); + CASE(zh, CHINESE); + CASE(zu, ZULU); #undef CASE /* Special cases */ default: switch (langid) { case MAKELANGID(LANG_SERBIAN, 0x05): return "bs"; -#define CASE(primary, sub, name) \ +#define CASE(name, primary, sub) \ case MAKELANGID(LANG_##primary, SUBLANG_##sub): return #name - CASE(NORWEGIAN, NORWEGIAN_BOKMAL, nb); - CASE(NORWEGIAN, NORWEGIAN_NYNORSK, nn); - CASE(SERBIAN, DEFAULT, hr); - CASE(SERBIAN, SERBIAN_LATIN, sh); - CASE(SERBIAN, SERBIAN_CYRILLIC, sr); - // CASE(SOTHO, DEFAULT, ns); - // CASE(SOTHO, SOTHO_SOUTHERN, st); + CASE(hr, SERBIAN, DEFAULT); + CASE(nb, NORWEGIAN, NORWEGIAN_BOKMAL); + CASE(nn, NORWEGIAN, NORWEGIAN_NYNORSK); + CASE(sh, SERBIAN, SERBIAN_LATIN); + CASE(sr, SERBIAN, SERBIAN_CYRILLIC); #undef CASE default: return ""; } } } -static const char *ui_langs[100]; +/* Here we collect the UI languages present on the system; + * MAX_LANGUAGES is certainly enough for that + */ +static const char *ui_langs[MAX_LANGUAGES]; static int num_ui_langs = 0; BOOL CALLBACK @@ -209,10 +202,7 @@ MSIHANDLE database, view, record; DWORD length; int nlangs = 0; - /* Keeping this code simple and stupid... won't bother with any - * dynamic arrays or whatnot. 100 is more than enough for this purpose. - */ - char langs[100][6]; + char langs[MAX_LANGUAGES][6]; database = MsiGetActiveDatabase(handle); @@ -235,7 +225,8 @@ MessageBoxA(NULL, "MsiViewExecute success!", "SelectLanguage", MB_OK); #endif - while (MsiViewFetch(view, &record) == ERROR_SUCCESS) { + while (nlangs < MAX_LANGUAGES && + MsiViewFetch(view, &record) == ERROR_SUCCESS) { length = sizeof(feature); if (MsiRecordGetStringA(record, 1, feature, &length) != ERROR_SUCCESS) { MsiCloseHandle(record); Files old/libreoffice-components-3.3.0.3/setup_native/source/win32/nsis/ooosetup.ico and new/libreoffice-components-3.3.1.2/setup_native/source/win32/nsis/ooosetup.ico differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
