summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-04-07 13:41:56 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-04-07 13:41:56 +0000
commit7552b8462aa73454cf5c610136398f0db3d10a97 (patch)
treeafeee183c2da4de2f97035c4132398d1801c235a /scp2/source
parent4859d9025fcc56dd2f98c0800d23834c871f6abf (diff)
INTEGRATION: CWS internatiodel (1.175.8); FILE MERGED
2006/03/15 17:27:02 er 1.175.8.5: #i52115# also libavmedia with PATCH 2006/03/15 12:02:12 er 1.175.8.4: #i52115# also libbf_lng with PATCH 2006/03/14 13:31:32 er 1.175.8.3: #i52115# liblng with PATCH 2006/02/10 21:50:15 er 1.175.8.2: RESYNC: (1.175-1.184); FILE MERGED 2006/02/10 19:29:31 er 1.175.8.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/ooo/file_library_ooo.scp25
1 files changed, 17 insertions, 8 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 0f843d27a2f1..819464d77fe4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -4,9 +4,9 @@
*
* $RCSfile: file_library_ooo.scp,v $
*
- * $Revision: 1.196 $
+ * $Revision: 1.197 $
*
- * last change: $Author: vg $ $Date: 2006-04-06 11:55:08 $
+ * last change: $Author: vg $ $Date: 2006-04-07 14:41:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -702,7 +702,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Emser , emser)
File gid_File_Lib_Evoab_1
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = gid_Dir_Program;
Name = STRING(CONCAT2(libevoab1,UNXSUFFIX));
@@ -946,6 +946,15 @@ File gid_File_Lib_I18nsearch
#endif
End
+File gid_File_Lib_I18nisolang
+ #ifdef UNX
+ Name = STRING(CONCAT4(libi18nisolang,ISOLANG_MAJOR,COMID,UNXSUFFIX));
+ #else
+ Name = STRING(CONCAT4(i18nisolang,ISOLANG_MAJOR,COMID,.dll));
+ #endif
+ PACKED_LIB_FILE_BODY_PATCH;
+End
+
File gid_File_Lib_I18nutil
TXT_FILE_BODY;
#ifdef UNX
@@ -1704,12 +1713,12 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Schd , schd)
#ifndef WITHOUT_BINFILTER
STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sch, bf_sch)
-STD_LIB_FILE( gid_File_Lib_Bf_Lng, bf_lng)
+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Lng, bf_lng)
STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Xo, bf_xo)
STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Svx, bf_svx)
-STD_LIB_FILE( gid_File_Lib_Bf_Frm, bf_frm)
+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Frm, bf_frm)
STD_LIB_FILE( gid_File_Lib_Bf_Ofa, bf_ofa)
-STD_LIB_FILE( gid_File_Lib_Bf_Sd, bf_sd)
+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sd, bf_sd)
STD_LIB_FILE_PATCH( 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)
@@ -2321,7 +2330,7 @@ End
#endif
// AVMedia
-STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
+STD_LIB_FILE_PATCH( gid_File_Lib_AVMedia, avmedia )
#if defined UNX
#ifdef SOLAR_JAVA
@@ -2411,7 +2420,7 @@ End
File gid_File_Lib_Migrationoo2
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = gid_Dir_Program;
#ifdef UNX