native275 #i107355# updating to OOo 3.3

7 files changed, 95 insertions, 95 deletions

diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index 93110fe693eb..67ec89b15963 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -49,5 +49,5 @@ End
 #endif
 
 #if defined(BUILD_SPECIAL)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovement , oooimprovement)
+STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
 #endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a49efd11958f..0c11d0c4a349 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -203,13 +203,13 @@ File gid_File_Lib_Comphelper2
     Name = STRING(CONCAT3(comphelp4,COMID,.dll));
   #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui)
+STD_LIB_FILE( gid_File_Lib_Cui, cui)
 
 #ifndef SYSTEM_CURL
 
@@ -269,7 +269,7 @@ End
 #endif
 #endif
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dba, dba)
+STD_UNO_LIB_FILE( gid_File_Lib_Dba, dba)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
 
@@ -277,7 +277,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbase2, dbase )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase )
 File gid_File_Oo_Office_Dataaccess_Dbase_Xcu
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -301,9 +301,9 @@ File gid_File_Lib_Dbpool
   #endif
 End
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbt, dbtools )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools )
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbaxml, dbaxml )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
 
 File gid_File_Lib_Dict_Ja
     TXT_FILE_BODY;
@@ -362,7 +362,7 @@ End
 
 File gid_File_Lib_Dlgprov
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -427,7 +427,7 @@ End
 
 #endif
 
-STD_LIB_FILE_PATCH(gid_File_Lib_Drawinglayer,drawinglayer)
+STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
 
 SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj)
 
@@ -437,11 +437,11 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
 
 #if defined(WNT) && !defined(DISABLE_ATL)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Emser, emser )
+STD_UNO_LIB_FILE( gid_File_Lib_Emser, emser )
 
 File gid_File_Lib_Inprocserv
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "inprocserv.dll";
 End
@@ -528,7 +528,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
 
 File gid_File_Lib_Filterconfig1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = SPECIAL_NAME(filterconfig1);
@@ -558,7 +558,7 @@ End
 
 File gid_File_Lib_Fps
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
     Name = "fps.dll";
@@ -607,7 +607,7 @@ End
 #ifdef QUARTZ
 File gid_File_Lib_Fps_Aqua
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
@@ -675,14 +675,14 @@ End
 
 #endif
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Fwe , fwe)
+STD_LIB_FILE( gid_File_Lib_Fwe , fwe)
 
 STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 
 File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -703,7 +703,7 @@ End
 File gid_File_Lib_Go
     Name = LIBNAME(go);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -714,7 +714,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
 
 File gid_File_Lib_I18npool
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -900,12 +900,12 @@ File gid_File_Lib_Rebasemsi
     TXT_FILE_BODY;
     Name = "rebase.dll";
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,PATCH,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
+    Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
 End
 
 #endif
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng)
+STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng)
 
 File gid_File_Lib_Localedata_En
     TXT_FILE_BODY;
@@ -983,7 +983,7 @@ STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
 File gid_File_Lib_Mozbootstrap
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1073,7 +1073,7 @@ File gid_File_Lib_Mingw_GccS
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = MINGW_GCCDLL;
-    Styles = (PACKED, PATCH);
+    Styles = (PACKED);
 End
 
 #endif
@@ -1084,7 +1084,7 @@ File gid_File_Lib_Mingw_Stdcpp
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = MINGW_GXXDLL;
-    Styles = (PACKED, PATCH);
+    Styles = (PACKED);
 End
 
 #endif
@@ -1193,7 +1193,7 @@ End
 STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 
 #ifndef WITHOUT_MOZILLA
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pl , pl)
+STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
 STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload)
@@ -1204,13 +1204,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
 File gid_File_Lib_Desktop_Detector
     Name = LIBNAME(desktop_detector);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 File gid_File_Lib_Vclplug_Gen
     Name = LIBNAME(vclplug_gen);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1220,7 +1220,7 @@ End
 File gid_File_Lib_Vclplug_Gtk
     Name = LIBNAME(vclplug_gtk);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1229,7 +1229,7 @@ End
 File gid_File_Lib_Vclplug_Kde
     Name = LIBNAME(vclplug_kde);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1265,7 +1265,7 @@ End
 #endif
 
 #if defined UNX && ! defined QUARTZ
-STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif
 
@@ -1316,7 +1316,7 @@ End
 File gid_File_Lib_Res
     Name = LIBNAME(res);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1347,9 +1347,9 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Sax , sax)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox , oox)
+STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sb , sb)
+STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn)
 
