CWS-TOOLING: integrate CWS dba301a_DEV300

6 files changed, 16 insertions, 16 deletions

diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 2b3f5942cf50..26976a133341 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -52,7 +52,7 @@ STD_RES_FILE( gid_File_Res_Abp, abp)
 STD_UNO_LIB_FILE( gid_File_Lib_Dbp, dbp)
 STD_RES_FILE( gid_File_Res_Dbp, dbp)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbu, dbu )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbu, dbu )
 STD_RES_FILE( gid_File_Res_Dbu, dbu)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
@@ -64,7 +64,7 @@ STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
 
 #ifdef ENABLE_REPORTDESIGN
 
-STD_UNO_LIB_FILE( gid_File_Lib_Rpt, rpt )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Rpt, rpt )
 STD_RES_FILE( gid_File_Res_Rpt, rpt)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Rptui, rptui )
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index bf76d372ee26..27617b9d8eb5 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -99,4 +99,4 @@ Module gid_Module_Langpack_Base_Template
              gid_File_Res_Sdberr);
 End
 
-#include "alllangmodules_base.inc"
\ No newline at end of file
+#include "alllangmodules_base.inc"
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a032cab3343e..7f71ed5b111c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -258,7 +258,7 @@ End
 #endif
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dba, dba)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dba, dba)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
 
@@ -266,7 +266,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbase2, dbase )
 
 STD_LIB_FILE( gid_File_Lib_Dbfile , file)
 
@@ -285,7 +285,7 @@ File gid_File_Lib_Dbpool
   #endif
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbt, dbtools )
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbaxml, dbaxml )
 
@@ -1164,7 +1164,7 @@ End
 File gid_File_Lib_Res
     Name = LIBNAME(res);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     Dir = gid_Dir_Program;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1455,7 +1455,7 @@ End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Utl , utl)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Uui, uui )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Uui, uui )
 
 STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6039ce6806c6..fa6dadd0952c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -536,7 +536,7 @@ File gid_File_Jar_Unoil
     TXT_FILE_BODY;
     Name = "unoil.jar";
     Dir = gid_Dir_Classes;
-    Styles = (PACKED,DONT_OVERWRITE);
+    Styles = (PACKED,DONT_OVERWRITE,PATCH);
 End
 
 #endif
@@ -2067,7 +2067,7 @@ End
 File gid_File_Rdb_Offapi
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Name = "offapi.rdb";
 End
 
@@ -2669,7 +2669,7 @@ File gid_Starregistry_Services_Rdb
     TXT_FILE_BODY;
     Name = "services.rdb";
     Dir = gid_Dir_Program;
-    Styles = (PACKED, STARREGISTRY);
+    Styles = (PACKED, STARREGISTRY, PATCH);
     NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
     JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/";
 End
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 00ce4f4f27d7..fde3e550b5c1 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: file_resource_ooo.scp,v $
- * $Revision: 1.66 $
+ * $Revision: 1.66.96.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -87,7 +87,7 @@ STD_RES_FILE( gid_File_Res_San, san )
 
 STD_RES_FILE( gid_File_Res_Sd, sd )
 
-STD_RES_FILE( gid_File_Res_Sfx, sfx )
+STD_RES_FILE_PATCH( gid_File_Res_Sfx, sfx )
 
 #if defined(UNX) && !defined(QUARTZ)
 
@@ -113,7 +113,7 @@ STD_RES_FILE( gid_File_Res_Acc, acc )
 
 STD_RES_FILE( gid_File_Res_Tpl, tpl )
 
-STD_RES_FILE( gid_File_Res_Uui, uui )
+STD_RES_FILE_PATCH( gid_File_Res_Uui, uui )
 
 STD_RES_FILE( gid_File_Res_Vcl, vcl )
 
diff --git a/scp2/source/ooo/module_langpack.scp b/scp2/source/ooo/module_langpack.scp
index 1183b5d74a55..d50be8837337 100644
--- a/scp2/source/ooo/module_langpack.scp
+++ b/scp2/source/ooo/module_langpack.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: module_langpack.scp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.222.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -38,4 +38,4 @@ Module gid_Module_Langpack_Languageroot
     Styles = (SHOW_MULTILINGUAL_ONLY);
 End
 
-#include "alllangmodules.inc"
\ No newline at end of file
+#include "alllangmodules.inc"