summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-12-03 13:23:33 +0100
committerIvo Hinkelmann <ihi@openoffice.org>2010-12-03 13:23:33 +0100
commitf52fdb2b1e17e29f3a566f7bc4dcda504693e487 (patch)
tree07ee24b687f1da329b6a0a3cb02b53413226e9f7 /scp2
parentc43ef26714cee177493c10e0e7be5284d157026c (diff)
parent30fe5345da00839957da39ccc91d8fa13260bda4 (diff)
CWS-TOOLING: integrate CWS native349
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/directory_ooo.scp10
-rw-r--r--scp2/source/ooo/file_extra_ooo.scp7
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
-rwxr-xr-xscp2/source/ooo/module_lang_template.scp1
4 files changed, 9 insertions, 10 deletions
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index cc805f9e8288..4b20c6de7cc1 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -965,6 +965,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";
@@ -1025,11 +1030,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 e8c20f99ca94..e1bc26118011 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 8ffeadc2e99a..a21016e409d3 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,