@@ -1366,15 +1366,15 @@ File gid_File_Lib_Scriptframe
   #endif
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
 End
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sd , sd)
-STD_LIB_FILE_PATCH( gid_File_Lib_Sdui, sdui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd)
+STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
 
 File gid_File_Lib_Slideshow
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1403,7 +1403,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,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1445,7 +1445,7 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sot, sot )
+STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot )
 
 #if defined(UNX) && !defined(QUARTZ)
 
@@ -1460,7 +1460,7 @@ End
 
 File gid_File_Lib_Spell
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = LIBNAME(spell);
     Dir = SCP2_OOO_BIN_DIR;
@@ -1472,24 +1472,24 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
+STD_LIB_FILE( gid_File_Lib_Svl, svl )
+STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno )
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Core, svxcore)
-STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Msfilter, svxmsfilter)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx)
+STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
+STD_LIB_FILE( gid_File_Lib_Svx_Msfilter, svxmsfilter)
+STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
 STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
-STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_LIB_FILE( gid_File_Lib_Swui, swui)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
+STD_LIB_FILE( gid_File_Lib_Msword, msword )
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
     Name = "sysdtrans.dll";
@@ -1560,13 +1560,13 @@ File gid_File_Lib_Ucpchelp1
 End
 
 #ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
  #ifndef SYSTEM_NEON
    SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
  #endif
 #endif
 
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
 
 SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
 
@@ -1580,7 +1580,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
 
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = LIBNAME(lnth);
     Dir = SCP2_OOO_BIN_DIR;
@@ -1588,22 +1588,22 @@ End
 
 File gid_File_Lib_Hyph
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = LIBNAME(hyphen);
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Utl , utl)
+STD_UNO_LIB_FILE( gid_File_Lib_Utl , utl)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Uui, uui )
+STD_UNO_LIB_FILE( gid_File_Lib_Uui, uui )
 
 STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 
 File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1628,7 +1628,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
 File gid_File_Lib_Xo
     Name = LIBNAME(xo);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1691,7 +1691,7 @@ File gid_File_Lib_XSec_Framework
         Name = "xsec_fw.dll";
     #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
@@ -1703,7 +1703,7 @@ File gid_File_Lib_XSec_XmlSec
         Name = "xsec_xmlsec.dll";
     #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
@@ -1771,9 +1771,9 @@ End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Updchkui , updchk )
+STD_UNO_LIB_FILE( gid_File_Lib_Updchkui , updchk )
 
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updatefeed , updatefeed.uno )
+SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
 
 #ifdef WNT
 File gid_File_Lib_Onlinecheck
@@ -1821,7 +1821,7 @@ File gid_File_Lib_Unopkgapp
     Styles = (PACKED);
 End
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore)
+STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
 
 #if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
     !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7d1d8bb5cc40..52bd9f00f1cb 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -163,7 +163,7 @@ End
 File gid_File_Profile_Gengal
     BIN_FILE_BODY;
     Dir = gid_Dir_Program;
-    Styles = (PACKED, PATCH);
+    Styles = (PACKED);
     Name = PROFILENAME(gengal);
 End
 
@@ -173,7 +173,7 @@ File gid_File_Bin_Pluginapp
     BIN_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = "pluginapp.bin";
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
 End
 
 #endif
@@ -348,7 +348,7 @@ End
 
 STD_FILTER_FILE( gid_File_Filter_Eme, eme)
 
-STD_FILTER_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
+STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
 
 STD_FILTER_FILE( gid_File_Filter_Icg, icg)
 
@@ -526,7 +526,7 @@ File gid_File_Jar_Unoil
     TXT_FILE_BODY;
     Name = "unoil.jar";
     Dir = gid_Dir_Classes;
-    Styles = (PACKED,DONT_OVERWRITE,PATCH);
+    Styles = (PACKED,DONT_OVERWRITE);
 End
 
 #endif
@@ -1667,7 +1667,7 @@ End
 
 File gid_File_Oo_Office_Ui_Genericcommands_Xcu
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
     Name = "/registry/data/org/openoffice/Office/UI/GenericCommands.xcu";
 End
@@ -1730,7 +1730,7 @@ End
 
 File gid_File_Oo_Office_Linguistic_Xcs
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
     Name = "/registry/schema/org/openoffice/Office/Linguistic.xcs";
 End
@@ -2126,7 +2126,7 @@ End
 File gid_File_Rdb_Offapi
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Name = "offapi.rdb";
 End
 
@@ -2724,7 +2724,7 @@ File gid_Starregistry_Services_Rdb
     TXT_FILE_BODY;
     Name = "services.rdb";
     Dir = gid_Dir_Program;
