[Libreoffice-commits] .: scp2/inc scp2/source
Andras Timar
timar at kemper.freedesktop.org
Sun Jul 17 09:36:46 PDT 2011
scp2/inc/macros.inc | 8 +++++++
scp2/source/binfilter/file_binfilter.scp | 21 +++++++++----------
scp2/source/binfilter/module_binfilter.scp | 32 +++++++++--------------------
3 files changed, 29 insertions(+), 32 deletions(-)
New commits:
commit 324fc52e083be80594a735a1a6b39f041e6d6b16
Author: Andras Timar <atimar at suse.com>
Date: Sun Jul 17 14:28:23 2011 +0200
pack binfilter resources together with other binfilter files
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 38fbd96..677bf28 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -186,6 +186,14 @@
Styles = (PACKED); \
End
+#define BINFILTER_RES_FILE(id,name) \
+ File id \
+ TXT_FILE_BODY; \
+ Name = STRING(CONCAT3(name,en-US,.res)); \
+ Dir = gid_Dir_Resource; \
+ Styles = (PACKED); \
+ End
+
#define BRAND_RES_FILE(id,name) \
File id \
TXT_FILE_BODY; \
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index 951caad..140a430 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -58,17 +58,16 @@ STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm)
STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
-
+STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
STD_LIB_FILE( gid_File_Lib_Bindet, bindet)
-STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
-STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
-STD_RES_FILE( gid_File_Res_Bf_Svt, bf_svt )
-STD_RES_FILE( gid_File_Res_Bf_Frm, bf_frm )
-STD_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa )
-STD_RES_FILE( gid_File_Res_Bf_Sc, bf_sc )
-STD_RES_FILE( gid_File_Res_Bf_Sd, bf_sd )
-STD_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
-STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
-STD_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Svt, bf_svt )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Frm, bf_frm )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sc, bf_sc )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sd, bf_sd )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index 4857ecf..873652e 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -53,25 +53,15 @@ Module gid_Module_Optional_Binfilter
gid_File_Lib_Bf_Wrapper,
gid_File_Lib_Legacy_Binfilters,
gid_File_Lib_Bf_Migratefilter,
- gid_File_Lib_Bindet);
+ gid_File_Lib_Bindet,
+ gid_File_Res_Bf_Sch,
+ gid_File_Res_Bf_Svx,
+ gid_File_Res_Bf_Svt,
+ gid_File_Res_Bf_Frm,
+ gid_File_Res_Bf_Ofa,
+ gid_File_Res_Bf_Sc,
+ gid_File_Res_Bf_Sd,
+ gid_File_Res_Bf_Sm,
+ gid_File_Res_Bf_Sw,
+ gid_File_Res_Bf_Sfx);
End
-
-Module gid_Module_Langpack_Binfilter_Template
- ParentID = gid_Module_Optional_Binfilter;
- Name = "gid_Module_Langpack_Binfilter_Template";
- Description = "gid_Module_Langpack_Binfilter_Template";
- Default = YES;
- Styles = (TEMPLATEMODULE);
- Files = (gid_File_Res_Bf_Sch,
- gid_File_Res_Bf_Svx,
- gid_File_Res_Bf_Svt,
- gid_File_Res_Bf_Frm,
- gid_File_Res_Bf_Ofa,
- gid_File_Res_Bf_Sc,
- gid_File_Res_Bf_Sd,
- gid_File_Res_Bf_Sm,
- gid_File_Res_Bf_Sw,
- gid_File_Res_Bf_Sfx);
-End
-
-#include "alllangmodules_binfilter.inc"
More information about the Libreoffice-commits
mailing list