[Libreoffice-commits] .: Branch 'libreoffice-3-6' - setup_native/source
setup_native/source/packinfo/spellchecker_selection.pl |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 86ca8cfe7ff5bfb889f3d65b1647839965fc88a7
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 9 15:09:58 2013 +0100
Always default-select English dictionary
It was discovered that on a Russian Windows, by default only Russian and
German dictionaries would be installed, but no English dictionary. This is
because since e2fac98819c00b4fb50f9de9d0f32d20092f3191 fdo#53009: For msi
installer, only default-select a subset of dictionaries only those
dictionaries
mentioned in setup_native/source/packinfo/spellchecker_selection.txt were
default-selected, but it apparently was a misunderstanding that
spellcheker_selection.txt for many locales does not list en even though an
English dictionary should always be default-installed.
Quoting Andras Timar ati...@suse.com: AFAIK en-US localization with
English
dictionaries is always installed in all 3 supported platforms by default.
On
Windows default install should always select en-US and English
dictionaries. If
it does not do so under certain circumstances, then it is a bug in my
opinion.
We removed en-US entry from the spellchecker selection file for this very
reason. It would have only bloated Mac and Linux langpacks.
So this fix simply makes sure that en is included in every line of the
generated spellchecker_selection.hxx that is used by
setup_native/source/win32/customactions/sellang/sellang.cxx to determine
which
dictionaries to select by default.
Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8
(cherry picked from commit d8385c2cfc63b25414f37699faf0143ee9f5ded9)
Reviewed-on: https://gerrit.libreoffice.org/1613
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/setup_native/source/packinfo/spellchecker_selection.pl
b/setup_native/source/packinfo/spellchecker_selection.pl
index b30a843..87f7cc2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.pl
+++ b/setup_native/source/packinfo/spellchecker_selection.pl
@@ -27,8 +27,9 @@ while () {
@{$map{$lang}} = ();
} else {
@{$map{$lang}} = split(/,/, $dicts);
-$max = max($max, scalar(@{$map{$lang}}));
}
+push(@{$map{$lang}}, ('en')) unless grep($_ eq 'en', @{$map{$lang}});
+$max = max($max, scalar(@{$map{$lang}}));
}
++$max;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - setup_native/source
setup_native/source/win32/customactions/sellang/sellang.cxx | 160 +---
1 file changed, 70 insertions(+), 90 deletions(-)
New commits:
commit b04ffe037117c35ebd05b41569379e8acded4fbc
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Sep 27 08:31:41 2012 +0200
No dictionaries were preselected for en_US langpack
...as gm_Langpack_r_en_US was explicitly excluded from langs[] in
SelectLanguage, so addMatchingDictionaries was never called for it. (This
was
only evident in installation sets conaining only few langpacks, as the
official multi-lang installation set also contains en_GB etc., so
appropriate
dictionaries were selected through those.)
Reworked the logic of chosing which langpacks to preselect (see the comment
in
SelectLanguage); hope it still works as intended for the various cases (of
which
the official multi-lang installation set is the only truly relevant one,
for
now).
(cherry picked from commit 8cb7464130634551fd2f043efc14f8f8f8bdf447)
Change-Id: I31f531194c79e49c9c09e33454a7b0a82d9ff02f
Reviewed-on: https://gerrit.libreoffice.org/707
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx
b/setup_native/source/win32/customactions/sellang/sellang.cxx
index 8d243b0..cda413c 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -172,7 +172,7 @@ langid_to_string( LANGID langid )
CASE(sh, SERBIAN, SERBIAN_LATIN);
CASE(sr, SERBIAN, SERBIAN_CYRILLIC);
#undef CASE
-default: return ;
+default: return 0;
}
}
}
@@ -183,14 +183,20 @@ langid_to_string( LANGID langid )
static const char *ui_langs[MAX_LANGUAGES];
static int num_ui_langs = 0;
+void add_ui_lang(char const * lang)
+{
+if (lang != 0 num_ui_langs != SAL_N_ELEMENTS(ui_langs)) {
+ui_langs[num_ui_langs++] = lang;
+}
+}
+
BOOL CALLBACK
enum_ui_lang_proc (LPTSTR language, LONG_PTR /* unused_lParam */)
{
long langid = strtol(language, NULL, 16);
if (langid 0x)
return TRUE;
-ui_langs[num_ui_langs] = langid_to_string((LANGID) langid);
-num_ui_langs++;
+add_ui_lang(langid_to_string((LANGID) langid));
if (num_ui_langs == SAL_N_ELEMENTS(ui_langs) )
return FALSE;
return TRUE;
@@ -207,12 +213,13 @@ present_in_ui_langs(const char *lang)
namespace {
-struct Dictionary {
+struct InstallLocalized {
char lang[sizeof(xx_XX)];
bool install;
};
-void addMatchingDictionaries(char const * lang, Dictionary * dicts, int ndicts)
+void addMatchingDictionaries(
+char const * lang, InstallLocalized * dicts, int ndicts)
{
for (int i = 0; i != SAL_N_ELEMENTS(setup_native::languageDictionaries);
++i)
@@ -242,9 +249,9 @@ extern C UINT __stdcall SelectLanguage( MSIHANDLE handle )
MSIHANDLE database, view, record;
DWORD length;
int nlangs = 0;
-char langs[MAX_LANGUAGES][6];
+InstallLocalized langs[MAX_LANGUAGES];
int ndicts = 0;
-Dictionary dicts[MAX_LANGUAGES];
+InstallLocalized dicts[MAX_LANGUAGES];
database = MsiGetActiveDatabase(handle);
@@ -269,11 +276,11 @@ extern C UINT __stdcall SelectLanguage( MSIHANDLE
handle )
return ERROR_SUCCESS;
}
-/* Keep track of what languages are included in this installer, if
- * it is a multilanguage one.
+/* Keep track of what langpacks are included in this installer.
*/
-if (strcmp(feature, gm_Langpack_r_en_US) != 0)
-strcpy(langs[nlangs++], feature + strlen(gm_Langpack_r_));
+strcpy(langs[nlangs].lang, feature + strlen(gm_Langpack_r_));
+langs[nlangs].install = false;
+++nlangs;
MsiCloseHandle(record);
}
@@ -315,92 +322,65 @@ extern C UINT __stdcall SelectLanguage( MSIHANDLE
handle )
MsiCloseHandle(view);
}
-if (nlangs 0) {
-int i;
-char* pVal = NULL;
-if ( (GetMsiProp( handle, UI_LANGS, pVal )) pVal ) {
-/* user gave UI languages explicitely with UI_LANGS property */
-int sel_ui_lang = 0;
-strcpy(langs[nlangs++], en_US);
-char *str_ptr;
-str_ptr = strtok(pVal, ,);
-for(; str_ptr != NULL ;) {
-ui_langs[num_ui_langs] = str_ptr;
-num_ui_langs++;
-str_ptr = strtok(NULL, ,);
-}
-for (i = 0; i nlangs; i++) {
-if (!present_in_ui_langs(langs[i])) {
-UINT rc;
-sprintf(feature, gm_Langpack_r_%s, langs[i]);
-rc = MsiSetFeatureStateA(handle, feature,
INSTALLSTATE_ABSENT);
-}
-else {
-addMatchingDictionaries(langs[i], dicts,
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - setup_native/source
setup_native/source/win32/msi-encodinglist.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e6158f4fa2890d2f7bb3cc12dc3ce8e20d8511c3 Author: Andras Timar ati...@suse.com Date: Mon Sep 17 21:50:49 2012 +0200 fdo#54232 set encoding of Romanian MSI tables to UTF-8 Change-Id: I0604998e5019757c47050e4f94b1feb1b847cfca Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt index 1fd3cb9..84d77f7 100644 --- a/setup_native/source/win32/msi-encodinglist.txt +++ b/setup_native/source/win32/msi-encodinglist.txt @@ -104,7 +104,7 @@ pt-BR 1252 1046 pt-PT 1252 2070 qtz 1252 1033 # key id pseudo language rm 0 1047 # Raeto-Romance -ro1250 1048 # Romanian +ro 0 1048 # Romanian ru1251 1049 rw 0 1569 # Kinyarwanda sa-IN0 1103 # Sanskrit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - setup_native/source
setup_native/source/mac/ooo/osxdndinstall.png |binary 1 file changed New commits: commit 42939b23b6f4a046f0c1d7edc0927b18e906af02 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 10 09:29:02 2012 +0200 New Finder background image for Mac OS installation Change-Id: I7f2d124f8a1d0330c4ab7bc58217e4368ee72cc2 Signed-off-by: Thorsten Behrens tbehr...@suse.com diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png index 2ce08fe..25b0336 100644 Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - setup_native/source
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 14d7acf2d18f43b29a4a41adac25f0c584a0f6dd
Author: Andras Timar ati...@suse.com
Date: Tue Jul 3 18:24:01 2012 +0200
typo
Change-Id: I12d875faa6f8206a5b0a37067ca21df124f71e22
diff --git
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 755a581..4b9bdab 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -124,7 +124,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
{ // We will replace registration for our own types, too
bRet = true;
}
-else if ( strncmp( szBuffer, lostub., 8 ) == 0 )
+else if ( strncmp( szBuffer, lostub., 7 ) == 0 )
{ // We will replace registration for ooostub, too
bRet = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
