summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2008-11-19 13:34:57 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2008-11-19 13:34:57 +0000
commit45894b48515509138afbeaab7541cfeb3fc046f9 (patch)
tree4f43f880d02c9ccd0dde8a3d9008ef1a244cee55
parent385a8e7c2a3ca3a41ac715e566bb8f511dc57e5e (diff)
CWS-TOOLING: integrate CWS fwk94_DEV300
-rw-r--r--scp2/source/calc/file_calc.scp4
-rw-r--r--scp2/source/ooo/file_library_ooo.scp16
-rwxr-xr-xscp2/source/ooo/ure.scp2
3 files changed, 11 insertions, 11 deletions
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 120dc5811219..f65fb48fd002 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: file_calc.scp,v $
- * $Revision: 1.43 $
+ * $Revision: 1.43.204.1 $
*
* This file is part of OpenOffice.org.
*
@@ -45,7 +45,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
-STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
STD_LIB_FILE( gid_File_Lib_Scui, scui)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 88424239b647..ccaca356caa6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -192,7 +192,7 @@ File gid_File_Lib_Comphelper2
Name = STRING(CONCAT3(comphelp4,COMID,.dll));
#endif
Dir = gid_Dir_Program;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -287,7 +287,7 @@ End
STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools )
-STD_UNO_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbaxml, dbaxml )
File gid_File_Lib_Dict_Ja
TXT_FILE_BODY;
@@ -490,7 +490,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
File gid_File_Lib_Filterconfig1
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT,PATCH);
Dir = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
Name = SPECIAL_NAME(filterconfig1);
@@ -1251,7 +1251,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
File gid_File_Lib_Sfx
Name = LIBNAME(sfx);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT,PATCH);
Dir = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1293,7 +1293,7 @@ End
#endif
-STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sot, sot )
#if defined(UNX) && !defined(QUARTZ)
@@ -1333,13 +1333,13 @@ End
STD_LIB_FILE( gid_File_Lib_Sts , sts)
STD_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno )
STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
-STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
STD_LIB_FILE( gid_File_Lib_Swui, swui)
File gid_File_Lib_Sysdtrans
@@ -1425,7 +1425,7 @@ End
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#endif
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
+SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index cf5cb5535bbc..27a95c951618 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -269,7 +269,7 @@ File gid_File_Dl_Sal
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_VER("sal", "3");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID,PATCH);
// CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
End