diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2014-11-21 15:03:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-24 14:13:32 +0000 |
| commit | 715aafa6d9dbc23be738597b4fa15af102f1f98f (patch) | |
| tree | bd1114f4ba98776fddc919fbee742147ce00e3c7 /scp2 | |
| parent | 460debad7968961084546e02eb2ac0750a63a7f4 (diff) | |
scp2: move ct2n to AutoInstall
Change-Id: Ib4501298c78e591f24c2ad73cbc8aec0c4fc0347
Reviewed-on: https://gerrit.libreoffice.org/13020
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 13 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 6 |
3 files changed, 5 insertions, 15 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 9ab563bcf4d4..62f043cdcc6d 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -19,6 +19,7 @@ $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE)) +$(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,)) $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE)) diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 507128fa7b1a..fec3835a2dd3 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -48,19 +48,6 @@ End #endif -/* ** ConvertTextToNumber ** */ - -#ifdef WITH_EXTENSION_CT2N - -File gid_File_Oxt_CT2N - TXT_FILE_BODY; - Styles = (PACKED, FILELIST); - Dir = FILELIST_DIR; - Name = "ct2n.filelist"; -End - -#endif - /* ** Hungarian Cross-reference Toolbar** */ #ifdef WITH_EXTENSION_HUNART diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index ce72b5fd0849..5dfb7c122c0c 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -95,12 +95,14 @@ End /* ** ConvertTextToNumber ** */ #ifdef WITH_EXTENSION_CT2N + +#include "AutoInstall/extensions_ct2n" + Module gid_Module_Optional_Extensions_CT2N PackageInfo = "packinfo_extensions.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_CT2N); ParentID = gid_Module_Optional_Extensions; - Files = ( - gid_File_Oxt_CT2N ); + Files = (auto_extensions_ct2n_ALL); Minimal = NO; Default = YES; Styles = ( ); |