[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
