[ooo-build-commit] Branch 'ooo/OOO310' - 3 commits - instsetoo_native/util scp2/source solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu May 28 17:13:11 PDT 2009
instsetoo_native/util/openoffice.lst | 46 +++++------
instsetoo_native/util/pack.lst | 12 +--
scp2/source/base/file_base.scp | 4 -
scp2/source/calc/file_calc.scp | 4 -
scp2/source/calc/registryitem_calc.scp | 4 -
scp2/source/canvas/canvascommons.scp | 2
scp2/source/draw/registryitem_draw.scp | 4 -
scp2/source/impress/registryitem_impress.scp | 4 -
scp2/source/layout/layout.scp | 4 -
scp2/source/math/file_math.scp | 2
scp2/source/math/registryitem_math.scp | 4 -
scp2/source/onlineupdate/file_onlineupdate.scp | 2
scp2/source/ooo/file_improvement.scp | 2
scp2/source/ooo/file_library_ooo.scp | 90 +++++++++++------------
scp2/source/ooo/file_ooo.scp | 18 ++--
scp2/source/ooo/file_resource_ooo.scp | 4 -
scp2/source/ooo/ure.scp | 2
scp2/source/writer/registryitem_writer.scp | 4 -
solenv/bin/modules/installer/windows/msp.pm | 2
solenv/bin/modules/installer/windows/property.pm | 2
solenv/inc/minor.mk | 6 -
21 files changed, 111 insertions(+), 111 deletions(-)
New commits:
commit 4dbfae9e871a412c747654038a505cee13f1a38d
Author: Oliver Bolte <obo at openoffice.org>
Date: Mon May 25 12:57:02 2009 +0000
#i10000# switching back to dev mode
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 4c63ea6..1709883 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -7,17 +7,17 @@
# Product List_of_platforms List_of_languages Target
-OpenOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|da|de|el|es|fr|it|ja|nl|ko|pl|ru|sv|pt|pt-BR|zh-CN|zh-TW|gl|vi|mk|lt|nn|nb|tr|sl|sh|sr openoffice
+OpenOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar openoffice
OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US openoffice
-BrOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro pt-BR broffice
-OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro en-US|ar|da|de|el|es|fr|it|ja|nl|ko|pl|ru|sv|pt|pt-BR|zh-CN|zh-TW|gl|vi|mk|lt|nn|nb|tr|sl|sh|sr openofficewithjre
-BrOffice_wJRE unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro pt-BR brofficewithjre
+#BrOffice pt-BR broffice
+#OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12 en-US openofficewithjre
+#BrOffice_wJRE pt-BR brofficewithjre
OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US|ar openofficedev
#BrOffice_Dev pt-BR brofficedev
OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo
#URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure
-OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de|af|ar|as-IN|be-BY|bg|bn|br|brx|bs|ca|cs|cy|da|dgo|dz|el|es|en-GB|en-US|en-ZA|eo|et|eu|fa|fi|fr|ga|gl|gu|gu-IN|he|hi-IN|hr|hu|id|it|ja|ka|kk|km|kn-IN|ko|kok|ks|ku|lt|mai|mk|ml-IN|mn|mni|mr-IN|my|nb|ne|nl|nn|nr|ns|oc|or-IN|pa-IN|pl|pt|pt-BR|ru|rw|sa-IN|sat|sd|sh|sk|sl|sr|ss|st|sv|sw-TZ|ta|ta-IN|te-IN|tg|th|ti-ER|tn|tr|ts|uk|ur-IN|uz|ve|vi|xh|zh-CN|zh-TW|zu ooolanguagepack
+OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de ooolanguagepack
OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12 de ooolanguagepack
OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de|fr|ja|ar ooodevlanguagepack
-BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack
+#BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack
commit 2651b27d416f9c68bff5f8626c19c28319a07313
Author: Oliver Bolte <obo at openoffice.org>
Date: Fri May 22 11:09:20 2009 +0000
OOO310
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 1e0cf96..f7138bd 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=310
-RSCREVISION=310m11(Build:9399)
-BUILD=9399
-LAST_MINOR=m11
+RSCREVISION=310m12(Build:9404)
+BUILD=9404
+LAST_MINOR=m12
SOURCEVERSION=OOO310
commit f99e479b1d477ca7c152b1cd21e8f0057042edfb
Author: Oliver Bolte <obo at openoffice.org>
Date: Fri May 22 10:29:36 2009 +0000
CWS-TOOLING: integrate CWS native245
2009-05-12 13:16:48 +0200 is r271818 : #159766# enabling creation of OOO 3.1.1
2009-05-12 11:50:27 +0200 is r271811 : #159766# enabling creation of OOO 3.1.1
2009-05-11 15:11:36 +0200 is r271774 : #159766# enabling creation of OOO 3.1.1
2009-05-11 14:50:41 +0200 is r271772 : #159766# removing PATCH flags for SO 9.1.1
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index cec4914..53e684c 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,8 +5,8 @@ Globals
variables
{
OOOBASEVERSION 3.1
- OOOPACKAGEVERSION 3.1.0
- UREPACKAGEVERSION 1.5.0
+ OOOPACKAGEVERSION 3.1.1
+ UREPACKAGEVERSION 1.5.1
URELAYERVERSION 1
BASISROOTNAME OpenOffice.org
UNIXBASISROOTNAME openoffice.org
@@ -21,7 +21,7 @@ Globals
UREPACKAGEPREFIX openoffice.org
SOLSUREPACKAGEPREFIX openofficeorg
USE_FILEVERSION 1
- LIBRARYVERSION 9.1.0
+ LIBRARYVERSION 9.1.1
REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
PROGRESSBARCOLOR 4,68,155
@@ -34,7 +34,7 @@ Globals
CREATE_MSP_INSTALLSET 0
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
- WINDOWSPATCHLEVEL 2
+ WINDOWSPATCHLEVEL 3
}
}
}
@@ -54,7 +54,7 @@ OpenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.1.0
+ ABOUTBOXPRODUCTVERSION 3.1.1
BASEPRODUCTVERSION 3.1
PCPFILENAME openoffice.pcp
UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
@@ -66,7 +66,7 @@ OpenOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.1.0
+ PACKAGEVERSION 3.1.1
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -82,7 +82,7 @@ OpenOffice
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.1.0
+ LIBRARYVERSION 9.1.1
PATCHCODEFILE ooo_patchcodes.txt
DOWNLOADBANNER ooobanner.bmp
DOWNLOADBITMAP ooobitmap.bmp
@@ -118,7 +118,7 @@ OpenOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.1.0
+ ABOUTBOXPRODUCTVERSION 3.1.1
BASEPRODUCTVERSION 3.1
UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -129,7 +129,7 @@ OpenOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.1.0
+ PACKAGEVERSION 3.1.1
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -145,7 +145,7 @@ OpenOffice_wJRE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.1.0
+ LIBRARYVERSION 9.1.1
PATCHCODEFILE ooo_patchcodes.txt
JAVAPRODUCT 1
DOWNLOADBANNER ooobanner.bmp
@@ -183,7 +183,7 @@ OpenOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.1.0
+ ABOUTBOXPRODUCTVERSION 3.1.1
BASEPRODUCTVERSION 3.1
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX ooobasis-dev
@@ -198,7 +198,7 @@ OpenOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.1.0
+ PACKAGEVERSION 3.1.1
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -215,7 +215,7 @@ OpenOffice_Dev
CHANGETARGETDIR 1
USE_FILEVERSION 1
JAVAPRODUCT 1
- LIBRARYVERSION 9.1.0
+ LIBRARYVERSION 9.1.1
PATCHCODEFILE ooodev_patchcodes.txt
CODEFILENAME codes_ooodev.txt
DOWNLOADBANNER ooobanner.bmp
@@ -293,7 +293,7 @@ OpenOffice_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.1.0
+ PACKAGEVERSION 3.1.1
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -335,7 +335,7 @@ BrOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.1.0
+ ABOUTBOXPRODUCTVERSION 3.1.1
PROGRESSBARCOLOR
PROGRESSSIZE
PROGRESSPOSITION
@@ -349,7 +349,7 @@ BrOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.1.0
+ PACKAGEVERSION 3.1.1
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -365,7 +365,7 @@ BrOffice
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.1.0
+ LIBRARYVERSION 9.1.1
CODEFILENAME codes_broo.txt
PATCHCODEFILE ooo_patchcodes.txt
DOWNLOADBANNER brobanner.bmp
@@ -402,7 +402,7 @@ BrOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.1.0
+ ABOUTBOXPRODUCTVERSION 3.1.1
PROGRESSBARCOLOR
PROGRESSSIZE
PROGRESSPOSITION
@@ -416,7 +416,7 @@ BrOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.1.0
+ PACKAGEVERSION 3.1.1
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -432,7 +432,7 @@ BrOffice_wJRE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.1.0
+ LIBRARYVERSION 9.1.1
CODEFILENAME codes_broo.txt
PATCHCODEFILE ooo_patchcodes.txt
JAVAPRODUCT 1
@@ -471,7 +471,7 @@ BrOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.1.0
+ ABOUTBOXPRODUCTVERSION 3.1.1
DEVELOPMENTPRODUCT 1
PROGRESSBARCOLOR
PROGRESSSIZE
@@ -489,7 +489,7 @@ BrOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.1.0
+ PACKAGEVERSION 3.1.1
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -506,7 +506,7 @@ BrOffice_Dev
CHANGETARGETDIR 1
USE_FILEVERSION 1
JAVAPRODUCT 1
- LIBRARYVERSION 9.1.0
+ LIBRARYVERSION 9.1.1
PATCHCODEFILE ooo_patchcodes.txt
CODEFILENAME codes_broodev.txt
DOWNLOADBANNER brobanner.bmp
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index e069d73..73b0747 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_PATCH( gid_File_Lib_Dbu, dbu )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbu, dbu )
STD_RES_FILE( gid_File_Res_Dbu, dbu)
STD_UNO_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
@@ -62,7 +62,7 @@ STD_RES_FILE( gid_File_Res_Cnr, cnr)
STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Rpt, rpt )
+STD_UNO_LIB_FILE( 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/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index e49770f..adc5be4 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -45,9 +45,9 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
-STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
+STD_LIB_FILE( gid_File_Lib_Scui, scui)
STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 0e76712..e961453 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochand
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\InprocHandler32";
Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochand
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\InprocHandler32";
Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Insertable
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 839cf42..67e374e 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -43,7 +43,7 @@ File gid_File_Oo_Office_Canvas_Xcu
Name = "/registry/data/org/openoffice/Office/Canvas.xcu";
End
-STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
+STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
#ifdef ENABLE_AGG
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index cf4dc24..793f692 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochand
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\InprocHandler32";
Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochand
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\InprocHandler32";
Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Insertable
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 69a7fa2..cd24128 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochand
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\InprocHandler32";
Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochand
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\InprocHandler32";
Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Insertable
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
index 124be9c..a66179e 100644
--- a/scp2/source/layout/layout.scp
+++ b/scp2/source/layout/layout.scp
@@ -38,13 +38,13 @@ End
File gid_File_Zip_Sw_Layout
Dir = gid_Dir_Share_Layout;
USER_FILE_BODY;
- Styles = (ARCHIVE, PATCH);
+ Styles = (ARCHIVE);
Name = "sw-layout.zip";
End
File gid_File_Zip_Svx_Layout
Dir = gid_Dir_Share_Layout;
USER_FILE_BODY;
- Styles = (ARCHIVE, PATCH);
+ Styles = (ARCHIVE);
Name = "svx-layout.zip";
End
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 7ae718f..a807303 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -46,7 +46,7 @@ File gid_File_Dtd_Math
End
#endif
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sm , sm)
+STD_UNO_LIB_FILE( gid_File_Lib_Sm , sm)
STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd)
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 789daa8..470ebbc 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -84,7 +84,7 @@ RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochand
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\InprocHandler32";
Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Insertable
@@ -203,7 +203,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochand
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\InprocHandler32";
Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Insertable
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index b415ea2..470b69e 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -30,7 +30,7 @@
#include "macros.inc"
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updchk , updchk.uno )
+SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
File gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index 93110fe..67ec89b 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 184e8f1..477cd1d 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -192,13 +192,13 @@ File gid_File_Lib_Comphelper2
Name = STRING(CONCAT3(comphelp4,COMID,.dll));
#endif
Dir = gid_Dir_Program;
- 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
@@ -258,7 +258,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)
@@ -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_PATCH( gid_File_Lib_Dbase2, dbase )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase )
STD_LIB_FILE( gid_File_Lib_Dbfile , file)
@@ -285,9 +285,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;
@@ -346,7 +346,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 = gid_Dir_Program;
#ifdef UNX
@@ -421,11 +421,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 = gid_Dir_Program;
Name = "inprocserv.dll";
End
@@ -499,7 +499,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 = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
Name = SPECIAL_NAME(filterconfig1);
@@ -624,14 +624,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 = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -652,7 +652,7 @@ End
File gid_File_Lib_Go
Name = LIBNAME(go);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -663,7 +663,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 = gid_Dir_Program;
#ifdef UNX
@@ -841,7 +841,7 @@ 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;
@@ -908,7 +908,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 = gid_Dir_Program;
#ifdef UNX
@@ -1074,7 +1074,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)
@@ -1190,7 +1190,7 @@ End
File gid_File_Lib_Res
Name = LIBNAME(res);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1221,9 +1221,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)
@@ -1240,15 +1240,15 @@ File gid_File_Lib_Scriptframe
#endif
RegistryID = gid_Starregistry_Services_Rdb;
Dir = gid_Dir_Program;
- 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 = gid_Dir_Program;
#ifdef UNX
@@ -1277,7 +1277,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 = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1319,7 +1319,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)
@@ -1334,7 +1334,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 = gid_Dir_Program;
@@ -1358,21 +1358,21 @@ End
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_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx)
+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( gid_File_Lib_Msword, msword )
File gid_File_Lib_Sysdtrans
TXT_FILE_BODY;
- Styles = (PACKED,PATCH,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = gid_Dir_Program;
#ifdef UNX
@@ -1453,7 +1453,7 @@ End
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#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)
@@ -1467,7 +1467,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 = gid_Dir_Program;
@@ -1475,22 +1475,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 = gid_Dir_Program;
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 = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1515,7 +1515,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 = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1578,7 +1578,7 @@ File gid_File_Lib_XSec_Framework
Name = "xsec_fw.dll";
#endif
Dir = gid_Dir_Program;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1590,7 +1590,7 @@ File gid_File_Lib_XSec_XmlSec
Name = "xsec_xmlsec.dll";
#endif
Dir = gid_Dir_Program;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1658,9 +1658,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
@@ -1708,7 +1708,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 M1310 || \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 2502079..711fde4 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
@@ -359,7 +359,7 @@ End
STD_FILTER_FILE( gid_File_Filter_Eme, eme)
-STD_FILTER_FILE_PATCH( gid_File_Filter_Emp, emp)
+STD_FILTER_FILE( gid_File_Filter_Emp, emp)
STD_FILTER_FILE( gid_File_Filter_Icg, icg)
@@ -543,7 +543,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
@@ -1664,7 +1664,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
@@ -1727,7 +1727,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
@@ -2123,7 +2123,7 @@ End
File gid_File_Rdb_Offapi
TXT_FILE_BODY;
Dir = gid_Dir_Program;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Name = "offapi.rdb";
End
@@ -2699,7 +2699,7 @@ File gid_Starregistry_Services_Rdb
TXT_FILE_BODY;
Name = "services.rdb";
Dir = gid_Dir_Program;
- Styles = (PACKED, STARREGISTRY, PATCH);
+ Styles = (PACKED, STARREGISTRY);
NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/";
End
@@ -2873,7 +2873,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 14b02d2..54592a2 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)
@@ -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/ure.scp b/scp2/source/ooo/ure.scp
index f616a89..9faf50c 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,PATCH);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
End
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 0d8d18d..929c824 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochand
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\InprocHandler32";
Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochand
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\InprocHandler32";
Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Insertable
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 1d0b082..f090593 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -990,7 +990,7 @@ sub get_requiredpatchfile_from_list
my $langs = $3;
my $path = $4;
- if (( $pro ne "pro" ) && ( $pro ne "nonpro" )) { installer::exiter::exit_program("ERROR: Wrong syntax in file: $filename. Only \"pro\" or \"nonpro\" allowed in column 1! Line: \"$line\"", "get_databasename_from_list"); }
+ if (( $pro ne "pro" ) && ( $pro ne "nonpro" )) { installer::exiter::exit_program("ERROR: Wrong syntax in file: $filename. Only \"pro\" or \"nonpro\" allowed in column 1! Line: \"$line\"", "get_requiredpatchfile_from_list"); }
if ( correct_patch($product, $pro, $langs, $languagestringref) )
{
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 6146595..e76f1ec 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -304,7 +304,7 @@ sub set_important_properties
push(@{$propertyfile}, $onepropertyline);
}
- my $onepropertyline = "IGNOREPREREQUIREDPATCH" . "\t" . "0" . "\n";
+ my $onepropertyline = "IGNOREPREREQUIREDPATCH" . "\t" . "1" . "\n";
push(@{$propertyfile}, $onepropertyline);
if ( $installer::globals::sundirexists )
More information about the ooo-build-commit
mailing list