-    Styles = (PACKED, STARREGISTRY, PATCH);
+    Styles = (PACKED, STARREGISTRY);
 #if defined WNT
     NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/";
 #else
@@ -2893,7 +2893,7 @@ File gid_File_Images_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images.zip";
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
 End
 
 File gid_File_ImagesCrystal_Zip
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 14b02d2dfa83..5fdbf4202c11 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -87,7 +87,7 @@ STD_RES_FILE( gid_File_Res_San, san )
 
 STD_RES_FILE( gid_File_Res_Sd, sd )
 
-STD_RES_FILE_PATCH( gid_File_Res_Sfx, sfx )
+STD_RES_FILE( gid_File_Res_Sfx, sfx )
 
 #if defined(UNX) && !defined(QUARTZ)
 
@@ -101,7 +101,7 @@ STD_RES_FILE( gid_File_Res_Sb, sb )
 STD_RES_FILE( gid_File_Res_Svs, svs )
 
 STD_RES_FILE( gid_File_Res_Svt, svt )
-STD_RES_FILE_ONLY_PATCH( gid_File_Res_Svp, svp )
+STD_RES_FILE_ONLY( gid_File_Res_Svp, svp )
 
 STD_RES_FILE( gid_File_Res_Svx, svx )
 STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs )
@@ -113,7 +113,7 @@ STD_RES_FILE( gid_File_Res_Acc, acc )
 
 STD_RES_FILE( gid_File_Res_Tpl, tpl )
 
-STD_RES_FILE_PATCH( gid_File_Res_Uui, uui )
+STD_RES_FILE( gid_File_Res_Uui, uui )
 
 STD_RES_FILE( gid_File_Res_Vcl, vcl )
 
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index 97211fe6a5ac..34c3a5ce8957 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -56,7 +56,7 @@ Profile gid_Profile_Version_Ini_Basis
     ModuleID = gid_Module_Root;
     Name = PROFILENAME(version);
     Dir = gid_Dir_Program;
-    Styles = (PATCH);
+    Styles = ();
 End
 
 Profile gid_Profile_Fundamentalbasis_Ini
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 4e34805e33ec..5b62f561851a 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -251,7 +251,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "INSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Install
@@ -260,7 +260,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	ModuleID = gid_Module_Root;
 	Name = "INSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
@@ -269,7 +269,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
 	ModuleID = gid_Module_Root;
 	Name = "INSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,PATCH);
+	Styles = (ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Officeinstall
@@ -278,7 +278,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[OFFICEINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH,UPGRADEKEY);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Productversion
@@ -287,7 +287,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "ProductVersion";
 	Value = "[ProductVersion]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Officeinstall
@@ -296,7 +296,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[OFFICEINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Productversion
@@ -305,7 +305,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	ModuleID = gid_Module_Root;
 	Name = "ProductVersion";
 	Value = "[ProductVersion]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
@@ -314,7 +314,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[OFFICEINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,PATCH);
+	Styles = (ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
@@ -323,7 +323,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[BASISINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
@@ -332,7 +332,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[BASISINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
@@ -341,7 +341,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[BASISINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION,PATCH);
+	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
@@ -350,7 +350,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[BASISINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,PATCH);
+	Styles = (ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
@@ -359,7 +359,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[UREINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
@@ -368,7 +368,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[UREINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
@@ -377,7 +377,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION,PATCH);
+	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
@@ -386,7 +386,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,PATCH);
+	Styles = (ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Sog
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 1c260e2d2508..41f2b73adbe8 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -134,7 +134,7 @@ File gid_File_Exe_Javaldx
     BIN_FILE_BODY;
     Dir = gid_Dir_Ure_Bin;
     Name = EXENAME(javaldx);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
 End
 #endif
@@ -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,PATCH);
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
 End
 
@@ -336,7 +336,7 @@ File gid_File_Dl_Sunjavaplugin
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("sunjavaplugin");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E";
 End
 #endif
@@ -839,7 +839,7 @@ File gid_File_Dl_Libxml2
 #else
     Name = SCP2_URE_DL_VER("xml2", "2");
 #endif
-    Styles = (PACKED, PATCH, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E";
 End
 #endif
@@ -1208,7 +1208,7 @@ Profile gid_Profile_Version_Ini_Ure
     ModuleID = gid_Module_Root_Ure_Hidden;
     Name = PROFILENAME(version);
     Dir = gid_Dir_Ure_Bin;
-    Styles = (PATCH);
+    Styles = ();
 End
 
 ProfileItem gid_Ure_Profileitem_Version_Buildid