[Libreoffice-commits] .: scp2/source setup_native/source
scp2/source/ooo/windowscustomaction_ooo.scp |9 ++
setup_native/source/win32/customactions/sellang/exports.dxp |1
setup_native/source/win32/customactions/sellang/makefile.mk |3
setup_native/source/win32/customactions/sellang/sorttree.cxx | 37 +++
4 files changed, 49 insertions(+), 1 deletion(-)
New commits:
commit 39bb77fd667f9d9fdaf374f3934b6eec7b7dc57a
Author: Andras Timar ati...@suse.com
Date: Tue Apr 24 21:51:33 2012 +0200
fdo#46355 sort SelectionTree control of Custom Setup with a custom action
Although Microsoft says that SelectionTree control can publish a control
event only on Windows Server 2003 and above, the custom action seems to
be working under a fully patched Windows XP SP3. Maybe it fails silently
on older Windows XPs, not to mention Windows 2000. I did not test those.
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 70197b7..51cfda1 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -474,6 +474,15 @@ WindowsCustomAction gid_Customaction_SelectLanguage
Assignment1 = (ControlEvent, SetupType, Next, DoAction,
SelectLanguage, 1, 1);
End
+WindowsCustomAction gid_Customaction_SortTree
+Name = SortTree;
+Typ = 321;
+Source = sellangmsi.dll;
+Target = SortTree;
+Inbinarytable = 1;
+Assignment1 = (ControlEvent, CustomSetup, Tree, DoAction,
SortTree, 1, 1);
+End
+
WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
Name = RebaseLibrariesOnProperties;
Typ = 65;
diff --git a/setup_native/source/win32/customactions/sellang/exports.dxp
b/setup_native/source/win32/customactions/sellang/exports.dxp
index cc6dd8d..c8a622e 100644
--- a/setup_native/source/win32/customactions/sellang/exports.dxp
+++ b/setup_native/source/win32/customactions/sellang/exports.dxp
@@ -1 +1,2 @@
SelectLanguage
+SortTree
diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk
b/setup_native/source/win32/customactions/sellang/makefile.mk
index ffad814..862653e 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -49,7 +49,8 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
UWINAPILIB=
SLOFILES = \
-$(SLO)$/sellang.obj
+$(SLO)/sellang.obj \
+$(SLO)/sorttree.obj
SHL1STDLIBS= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx
b/setup_native/source/win32/customactions/sellang/sorttree.cxx
new file mode 100644
index 000..25c6c6d
--- /dev/null
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright 2012 LibreOffice contributors.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifdef _MSC_VER
+#pragma warning(push, 1) /* disable warnings within system headers */
+#endif
+#define WIN32_LEAN_AND_MEAN
+#include windows.h
+#include msiquery.h
+#include commctrl.h
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+extern C UINT __stdcall SortTree(MSIHANDLE)
+{
+// Sort items (languages) in SelectionTree control, fdo#46355
+
+HWND hwndMSI = FindWindow(TEXT(MsiDialogCloseClass), NULL);
+HWND hwndTV = FindWindowEx(hwndMSI, NULL, TEXT(SysTreeView32), NULL);
+HTREEITEM treeRoot = TreeView_GetRoot(hwndTV);
+HTREEITEM optional = TreeView_GetNextSibling(hwndTV, treeRoot);
+HTREEITEM dicts = TreeView_GetChild(hwndTV, optional);
+TreeView_SortChildren(hwndTV, dicts, TRUE);
+HTREEITEM langs = TreeView_GetNextSibling(hwndTV, optional);
+TreeView_SortChildren(hwndTV, langs, TRUE);
+
+ return ERROR_SUCCESS;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source setup_native/source
scp2/source/ooo/common_brand.scp|5 + scp2/source/ooo/file_ooo.scp|9 + scp2/source/ooo/module_ooo.scp | 13 - scp2/source/ooo/module_ooo.ulf |6 ++ setup_native/source/packinfo/packinfo_office.txt| 16 setup_native/source/packinfo/spellchecker_selection.txt |2 +- 6 files changed, 49 insertions(+), 2 deletions(-) New commits: commit 9cb0e7af9d5d123a6e0cb933fb43d0f53ab4b904 Author: Andras Timar ati...@suse.com Date: Thu Dec 8 13:33:17 2011 +0100 add Aragonese spelling dictionary diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 203f148..cf0a577 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -197,6 +197,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Af DosName = dict-af; End +Directory gid_Brand_Dir_Share_Extensions_Dict_An +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-an; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Ar ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-ar; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index b4630a6..b87b7fa 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1313,6 +1313,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_An + Dir = gid_Brand_Dir_Share_Extensions_Dict_An; + Name = dict-an.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ar Dir = gid_Brand_Dir_Share_Extensions_Dict_Ar; Name = dict-ar.oxt; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 473a026..5b76205 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -60,13 +60,24 @@ Module gid_Module_Root_Extension_Dictionary_Af MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF ); Files = (gid_File_Extension_Dictionary_Af); InstallOrder = 2000; -Sortkey = 510; +Sortkey = 500; Spellcheckerlanguage = af; PackageInfo = packinfo_office.txt; ParentID = gid_Module_Dictionaries; Styles = (); End +Module gid_Module_Root_Extension_Dictionary_An +MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AN ); +Files = (gid_File_Extension_Dictionary_An); +InstallOrder = 2000; +Sortkey = 510; +Spellcheckerlanguage = an; +PackageInfo = packinfo_office.txt; +ParentID = gid_Module_Dictionaries; +Styles = (); +End + Module gid_Module_Root_Extension_Dictionary_Ar MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AR ); Files = (gid_File_Extension_Dictionary_Ar); diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf index 4573c89..7fbb685 100644 --- a/scp2/source/ooo/module_ooo.ulf +++ b/scp2/source/ooo/module_ooo.ulf @@ -55,6 +55,12 @@ en-US = Afrikaans [STR_DESC_MODULE_EXTENSION_DICTIONARY_AF] en-US = Afrikaans spelling dictionary, and hyphenation rules +[STR_NAME_MODULE_EXTENSION_DICTIONARY_AN] +en-US = Aragonese + +[STR_DESC_MODULE_EXTENSION_DICTIONARY_AN] +en-US = Aragonese spelling dictionary + [STR_NAME_MODULE_EXTENSION_DICTIONARY_AR] en-US = Arabic diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 10b23b4..f7166f1 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -462,6 +462,22 @@ packageversion = %PACKAGEVERSION End Start +module = gid_Module_Root_Extension_Dictionary_An +script = shellscripts_extensions.txt +solarispackagename = %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-an +solarisrequires = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION +packagename = %UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-an +requires = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION +linuxpatchrequires = +copyright = 2011 Santiago Paricio, Juan Pablo Martinez +solariscopyright = solariscopyrightfile +vendor = The Document
[Libreoffice-commits] .: scp2/source setup_native/source
scp2/source/ooo/common_brand.scp| 20 + scp2/source/ooo/file_ooo.scp| 36 + scp2/source/ooo/module_ooo.scp | 48 +++- scp2/source/ooo/module_ooo.ulf | 24 ++ setup_native/source/packinfo/packinfo_office.txt| 64 setup_native/source/packinfo/spellchecker_selection.txt |4 + 6 files changed, 194 insertions(+), 2 deletions(-) New commits: commit 2e366cbdedd542e2324684f4b8b2517dbfcd7f59 Author: Andras Timar ati...@suse.com Date: Fri Nov 25 23:24:18 2011 +0100 add Belarusian, Greek, Scottish Gaelic, and Telugu dictionaries diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 791eb6d..203f148 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -202,6 +202,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Ar DosName = dict-ar; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Be +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-be; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Bg ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-bg; @@ -242,6 +247,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_En DosName = dict-en; End +Directory gid_Brand_Dir_Share_Extensions_Dict_El +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-el; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Es ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-es; @@ -257,6 +267,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Fr DosName = dict-fr; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Gd +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-gd; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Gl ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-gl; @@ -377,6 +392,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Sw DosName = dict-sw; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Te +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-te; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Th ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-th; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index b53c69d..adce11d 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1304,6 +1304,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Be + Dir = gid_Brand_Dir_Share_Extensions_Dict_Be; + Name = dict-be.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Bg Dir = gid_Brand_Dir_Share_Extensions_Dict_Bg; Name = dict-bg.oxt; @@ -1376,6 +1385,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_El + Dir = gid_Brand_Dir_Share_Extensions_Dict_El; + Name = dict-el.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Es Dir = gid_Brand_Dir_Share_Extensions_Dict_Es; Name = dict-es.oxt; @@ -1403,6 +1421,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Gd + Dir = gid_Brand_Dir_Share_Extensions_Dict_Gd; + Name = dict-gd.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Gl Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl; Name = dict-gl.oxt; @@ -1619,6 +1646,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Te + Dir = gid_Brand_Dir_Share_Extensions_Dict_Te; + Name = dict-te.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Th Dir = gid_Brand_Dir_Share_Extensions_Dict_Th; Name = dict-th.oxt; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 8afa37d..473a026 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -78,11 +78,22 @@ Module gid_Module_Root_Extension_Dictionary_Ar Styles = (); End +Module gid_Module_Root_Extension_Dictionary_Be +MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BE ); +Files = (gid_File_Extension_Dictionary_Be); +InstallOrder = 2000; +Sortkey = 512; +Spellcheckerlanguage = be; +PackageInfo = packinfo_office.txt; +ParentID = gid_Module_Dictionaries; +Styles = (); +End + Module gid_Module_Root_Extension_Dictionary_Bg MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BG ); Files = (gid_File_Extension_Dictionary_Bg); InstallOrder =
