[Libreoffice-commits] .: setup_native/source
0 files changed New commits: commit bf8e8e8bd03647632ed0b55c2b983a4d16cee40e Author: Andras Timar ati...@suse.com Date: Wed Jan 23 12:30:42 2013 +0100 chmod 644 Change-Id: Idc06412b8be705ba0cd5695257fd961864e2ad6a diff --git a/setup_native/source/win32/customactions/tools/msiprop.hxx b/setup_native/source/win32/customactions/tools/msiprop.hxx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/packinfo/spellchecker_selection.pl |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d8385c2cfc63b25414f37699faf0143ee9f5ded9
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
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] .: setup_native/source
setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit a737ae58cc95585e90aa946074b68022d9a2dc2b Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Dec 25 13:31:18 2012 +0200 WaE: unreferenced local variable Change-Id: If234ce4af0f988c135a90a98312e24e4d80ca92c diff --git a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx index 8869ee4..d56ad5e 100644 --- a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx +++ b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx @@ -71,8 +71,6 @@ extern C UINT __stdcall CompleteInstallPath( MSIHANDLE handle ) // so that in an OOo 3.3 or later, the directory program or share are directly created // below c:\program files. -TCHAR szValue[8192]; -DWORD nValueSize = sizeof(szValue); HKEYhKey; // Reading property OFFICEDIRHOSTNAME_, that contains the part of the path behind ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source writerfilter/source
setup_native/source/win32/wintools/makecab/makecab.c |1 - writerfilter/source/dmapper/GraphicImport.cxx|1 - 2 files changed, 2 deletions(-) New commits: commit b03278df1d56424d4d6f1fe245676d41183ac8ec Author: Julien Nabet serval2...@yahoo.fr Date: Sat Oct 13 17:57:21 2012 +0200 Remove consecutive break and a break which follows a return Change-Id: I8dec9eda857f7da452992bc785426449933acc59 diff --git a/setup_native/source/win32/wintools/makecab/makecab.c b/setup_native/source/win32/wintools/makecab/makecab.c index 9e7c4fe..c632ff4 100644 --- a/setup_native/source/win32/wintools/makecab/makecab.c +++ b/setup_native/source/win32/wintools/makecab/makecab.c @@ -235,7 +235,6 @@ FNFCISTATUS(fnStatus) /*(UINT typeStatus, ULONG cb1, ULONG cb2, void FAR *pv)*/ case statusCabinet: printf(\rWriting cabinet file (%d of approx. %d bytes), cb1, cb2); return cb2; -break; } return 0; diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 5709a17..10a17e6 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -989,7 +989,6 @@ void GraphicImport::lcl_attribute(Id nName, Value val) case NS_ooxml::LN_CT_Inline_distR: m_pImpl-nRightMargin = ConversionHelper::convertTwipToMM100(nIntValue); break; -break; case NS_ooxml::LN_CT_GraphicalObjectData_uri: val.getString(); //TODO: does it need to be handled? ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/sellang/sellang.cxx | 160 +---
1 file changed, 70 insertions(+), 90 deletions(-)
New commits:
commit 8cb7464130634551fd2f043efc14f8f8f8bdf447
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).
Change-Id: I31f531194c79e49c9c09e33454a7b0a82d9ff02f
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx
b/setup_native/source/win32/customactions/sellang/sellang.cxx
old mode 100644
new mode 100755
index af8a9a1..27623cb
--- 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, ndicts);
-sel_ui_lang++;
-}
-}
-if ( sel_ui_lang == 0 ) {
-/* When UI_LANG property contains only languages that are not
[Libreoffice-commits] .: setup_native/source
0 files changed New commits: commit d2aa4ebb7aebbf9f574a719f4b10ab53781aa533 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Sep 27 11:58:47 2012 +0200 Revert inadvertent chmod Change-Id: I0b1865719da2e3c5a669b30a635c333721c9c41d diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/mac/ooo/osxdndinstall.png |binary 1 file changed New commits: commit f2a653134e0cf858cb16d85f01934725d126e002 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 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] .: setup_native/source
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a54230f3211f19290c4d2ac26b3084fc0a0eeab5
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 3ac1343..f0f89fc 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -121,7 +121,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
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/sellang/sellang.cxx | 131
1 file changed, 88 insertions(+), 43 deletions(-)
New commits:
commit a77d16835504b4f82b6b9e59c213eea8a879219c
Author: Andras Timar ati...@suse.com
Date: Fri Jun 1 15:44:26 2012 +0200
fdo#50509 MSI: UI language selection from command line (e.g. silent install)
Change-Id: I1206a0c7f8508942eb844869fe1c75a48a9e01fd
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx
b/setup_native/source/win32/customactions/sellang/sellang.cxx
index 5c18dc0..d88bbf7 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -49,6 +49,21 @@
#include sal/macros.h
#include systools/win32/uwinapi.h
+BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
+{
+DWORD sz = 0;
+if ( MsiGetProperty( hMSI, pPropName, , sz ) == ERROR_MORE_DATA ) {
+sz++;
+DWORD nbytes = sz * sizeof( char );
+char* buff = reinterpret_castchar*( malloc( nbytes ) );
+ZeroMemory( buff, nbytes );
+MsiGetProperty( hMSI, pPropName, buff, sz );
+*ppValue = buff;
+return ( strlen(buff) 0 );
+}
+return FALSE;
+}
+
static const char *
langid_to_string( LANGID langid, int *have_default_lang )
{
@@ -187,7 +202,7 @@ static BOOL
present_in_ui_langs(const char *lang)
{
for (int i = 0; i num_ui_langs; i++)
-if (memcmp (ui_langs[i], lang, 2) == 0)
+if (memcmp (ui_langs[i], lang, ( strlen(ui_langs[i]) = strlen(lang) )
? strlen(lang) : strlen(ui_langs[i]) ) == 0)
return TRUE;
return FALSE;
}
@@ -235,58 +250,88 @@ extern C UINT __stdcall SelectLanguage( MSIHANDLE
handle )
MsiCloseHandle(view);
if (nlangs 0) {
-/* Deselect those languages that don't match any of the UI languages
- * available on the system.
- */
-
int i;
-int have_system_default_lang = 0;
-const char *system_default_lang =
langid_to_string(GetSystemDefaultUILanguage(), have_system_default_lang);
-const char *user_locale_lang =
langid_to_string(LANGIDFROMLCID(GetThreadLocale()), NULL);
-
-EnumUILanguagesA(enum_ui_lang_proc, 0, 0);
-
-/* If one of the alternative languages in a multi-language installer
- * is the system default UI language, deselect those languages that
- * aren't among the UI languages available on the system.
- * (On most Windows installations, just one UI language is present,
- * which obviously is the same as the default UI language. But
- * we want to be generic.)
- * If none of the languages in a multi-language installer is the
- * system default UI language (this happens now in 2.4.0 where we
- * cannot put as many UI languages into the installer as we would
- * like, but only half a dozen: en-US,de,es,fr,it,pt-BR), pretend
- * that English is the system default UI language,
- * so that we will by default deselect everything except
- * English. We don't want to by default install all half dozen
- * languages for an unsuspecting user of a Finnish Windows, for
- * instance. Sigh.
- */
-if (system_default_lang[0]) {
-for (i = 0; i nlangs; i++) {
-if (memcmp (system_default_lang, langs[i], 2) == 0) {
-have_system_default_lang = 1;
-}
+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, ,);
}
-}
-
-if (!have_system_default_lang) {
-system_default_lang = en;
-have_system_default_lang = 1;
-}
-if (have_system_default_lang) {
for (i = 0; i nlangs; i++) {
-if (memcmp(system_default_lang, langs[i], 2) != 0
-memcmp(user_locale_lang, langs[i], 2) != 0
-!present_in_ui_langs(langs[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 {
+sel_ui_lang++;
+}
+}
+if ( sel_ui_lang == 0 ) {
+/* When UI_LANG property contains only languages that are not
present
+ * in the installer, install at least en_US
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/sellang/sellang.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7c289cad0a896b092deb01d00618dcee8c8dff45 Author: Andras Timar ati...@suse.com Date: Wed May 30 23:41:10 2012 +0200 add Amharic language to SelectLanguage custom action Change-Id: I8562d1289b269ca7f3aa959907641fd70be0770f diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx index e0a775a..5c18dc0 100644 --- a/setup_native/source/win32/customactions/sellang/sellang.cxx +++ b/setup_native/source/win32/customactions/sellang/sellang.cxx @@ -66,6 +66,7 @@ langid_to_string( LANGID langid, int *have_default_lang ) #define CASE(name, primary) \ case LANG_##primary: return #name CASE(af, AFRIKAANS); +CASE(am, AMHARIC); CASE(ar, ARABIC); CASE(as, ASSAMESE); CASE(be, BELARUSIAN); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/sellang/sorttree.cxx | 32 ++-
1 file changed, 31 insertions(+), 1 deletion(-)
New commits:
commit ce1ac0851fe2e975f3fb47178730b914608610cf
Author: Andras Timar ati...@suse.com
Date: Thu May 10 10:38:20 2012 +0200
error handling in SortTree custom action
Change-Id: I03a06d09e3e84b6cb13bd68e8be4caebb1b9f5ab
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx
b/setup_native/source/win32/customactions/sellang/sorttree.cxx
index 25c6c6d..41695e2 100644
--- a/setup_native/source/win32/customactions/sellang/sorttree.cxx
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -23,15 +23,45 @@ extern C UINT __stdcall SortTree(MSIHANDLE)
// Sort items (languages) in SelectionTree control, fdo#46355
HWND hwndMSI = FindWindow(TEXT(MsiDialogCloseClass), NULL);
+if (hwndMSI == NULL)
+{
+OutputDebugString(SortTree: MsiDialogCloseClass not found\n);
+return ERROR_SUCCESS;
+}
HWND hwndTV = FindWindowEx(hwndMSI, NULL, TEXT(SysTreeView32), NULL);
+if (hwndTV == NULL)
+{
+OutputDebugString(SortTree: SysTreeView32 not found\n);
+return ERROR_SUCCESS;
+}
HTREEITEM treeRoot = TreeView_GetRoot(hwndTV);
+if (treeRoot == NULL)
+{
+OutputDebugString(SortTree: TreeView_GetRoot failed\n);
+return ERROR_SUCCESS;
+}
HTREEITEM optional = TreeView_GetNextSibling(hwndTV, treeRoot);
+if (optional == NULL)
+{
+OutputDebugString(SortTree: Optional Components branch not found\n);
+return ERROR_SUCCESS;
+}
HTREEITEM dicts = TreeView_GetChild(hwndTV, optional);
+if (dicts == NULL)
+{
+OutputDebugString(SortTree: Dictionaries branch not found\n);
+return ERROR_SUCCESS;
+}
TreeView_SortChildren(hwndTV, dicts, TRUE);
HTREEITEM langs = TreeView_GetNextSibling(hwndTV, optional);
+if (langs == NULL)
+{
+OutputDebugString(SortTree: Additional UI Languages branch not
found\n);
+return ERROR_SUCCESS;
+}
TreeView_SortChildren(hwndTV, langs, TRUE);
- return ERROR_SUCCESS;
+return ERROR_SUCCESS;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source solenv/bin
setup_native/source/packinfo/spellchecker_selection.txt |1 +
solenv/bin/modules/installer/worker.pm |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 030c4269cb14ed429e4a1f0314eba7a783816ac1
Author: Petr Mladek pmla...@suse.cz
Date: Thu Apr 12 09:45:32 2012 +0200
pack en dictionary only with en langpacks
it is in the main installation tarball anyway; it was put in langpacks
that did not have its own dictionary from some strange reason
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt
b/setup_native/source/packinfo/spellchecker_selection.txt
index 8a866a2..a2e10bb 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -21,6 +21,7 @@ de = de,fr,it
el = el
en-US = en,es,fr
en-GB = en,es,fr
+en-ZA = en,es,fr
es = an,es,fr,pt
et = et
fr = fr,es
diff --git a/solenv/bin/modules/installer/worker.pm
b/solenv/bin/modules/installer/worker.pm
index dd0c339..bd740a7 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -2438,7 +2438,7 @@ sub set_spellcheckerlanguages
{
my $languagelist = ;
if ( exists($spellcheckhash{$lang}) ) { $languagelist =
$spellcheckhash{$lang}; }
-else { $languagelist = $spellcheckhash{'en-US'}; } # defaulting to
English
+else { $languagelist = ; } # no dictionary unless defined in
SPELLCHECKERFILE
my $langlisthash =
installer::converter::convert_stringlist_into_hash(\$languagelist, ,);
foreach my $onelang ( keys %{$langlisthash} ) {
$installer::globals::spellcheckerlanguagehash{$onelang} = 1; }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cfa4c9c11538b332234709dedc7ca553a10ab08e Author: Andras Timar ati...@suse.com Date: Thu Apr 12 08:55:45 2012 +0200 typo fix in comment diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx index fce807f..c1319e2 100644 --- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx @@ -101,7 +101,7 @@ extern C UINT __stdcall IsOfficeRunning( MSIHANDLE handle ) if ( sOfficeInstallPath.length() == 0 ) return ERROR_SUCCESS; -DWORD aProcesses[1024], cbNeeded, cProcesses; /* 1024 processses ought to be enough for anybody */ +DWORD aProcesses[1024], cbNeeded, cProcesses; /* 1024 processes ought to be enough for anybody */ if ( !EnumProcesses( aProcesses, sizeof(aProcesses), cbNeeded ) ) return ERROR_INSTALL_FAILURE; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/shellextensions/shellextensions.cxx |
2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 935150a59b160cc45652b88fd41824b53af3676d
Author: Andras Timar ati...@suse.com
Date: Tue Mar 27 15:49:22 2012 +0200
typo fix in comment
diff --git
a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
index 790a342..5ddea95 100644
---
a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
+++
b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
@@ -165,7 +165,7 @@ extern C UINT __stdcall
InstallExecSequenceEntry(MSIHANDLE hMSI)
RegCloseKey(hKey);
}
-// Open Windows 32 Bit Registry on Win64 maschine
+// Open Windows 32 Bit Registry on Win64 machine
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
TEXT(Software\\Microsoft\\Windows\\CurrentVersion\\Shell
Extensions\\Approved),0, KEY_WRITE, hKey ) == ERROR_SUCCESS)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 45a222a72b49bacddb962bfb34346558e45eff6b
Author: Andras Timar ati...@suse.com
Date: Tue Mar 27 15:56:50 2012 +0200
fix number of chars in strncmp after OpenOffice.org-LibreOffice change
diff --git
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 4fd1700..c7e4c3b 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -117,7 +117,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
{ // We will replace registration for word pad
bRet = true;
}
-else if ( strncmp( szBuffer, LibreOffice., 15 ) == 0 )
+else if ( strncmp( szBuffer, LibreOffice., 12 ) == 0 )
{ // We will replace registration for our own types, too
bRet = true;
}
@@ -330,7 +330,7 @@ static void saveOldRegistration( LPCSTR lpSubKey )
szBuffer[nSize] = '\0';
// No need to save assocations for our own types
-if ( strncmp( szBuffer, LibreOffice., 15 ) != 0 )
+if ( strncmp( szBuffer, LibreOffice., 12 ) != 0 )
{
// Save the old association
RegSetValueExA( hKey, OOoBackupAssociation, 0,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/packinfo/packinfo_office.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 229eb2e9dec3c54fa2b73b968d61985e5528edbf Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 24 10:53:09 2012 +0100 Trivial description fix of previous fix (extension - driver). diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index b85a038..97127ef 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -1223,7 +1223,7 @@ requires = %BASISPACKAGEPREFIX%PRODUCTVERSION-base copyright = 2000-2008 by Sun Microsystems, Inc.; 2011 by Lionel Elie Mamane and other LibreOffice contributors solariscopyright = solariscopyrightfile vendor = The Document Foundation -description = PostgreSQL Connector extension for %PRODUCTNAME %PRODUCTVERSION +description = PostgreSQL Connector driver for %PRODUCTNAME %PRODUCTVERSION destpath = /opt packageversion = %PACKAGEVERSION End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/shellextensions/makefile.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit b0c3f12261538e3b89079e3b87bb8f8f0d39e5a0 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Nov 25 13:49:20 2011 +0100 Fix linking of the new custom action diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index e0950d9..b6961cf 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -75,6 +75,9 @@ STDSHL += \ STDSHL+= \ $(KERNEL32LIB)\ -lmsvcrt +.ELSE +STDSHL+=\ +psapi.lib .ENDIF SHL1OBJS = $(SLOFILES) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/packinfo/packinfo_sdkoo.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a4f836dbd84cb185fff79f643d71ae25abfca216 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 21 09:56:21 2011 +0100 Trying to fix packaging of SDK diff --git a/setup_native/source/packinfo/packinfo_sdkoo.txt b/setup_native/source/packinfo/packinfo_sdkoo.txt index 6c895e3..591d36a 100755 --- a/setup_native/source/packinfo/packinfo_sdkoo.txt +++ b/setup_native/source/packinfo/packinfo_sdkoo.txt @@ -37,5 +37,5 @@ solariscopyright = solariscopyrightfile vendor = The Document Foundation description = Software Development Kit for LibreOffice %PRODUCTVERSION destpath = /opt -packageversion = %ABOUTBOXPRODUCTVERSION +packageversion = %PACKAGEVERSION End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/rebase/rebase.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 6a0c6b4839843c0c2716df970013daf381bd7b99 Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Oct 4 14:43:15 2011 +0300 WaE: name was marked as #pragma deprecated diff --git a/setup_native/source/win32/customactions/rebase/rebase.cxx b/setup_native/source/win32/customactions/rebase/rebase.cxx index ad3686c..641e397 100644 --- a/setup_native/source/win32/customactions/rebase/rebase.cxx +++ b/setup_native/source/win32/customactions/rebase/rebase.cxx @@ -12,6 +12,7 @@ #include msiquery.h #include imagehlp.h #include tchar.h +#define STRSAFE_NO_DEPRECATE #include strsafe.h #ifdef _MSC_VER #pragma warning(pop) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
