[Libreoffice-commits] .: 24 commits - extensions/source package/source setup_native/scripts setup_native/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Feb 7 17:08:25 PST 2011
extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml | 1
extensions/source/nsplugin/source/nsplugin_oo.rc | 2
extensions/source/nsplugin/source/so_env.cxx | 10 ++-
package/source/zipapi/ZipFile.cxx | 9 ++
setup_native/scripts/osx_install_languagepack.applescript | 1
setup_native/source/packinfo/packinfo_office.txt | 32 ++++++++++
setup_native/source/win32/nsis/ooosetup.ico |binary
7 files changed, 48 insertions(+), 7 deletions(-)
New commits:
commit 279464d98f93b839c79e90135ec83d6c540c9153
Merge: cfa7e88... 94a2ea0...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Feb 8 00:10:21 2011 +0100
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
cui/source/tabpages/swpossizetabpage.cxx
commit 94a2ea07194893531b93b78c2903d96bbc5526ce
Author: Petr Mladek <pmladek at suse.cz>
Date: Sun Feb 6 18:22:35 2011 +0100
add Ukrainian also into packinfo_office.txt
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 8701df0..7958977 100755
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -838,7 +838,7 @@ linuxpatchrequires = ""
copyright = "1990-2011 by Dicollecte"
solariscopyright = "solariscopyrightfile"
vendor = "Dicollecte"
-description = "Oc dictionary for %PRODUCTNAME %PRODUCTVERSION"
+description = "Occitan-languedocian dictionary for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
End
@@ -1004,6 +1004,22 @@ 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"
script = "shellscripts_extensions.txt"
solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-vi"
commit e6e8d8ebbe2ef54704a467cf4930494fdf3be6ff
Author: Petr Mladek <pmladek at suse.cz>
Date: Sun Feb 6 18:06:37 2011 +0100
add Occitan also into packinfo_office.txt
build fails witout it
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index f3f9249..8701df0 100755
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -828,6 +828,22 @@ packageversion = "%PACKAGEVERSION"
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 = "Oc 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"
commit 7754d67735a8e698d2b7106cae4c6e35eaf3b75b
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Feb 3 17:28:59 2011 +0100
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
diff --git a/setup_native/source/win32/nsis/ooosetup.ico b/setup_native/source/win32/nsis/ooosetup.ico
index 2d43f2b..faa7d2b 100644
Binary files a/setup_native/source/win32/nsis/ooosetup.ico and b/setup_native/source/win32/nsis/ooosetup.ico differ
commit adbc618d68569d5b63d1ec87c5d7a9d7f5ba5761
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 30 20:38:00 2011 +0000
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 <dtardon at redhat.com>
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 1f88895..d9a02c3 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1930,7 +1930,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
}
// 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 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
DBG_ERROR("AutoWidth/AutoHeight should be enabled");
}
}
- else
- m_bIsMultiSelection = true;
+#endif
// use page offset and recalculate
Point aPt( m_pSdrView->GetSdrPageView()->GetPageOrigin() );
commit 13519789cd6c9f86067251c5566f29a96bdaac44
Author: Rene Engelhard <rene at debian.org>
Date: Thu Feb 3 00:37:15 2011 +0100
another s/OpenOffice.org/LibreOffice/ in nsplugin
diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc
index 42a2a64..9d30de3 100644
--- a/extensions/source/nsplugin/source/nsplugin_oo.rc
+++ b/extensions/source/nsplugin/source/nsplugin_oo.rc
@@ -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"
commit c0c2964c3ad1a42a5cd3548b9fcdd1c256c077bf
Author: Andras Timar <timar at fsf.hu>
Date: Sat Jan 29 12:32:52 2011 +0100
Added Occitan dictionary
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index de9c90b..f5344b9 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -32,6 +32,7 @@ nb = "no,en-US,fr,de-DE,es"
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"
commit eacd19b0e2eeba91aa1b2387d93e99996c0efae2
Author: Andras Timar <timar at fsf.hu>
Date: Sat Jan 29 11:14:10 2011 +0100
Added Ukrainian dictionaries
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 48faba6..de9c90b 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -45,7 +45,7 @@ sr = "sr,en-US"
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"
commit ecf859006048314ef1c4a4202a642e74a443ebce
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Feb 1 14:26:46 2011 +0200
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 <fridrich.strba at bluewin.ch>
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index 7a09c78..5d36787 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -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_to_string( LANGID langid, int *have_default_lang )
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 @@ extern "C" UINT __stdcall SelectLanguage( MSIHANDLE handle )
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 @@ extern "C" UINT __stdcall SelectLanguage( MSIHANDLE handle )
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);
commit a73c1cff1b27dbef84f0d85d594f9628bb48a827
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Jan 26 19:52:02 2011 +0100
Revert "Initial LibO mimetype icon design"
This reverts commit bf7cc5f6751d566bccb45b09fb15f82e56fe3333.
diff --git a/setup_native/source/win32/nsis/ooosetup.ico b/setup_native/source/win32/nsis/ooosetup.ico
index 2369584..2d43f2b 100644
Binary files a/setup_native/source/win32/nsis/ooosetup.ico and b/setup_native/source/win32/nsis/ooosetup.ico differ
commit 88a6c07dc231ed3508ffe81ec624a753f4c49e75
Author: Alexander Thurgood <alex.thurgood at gmail.com>
Date: Wed Jan 26 18:10:16 2011 +0100
Fix window focus for langpack installation on Mac fdo# 33056
Signed-off-by: Thorsten Behrens <tbehrens at novell.com>
diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript
index 33d376a..f889d09 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -39,6 +39,7 @@ set installComplete to "[InstallCompleteText]
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
commit bf7cc5f6751d566bccb45b09fb15f82e56fe3333
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue Jan 18 10:26:56 2011 +0100
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).
diff --git a/setup_native/source/win32/nsis/ooosetup.ico b/setup_native/source/win32/nsis/ooosetup.ico
index 2d43f2b..2369584 100644
Binary files a/setup_native/source/win32/nsis/ooosetup.ico and b/setup_native/source/win32/nsis/ooosetup.ico differ
commit f7d7948cbe9e38e2e219f6024c0add130a5f6480
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri Jan 14 11:53:12 2011 -0500
Remove pesky on-line registration menu entry. (fdo#33112)
diff --git a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
index a192414..817473a 100644
--- a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
@@ -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>
commit 3097feb2f56b19a1b10b167f5c5869e2c7920be9
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jan 11 23:05:56 2011 +0100
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.
commit 1b83f908126d09ef6e0015eb531bbd8c4cf57034
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jan 11 22:39:06 2011 +0100
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.
commit ccb6459c4e16693c8416a5ac21269491f539f1a8
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Jan 10 19:47:08 2011 +0100
Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3)
commit 53f53717db2106313507d9c4c9d222d5c0b18179
Author: Rene Engelhard <rene at debian.org>
Date: Sun Jan 9 20:45:46 2011 +0100
fix nsplugin for LibreOffice name
- OpenOffice path -> LibreOffice path
- only split "LibreOffice path [...] out with OSL_DEBUG_LEVEL > 0
Signed-off-by: Caolan McNamara <caolanm at redhat.com>
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
index 2dd4f8f..8f8e436 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -205,7 +205,9 @@ int nspluginOOoModuleHook (void** aResult)
strcpy (realFileName, libFileName);
}
- fprintf (stderr, "OpenOffice path before fixup is '%s'\n", realFileName);
+#if OSL_DEBUG_LEVEL > 0
+ fprintf (stderr, "LibreOffice path before fixup is '%s'\n", realFileName);
+#endif
if (realFileName[0] != '/') {
/* a relative sym-link and we need to get an absolute path */
@@ -224,8 +226,10 @@ int nspluginOOoModuleHook (void** aResult)
*aResult = realFileName;
- fprintf (stderr, "OpenOffice path is '%s'\n", realFileName);
-
+#if OSL_DEBUG_LEVEL > 0
+ fprintf (stderr, "LibreOffice path is '%s'\n", realFileName);
+#endif
+
return 0;
}
#endif
commit 46bf8d4d5e0e45ce632330289516db4af4729d33
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Jan 7 20:12:40 2011 +0100
Micro optimization of the last commit
nBufSize was set by aBuffer.getLength() and had not been used in the end
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index c99c965..7a1b5d9 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -853,7 +853,7 @@ sal_Int32 ZipFile::recover()
// the buffer should contain at least one header,
// or if it is end of the file, at least the postheader with sizes and hash
while( nPos < nBufSize - 30
- || ( aBuffer.getLength() < nToRead && nPos < nBufSize - 16 ) )
+ || ( nBufSize < nToRead && nPos < nBufSize - 16 ) )
{
if ( nPos < nBufSize - 30 && pBuffer[nPos] == 'P' && pBuffer[nPos+1] == 'K' && pBuffer[nPos+2] == 3 && pBuffer[nPos+3] == 4 )
commit f2d22b6bb9c7cbd7573f23b116c2082224b4f0fd
Merge: 3032196... 2aa1dc9...
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Jan 7 20:06:19 2011 +0100
Merge commit 'ooo/OOO330_m19' into libreoffice-3-3
commit 2aa1dc9a47787f2e499a22c901a52939e77a27bc
Merge: 03cfe2c... 2c23085...
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Jan 6 14:58:44 2011 +0100
CWS-TOOLING: integrate CWS impress208
commit 30321960a424fb71d51172cbbc017998b92388d3
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Jan 5 12:29:43 2011 -0500
Make the Reset help agent button wider for Italian text. (fdo#32133)
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index e2c3478..762e025 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -93,7 +93,7 @@ TabPage OFA_TP_MISC
PushButton PB_HELPAGENT_RESET
{
Pos = MAP_APPFONT( COL3, ROW3 );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
+ Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH + 20, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "~Reset Help Agent";
};
FixedLine FL_FILEDLG
commit 6b281dac164c8f71b987bdb6f79e25b6c522064a
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Jan 5 12:21:29 2011 -0500
Fixed layout breakage for KDE, X11 and (possibly) Mac. (fdo#32133)
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index dbbabf2..36090d1 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -267,7 +267,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
if ( !aFileDlgCB.IsVisible() )
{
// rearrange the following controls
- Point aNewPos = aDocStatusFL.GetPosPixel();
+ Point aNewPos = aPrintDlgFL.GetPosPixel();
long nDelta = aNewPos.Y() - aFileDlgFL.GetPosPixel().Y();
Window* pWins[] =
commit 2c230853f4941b87edc438a6ac0021d1f16730b0
Author: Christian Lippka ORACLE <christian.lippka at oracle.com>
Date: Wed Jan 5 12:10:11 2011 +0100
impress208: #i115944# fixing large ooxml files
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index e95ba97..3f98ede 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -836,14 +836,18 @@ sal_Int32 ZipFile::recover()
aGrabber.seek( 0 );
- // TODO/LATER: let the files > 2Gb handle the 2Gb border correctly ( if header is splitted )
- for( sal_Int32 nGenPos = 0; aGrabber.readBytes( aBuffer, SAL_MAX_INT32 ) && aBuffer.getLength() > 30; )
+ const sal_Int32 nToRead = 32000;
+ for( sal_Int32 nGenPos = 0; aGrabber.readBytes( aBuffer, nToRead ) && aBuffer.getLength() > 16; )
{
const sal_Int8 *pBuffer = aBuffer.getConstArray();
sal_Int32 nBufSize = aBuffer.getLength();
sal_Int32 nPos = 0;
- while( nPos < nBufSize - 16 )
+ // the buffer should contain at least one header,
+ // or if it is end of the file, at least the postheader with sizes and hash
+ while( nPos < nBufSize - 30
+ || ( aBuffer.getLength() < nToRead && nPos < nBufSize - 16 ) )
+
{
if ( nPos < nBufSize - 30 && pBuffer[nPos] == 'P' && pBuffer[nPos+1] == 'K' && pBuffer[nPos+2] == 3 && pBuffer[nPos+3] == 4 )
{
commit 3e36a47e3877299b34e7e7677f9ca2c4510f1e0a
Author: Christian Lippka ORACLE <christian.lippka at oracle.com>
Date: Mon Jan 3 18:09:17 2011 +0100
impress208: #i115944# fixing large ooxml files
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index ce43786..e95ba97 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -836,7 +836,8 @@ sal_Int32 ZipFile::recover()
aGrabber.seek( 0 );
- for( sal_Int32 nGenPos = 0; aGrabber.readBytes( aBuffer, 32000 ) && aBuffer.getLength() > 30; )
+ // TODO/LATER: let the files > 2Gb handle the 2Gb border correctly ( if header is splitted )
+ for( sal_Int32 nGenPos = 0; aGrabber.readBytes( aBuffer, SAL_MAX_INT32 ) && aBuffer.getLength() > 30; )
{
const sal_Int8 *pBuffer = aBuffer.getConstArray();
sal_Int32 nBufSize = aBuffer.getLength();
More information about the Libreoffice-commits
mailing list