diff options
| author | Kalman Szalai - KAMI <kami911@gmail.com> | 2010-11-01 14:02:03 +0100 |
|---|---|---|
| committer | Kalman Szalai - KAMI <kami911@gmail.com> | 2010-11-01 14:05:44 +0100 |
| commit | 66a11bbd35f87b6dbdd81a685da7793bd93f7681 (patch) | |
| tree | b8ccfbcf75bb5600f6726fe7e0a8714e96bdad92 | |
| parent | e310934150cb9ac98b76ff188aa04f6bcdb36487 (diff) | |
Save 1MB on wizards per language
Bitmaps are packaged as language dependent files however, no
language dependency at all in bitmaps. This patch only pack one instance
so we can save 1MB diskspace for every language in multi lang installer.
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 10 | ||||
| -rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 7 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 | ||||
| -rwxr-xr-x | scp2/source/ooo/module_lang_template.scp | 1 |
4 files changed, 9 insertions, 10 deletions
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 344a51bf53c3..a0c3f8005bec 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -975,6 +975,11 @@ Directory gid_Dir_Share_Template_Wizard DosName = "wizard"; End +Directory gid_Dir_Share_Template_Wizard_Bitmap + ParentID = gid_Dir_Share_Template_Wizard; + DosName = "bitmap"; +End + Directory gid_Dir_Share_Template_Wizard_Letter ParentID = gid_Dir_Share_Template_Wizard; DosName = "letter"; @@ -1035,11 +1040,6 @@ Directory gid_Dir_Template_Wizard DIR_IDENT_ALL_LANG(wizard); End -Directory gid_Dir_Template_Wizard_Bitmap - ParentID = gid_Dir_Template_Wizard; - DIR_IDENT_ALL_LANG(bitmap); -End - Directory gid_Dir_Template_Wizard_Web ParentID = gid_Dir_Template_Wizard; DIR_IDENT_ALL_LANG(web); diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index dbea12eee10c..ee8c46f2c33e 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -365,10 +365,9 @@ File gid_File_Extra_Tplpresntimpr_Lang End File gid_File_Extra_Tplwizbitmap - Dir = gid_Dir_Template_Wizard_Bitmap; - TXT_FILE_BODY; - Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_IDENT_ALL_LANG(tplwizbitmap.zip); + Dir = gid_Dir_Share_Template_Wizard_Bitmap; + ARCHIVE_TXT_FILE_BODY; + Name = "tplwizbitmap.zip"; End File gid_File_Extra_Tplwizdesktop_Lang diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 647c52673aeb..5ffe87abe49f 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -454,6 +454,7 @@ Module gid_Module_Root_Files_6 gid_File_Extra_Gallwwwgraf, gid_File_Extra_Migration, gid_File_Extra_Migration_Lang_Multi, + gid_File_Extra_Tplwizbitmap, gid_File_Extra_Tplwizletter, gid_File_Extra_Tplwizletter_en_US, gid_File_Extra_Tplwizletter_de, diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 7ecd4747cdea..4e4b55d5d7db 100755 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -35,7 +35,6 @@ Module gid_Module_Langpack_Basis_Template gid_File_Extra_Tpllayoutimpr_Lang, gid_File_Extra_Tplpresntimpr_Lang, gid_File_Extra_Tplwizagenda_Lang, - gid_File_Extra_Tplwizbitmap, gid_File_Extra_Tplwizdesktop_Lang, gid_File_Extra_Tplwizfax_Lang, gid_File_Extra_Tplwizletter_Lang, |