From 3d6d4b78498e049b23b529480414ec8bc56fa8ff Mon Sep 17 00:00:00 2001 From: Christian Lippka ORACLE Date: Mon, 3 Jan 2011 18:09:17 +0100 Subject: impress208: #i115944# fixing large ooxml files --- package/source/zipapi/ZipFile.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index f01b7ce06f4b..6b1aca5056c4 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(); -- cgit From f505d910216efd51409b0ea434ea16f6f2d18324 Mon Sep 17 00:00:00 2001 From: Christian Lippka ORACLE Date: Wed, 5 Jan 2011 12:10:11 +0100 Subject: impress208: #i115944# fixing large ooxml files --- package/source/zipapi/ZipFile.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 6b1aca5056c4..dcd5669897e3 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 ) { -- cgit From af62b66fb9f7ef0c7ec03a025049d04b93fbcb27 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Wed, 5 Jan 2011 12:21:29 -0500 Subject: Fixed layout breakage for KDE, X11 and (possibly) Mac. (fdo#32133) Signed-off-by: Petr Mladek --- cui/source/options/optgdlg.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index f6e1961c8008..2cf7c77ddaf7 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[] = -- cgit From e4375b5e4312202fc1166ac5a10bb39b2e604fad Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Wed, 5 Jan 2011 12:29:43 -0500 Subject: Make the Reset help agent button wider for Italian text. (fdo#32133) Signed-off-by: Petr Mladek --- cui/source/options/optgdlg.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index a4b99d361222..8a2639eec455 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 -- cgit From 60ff78bdcfeef7713a3669cfe37e81e29f33f6aa Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 7 Jan 2011 20:12:40 +0100 Subject: Micro optimization of the last commit nBufSize was set by aBuffer.getLength() and had not been used in the end --- package/source/zipapi/ZipFile.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index e83d824c3d87..005d29196fd6 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 ) -- cgit From 0a9c73fd0228d306867b030f66e192b9ab1490a5 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Sun, 9 Jan 2011 20:45:46 +0100 Subject: fix nsplugin for LibreOffice name - OpenOffice path -> LibreOffice path - only split "LibreOffice path [...] out with OSL_DEBUG_LEVEL > 0 Signed-off-by: Caolan McNamara --- extensions/source/nsplugin/source/so_env.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index 212ff43d7272..bf782a74933f 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,7 +226,9 @@ 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; } -- cgit -- cgit -- cgit -- cgit From 760a57fb4f2032f11e60f96e9fd9e8c1184cfb10 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 14 Jan 2011 11:53:12 -0500 Subject: Remove pesky on-line registration menu entry. (fdo#33112) --- .../source/bibliography/uiconfig/sbibliography/menubar/menubar.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml index a1924145b4cf..817473af0e73 100644 --- a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml @@ -85,7 +85,6 @@ - -- cgit From 4aeef1ec93e9fd6ad7f8b2f598abe83312f2e182 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 18 Jan 2011 10:26:56 +0100 Subject: 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). --- setup_native/source/win32/nsis/ooosetup.ico | Bin 2238 -> 26918 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/setup_native/source/win32/nsis/ooosetup.ico b/setup_native/source/win32/nsis/ooosetup.ico index 2d43f2b4b2c6..2369584d7b3e 100644 Binary files a/setup_native/source/win32/nsis/ooosetup.ico and b/setup_native/source/win32/nsis/ooosetup.ico differ -- cgit From 8b9003a4d5047debb0f3b981b97a4d842b030cad Mon Sep 17 00:00:00 2001 From: Alexander Thurgood Date: Wed, 26 Jan 2011 18:10:16 +0100 Subject: Fix window focus for langpack installation on Mac fdo# 33056 Signed-off-by: Thorsten Behrens --- setup_native/scripts/osx_install_languagepack.applescript | 1 + 1 file changed, 1 insertion(+) diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript index 33d376adec1b..f889d09bcbf2 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 -- cgit From e5b80ed0b1b0b4ef1e34a42cf09e17f555ade975 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Wed, 26 Jan 2011 19:52:02 +0100 Subject: Revert "Initial LibO mimetype icon design" This reverts commit bf7cc5f6751d566bccb45b09fb15f82e56fe3333. --- setup_native/source/win32/nsis/ooosetup.ico | Bin 26918 -> 2238 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/setup_native/source/win32/nsis/ooosetup.ico b/setup_native/source/win32/nsis/ooosetup.ico index 2369584d7b3e..2d43f2b4b2c6 100644 Binary files a/setup_native/source/win32/nsis/ooosetup.ico and b/setup_native/source/win32/nsis/ooosetup.ico differ -- cgit From d837e29c506b305855d135baeaf5844ea901ad08 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 1 Feb 2011 14:26:46 +0200 Subject: Fix overflow problem in the custom action for UI language de-selection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../source/win32/customactions/sellang/sellang.cxx | 217 ++++++++++----------- 1 file changed, 104 insertions(+), 113 deletions(-) diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx index a031606d1823..5d3678744514 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 #include #include -#ifdef UNICODE -#define _UNICODE -#define _tstring wstring -#else -#define _tstring string -#endif -#include -#include #include -#pragma warning(pop) +#include +#include #include #include @@ -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); -- cgit From 7e53cc76faf174df7bcd486cd157a473f4134cc7 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sat, 29 Jan 2011 11:14:10 +0100 Subject: Added Ukrainian dictionaries --- setup_native/source/packinfo/spellchecker_selection.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 48faba6ff48e..de9c90bf44bb 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" -- cgit From c4f448d87c90909bd2c1c10dc50f247e44cd957b Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sat, 29 Jan 2011 12:32:52 +0100 Subject: Added Occitan dictionary --- setup_native/source/packinfo/spellchecker_selection.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index de9c90bf44bb..f5344b9860ef 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" -- cgit From babbe32413d9a8ecb480f69a0aef5baaff2ef0a9 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Thu, 3 Feb 2011 00:37:15 +0100 Subject: another s/OpenOffice.org/LibreOffice/ in nsplugin --- extensions/source/nsplugin/source/nsplugin_oo.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc index 42a2a642e023..9d30de3918a1 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" -- cgit From 061bffcb0aa8de15cf4df72acbcf20326a5d3d77 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 30 Jan 2011 20:38:00 +0000 Subject: 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 --- cui/source/tabpages/swpossizetabpage.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index b8bfdf5c5052..396e3c16b7e9 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() ); -- cgit From f452a1b010a2564fa237429083cfc9c1f04b1a9f Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Thu, 3 Feb 2011 17:28:59 +0100 Subject: 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 --- setup_native/source/win32/nsis/ooosetup.ico | Bin 2238 -> 26918 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/setup_native/source/win32/nsis/ooosetup.ico b/setup_native/source/win32/nsis/ooosetup.ico index 2d43f2b4b2c6..faa7d2bb2387 100644 Binary files a/setup_native/source/win32/nsis/ooosetup.ico and b/setup_native/source/win32/nsis/ooosetup.ico differ -- cgit From 96cedad0b41d713c891f108b53c35fe5969604df Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Sun, 6 Feb 2011 18:06:37 +0100 Subject: add Occitan also into packinfo_office.txt build fails witout it --- setup_native/source/packinfo/packinfo_office.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index f3f9249a2089..8701df0a2497 100755 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -827,6 +827,22 @@ destpath = "/opt" 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" -- cgit From fa01a166515fe2bcf7309e0bc3f71accb8a981ba Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Sun, 6 Feb 2011 18:22:35 +0100 Subject: add Ukrainian also into packinfo_office.txt --- setup_native/source/packinfo/packinfo_office.txt | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 8701df0a2497..7958977718f6 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 @@ -1003,6 +1003,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" script = "shellscripts_extensions.txt" -- cgit