diff options
Diffstat (limited to 'scp2')
26 files changed, 256 insertions, 425 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 91c74499a916..5388fe8d105d 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -290,24 +290,6 @@ Styles = (PACKED,DONT_OVERWRITE,PATCH); \ End -#define UNO_JAR_FILE(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = STRING(CONCAT2(name,.jar)); \ - RegistryID = gid_Starregistry_Services_Rdb; \ - Dir = gid_Dir_Classes; \ - Styles = (PACKED,DONT_OVERWRITE, UNO_COMPONENT); \ - End - -#define UNO_JAR_FILE_PATCH(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = STRING(CONCAT2(name,.jar)); \ - RegistryID = gid_Starregistry_Services_Rdb; \ - Dir = gid_Dir_Classes; \ - Styles = (PACKED,DONT_OVERWRITE,UNO_COMPONENT,PATCH); \ - End - #define JARFILENAME(name) STRING(CONCAT2(name,.jar)) #define PACKED_SHELLNEW_FILE_BODY \ @@ -322,52 +304,16 @@ Name = STRING(name) ; \ End -#define PACKED_UNO_LIB_FILE_BODY \ - TXT_FILE_BODY; \ - Styles = (PACKED,UNO_COMPONENT); \ - Dir = SCP2_OOO_BIN_DIR; \ - RegistryID = gid_Starregistry_Services_Rdb - -#define PACKED_UNO_LIB_FILE_BODY_PATCH \ - TXT_FILE_BODY; \ - Styles = (PACKED,UNO_COMPONENT,PATCH); \ - Dir = SCP2_OOO_BIN_DIR; \ - RegistryID = gid_Starregistry_Services_Rdb - -#define STD_UNO_LIB_FILE(id,name) \ - File id \ - Name = LIBNAME(name); \ - PACKED_UNO_LIB_FILE_BODY; \ - End - -#define STD_UNO_LIB_FILE_PATCH(id,name) \ - File id \ - Name = LIBNAME(name); \ - PACKED_UNO_LIB_FILE_BODY_PATCH; \ - End - -#define SPECIAL_UNO_LIB_FILE(id,name) \ - File id \ - Name = SPECIAL_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY; \ - End - -#define SPECIAL_UNO_LIB_FILE_PATCH(id,name) \ - File id \ - Name = SPECIAL_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY_PATCH; \ - End - -#define SPECIAL_UNO_COMPONENT_LIB_FILE(id,name) \ +#define SPECIAL_COMPONENT_LIB_FILE(id,name) \ File id \ Name = SPECIAL_COMPONENT_LIB_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY; \ + PACKED_LIB_FILE_BODY; \ End -#define SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(id,name) \ +#define SPECIAL_COMPONENT_LIB_FILE_PATCH(id,name) \ File id \ Name = SPECIAL_COMPONENT_LIB_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY_PATCH; \ + PACKED_LIB_FILE_BODY_PATCH; \ End #define WINW4WFILTERFILENAME(name) STRING(CONCAT2(name,f32w.dll)) @@ -396,15 +342,6 @@ Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \ End -#define SPECIAL_UNO_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = LIBNAME(name); \ - Dir = SCP2_OOO_BIN_DIR; \ - Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS, UNO_COMPONENT); \ - RegistryID = gid_Starregistry_Services_Rdb; \ - End - // --------------------------------------- #define CONDITIONAL_MODULE_ENTRY(name,modid) \ Module gid_Module_Root_Reg_##name \ diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index 3d209912479c..4c934c429d13 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -48,29 +48,29 @@ File gid_File_Exe_Odbcconfig End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Abp, abp) +STD_LIB_FILE( gid_File_Lib_Abp, abp) STD_RES_FILE( gid_File_Res_Abp, abp) -STD_UNO_LIB_FILE( gid_File_Lib_Dbp, dbp) +STD_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_LIB_FILE( gid_File_Lib_Dbu, dbu ) STD_RES_FILE( gid_File_Res_Dbu, dbu) -STD_UNO_LIB_FILE( gid_File_Lib_Adabasui, adabasui ) +STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui ) STD_RES_FILE( gid_File_Res_Adabasui, adabasui) 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( gid_File_Lib_Rpt, rpt ) +STD_LIB_FILE( gid_File_Lib_Rpt, rpt ) STD_RES_FILE( gid_File_Res_Rpt, rpt) -STD_UNO_LIB_FILE( gid_File_Lib_Rptui, rptui ) +STD_LIB_FILE( gid_File_Lib_Rptui, rptui ) STD_RES_FILE( gid_File_Res_Rptui, rptui) -STD_UNO_LIB_FILE( gid_File_Lib_Rptxml, rptxml ) +STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml ) File gid_File_Help_Sdatabase_Zip Dir = gid_Dir_Help_Isolanguage; diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp index be66b907a25d..951caadf69fb 100644 --- a/scp2/source/binfilter/file_binfilter.scp +++ b/scp2/source/binfilter/file_binfilter.scp @@ -39,7 +39,7 @@ File gid_Starregistry_Legacy_Binfilters_Rdb TXT_FILE_BODY; Name = "legacy_binfilters.rdb"; Dir = gid_Dir_Program; - Styles = (PACKED, STARREGISTRY); + Styles = (PACKED); End @@ -59,8 +59,8 @@ STD_LIB_FILE( 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) -STD_UNO_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter) -STD_UNO_LIB_FILE( gid_File_Lib_Bindet, bindet) +STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter) +STD_LIB_FILE( gid_File_Lib_Bindet, bindet) STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch ) STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx ) diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 7b392f173378..59d7a5aac90e 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -27,7 +27,7 @@ #include "macros.inc" -STD_UNO_LIB_FILE( gid_File_Lib_Solver, solver) +STD_LIB_FILE( gid_File_Lib_Solver, solver) #ifndef SYSTEM_LPSOLVE File gid_File_Lib_Lpsolve @@ -36,7 +36,7 @@ File gid_File_Lib_Lpsolve End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis) +STD_LIB_FILE( gid_File_Lib_Analysis, analysis) File gid_File_Share_Registry_Calc_Xcd TXT_FILE_BODY; @@ -45,17 +45,17 @@ File gid_File_Share_Registry_Calc_Xcd Name = "calc.xcd"; End -STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc) +STD_LIB_FILE( gid_File_Lib_Calc, calc) -STD_UNO_LIB_FILE( gid_File_Lib_Date, date) +STD_LIB_FILE( gid_File_Lib_Date, date) -STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc) +STD_LIB_FILE( gid_File_Lib_Sc, sc) STD_LIB_FILE( gid_File_Lib_Scui, scui) STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) -STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd) +STD_LIB_FILE( gid_File_Lib_Scd, scd) STD_RES_FILE( gid_File_Res_Solver, solver) diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp index 435cef4304f8..2d7af5321f35 100644 --- a/scp2/source/canvas/cairocanvas.scp +++ b/scp2/source/canvas/cairocanvas.scp @@ -29,8 +29,7 @@ File gid_File_Lib_CairoCanvas TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX)); diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp index f095eff9f23e..9788a90c7f3a 100644 --- a/scp2/source/canvas/canvascommons.scp +++ b/scp2/source/canvas/canvascommons.scp @@ -36,5 +36,5 @@ STD_LIB_FILE(gid_File_Lib_Agg, agg) #endif #endif -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno) diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp index febdb8428c8b..e79f711aaacd 100644 --- a/scp2/source/canvas/directxcanvas.scp +++ b/scp2/source/canvas/directxcanvas.scp @@ -29,8 +29,8 @@ #ifdef WNT # ifdef USE_DIRECTX5 -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno) # endif -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno) #endif diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp index 5f69de34fee9..c17301f56d76 100644 --- a/scp2/source/canvas/vclcanvas.scp +++ b/scp2/source/canvas/vclcanvas.scp @@ -27,4 +27,4 @@ #include "macros.inc" -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno) diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 9d10261843d2..d48915072742 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -32,8 +32,6 @@ File gid_File_Lib_GIO Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "ucpgio-ucd.txt"; End #endif @@ -43,8 +41,6 @@ File gid_File_Lib_Gnomevfs Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "ucpgvfs-ucd.txt"; End #endif @@ -63,7 +59,5 @@ File gid_File_Lib_Gconfbe Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "gconfbe1-ucd.txt"; End #endif diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp index 2cd0f53f9e56..be1d35ed84cc 100644 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ b/scp2/source/graphicfilter/file_graphicfilter.scp @@ -34,7 +34,7 @@ File gid_File_Share_Registry_Graphicfilter_Xcd Name = "graphicfilter.xcd"; End -STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash ) +STD_LIB_FILE( gid_File_Lib_Flash, flash ) -STD_UNO_LIB_FILE( gid_File_Lib_Svg, svgfilter ) +STD_LIB_FILE( gid_File_Lib_Svg, svgfilter ) diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index 00dde2ca9162..35f934da962e 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -29,12 +29,12 @@ File gid_File_Lib_Placeware Name = LIBNAME(placeware); - PACKED_UNO_LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; End File gid_File_Lib_Animcore Name = SPECIAL_NAME(animcore); - PACKED_UNO_LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; End File gid_File_Share_Registry_Impress_Xcd diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index 06fbb4bfcc1a..300deca7aa34 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/scp2/source/impress/module_ogltrans.scp @@ -38,8 +38,7 @@ End File gid_File_Lib_OpenGLTransitions TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX)); diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp index d7a902dbf00f..a6d3f3329b25 100644 --- a/scp2/source/javafilter/file_javafilter.scp +++ b/scp2/source/javafilter/file_javafilter.scp @@ -76,6 +76,6 @@ STD_JAR_FILE( gid_File_Jar_Aportisdoc, aportisdoc ) STD_JAR_FILE( gid_File_Jar_Pexcel, pexcel ) STD_JAR_FILE( gid_File_Jar_Pocketword, pocketword ) STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge ) -UNO_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) +STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) #endif diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp index 0e0b3d1b73bb..3d139b797d67 100644 --- a/scp2/source/kde/file_kde.scp +++ b/scp2/source/kde/file_kde.scp @@ -32,8 +32,6 @@ File gid_File_Lib_Kdebe Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "kdebe1-ucd.txt"; End #endif @@ -43,7 +41,5 @@ File gid_File_Lib_Kde4be Styles = (PACKED); Dir = gid_Dir_Program; Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "kde4be1-ucd.txt"; End #endif diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index 4da9f1a23bbc..6ab010baaf31 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -37,9 +37,9 @@ End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Sm , sm) +STD_LIB_FILE( gid_File_Lib_Sm , sm) -STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd) +STD_LIB_FILE( gid_File_Lib_Smd , smd) STD_RES_FILE( gid_File_Res_Sm, sm ) diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index e33eb6fa35c7..2a7ddd376b6f 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -27,7 +27,7 @@ #include "macros.inc" -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno ) File gid_File_Share_Registry_Onlineupdate_Xcd TXT_FILE_BODY; diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 5ed8c9739f9c..7c306e19f427 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -86,6 +86,7 @@ Module gid_Module_Root_Brand gid_Brand_File_Msvcm80crt_Manifest, gid_Brand_File_Lib_Npsoplugin, gid_Brand_File_Lib_Subscrib_C05, + gid_Brand_File_ServicesRdb, gid_Brand_File_Share_Registry_Brand_Xcd, gid_Brand_File_Share_Registry_O5oo_Xcd, gid_Brand_File_Script_Unopkg, @@ -1294,7 +1295,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services ProfileID = gid_Brand_Profile_Fundamental_Ini; Section = "Bootstrap"; Key = "URE_MORE_SERVICES"; - Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_SERVICES}"; + Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_SERVICES} $ORIGIN/services.rdb"; End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp index 224d26de6a0d..cd6cfe715d64 100644 --- a/scp2/source/ooo/file_improvement.scp +++ b/scp2/source/ooo/file_improvement.scp @@ -37,5 +37,5 @@ End #endif #if defined(BUILD_SPECIAL) -STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement) +STD_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 0d50e685d449..cacfb19cad6b 100644..100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -35,19 +35,18 @@ File gid_File_Lib_Accessbridge End #endif #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) ) -STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas) +STD_LIB_FILE( gid_File_Lib_Adabas, adabas) #endif #if defined(WNT) -STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado) +STD_LIB_FILE( gid_File_Lib_Ado, ado) #endif -STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl) +STD_LIB_FILE( gid_File_Lib_Basctl, basctl) File gid_File_Lib_Basprov TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -59,8 +58,7 @@ End #ifdef ENABLE_VBA File gid_File_Lib_Vbaevent TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -70,12 +68,11 @@ File gid_File_Lib_Vbaevent End #endif // ENABLE_VBA -STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib) +STD_LIB_FILE( gid_File_Lib_Bib , bib) File gid_File_Lib_Cached1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libcached1,UNXSUFFIX)); @@ -84,13 +81,12 @@ File gid_File_Lib_Cached1 #endif End -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno) #ifdef WITH_LDAP File gid_File_Lib_Ldapbe2 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(ldapbe2.uno,UNXSUFFIX)); @@ -100,10 +96,10 @@ File gid_File_Lib_Ldapbe2 End #endif -STD_UNO_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller) -STD_UNO_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel) -STD_UNO_LIB_FILE(gid_File_Lib_Charttools, charttools) -STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview) +STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller) +STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel) +STD_LIB_FILE(gid_File_Lib_Charttools, charttools) +STD_LIB_FILE(gid_File_Lib_Chartview, chartview) #if defined WNT && defined _MSC @@ -157,7 +153,7 @@ End #if ! defined WNT // no longer supported on Windows -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno ) #endif @@ -169,11 +165,10 @@ File gid_File_Lib_Comphelper2 Name = STRING(CONCAT3(comphelp4,COMID,.dll)); #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End -STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl) +STD_LIB_FILE( gid_File_Lib_Ctl , ctl) STD_LIB_FILE( gid_File_Lib_Cui, cui) @@ -235,15 +230,15 @@ End #endif #endif -STD_UNO_LIB_FILE( gid_File_Lib_Dba, dba) +STD_LIB_FILE( gid_File_Lib_Dba, dba) -STD_UNO_LIB_FILE( gid_File_Lib_Sdbt, sdbt) +STD_LIB_FILE( gid_File_Lib_Sdbt, sdbt) -STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm) +STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm) -STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg) +STD_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg) -STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase ) +STD_LIB_FILE( gid_File_Lib_Dbase2, dbase ) STD_LIB_FILE( gid_File_Lib_Dbfile , file) STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase) @@ -251,8 +246,7 @@ STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase) File gid_File_Lib_Dbpool TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX)); @@ -261,9 +255,9 @@ File gid_File_Lib_Dbpool #endif End -STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools ) +STD_LIB_FILE( gid_File_Lib_Dbt, dbtools ) -STD_UNO_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml ) +STD_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml ) File gid_File_Lib_Dict_Ja TXT_FILE_BODY; @@ -322,8 +316,7 @@ End File gid_File_Lib_Dlgprov TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -334,8 +327,7 @@ End File gid_File_Lib_Stringresource TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -349,8 +341,7 @@ End File gid_File_Lib_Vbaobj TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(libvbaobj,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -361,8 +352,7 @@ End File gid_File_Lib_Vbaswobj TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -373,8 +363,7 @@ End File gid_File_Lib_Vbamsforms TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -387,7 +376,6 @@ End File gid_File_Lib_Vbahelper TXT_FILE_BODY; Styles = (PACKED); - RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX)); @@ -402,8 +390,7 @@ End File gid_File_Lib_Dnd TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "dnd.dll"; End @@ -416,23 +403,22 @@ File gid_File_Lib_Dtrans TXT_FILE_BODY; Name = "dtrans.dll"; Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED, UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End #endif STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer) -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj) +SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj) #ifndef DISABLE_ATL -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) +SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif #if defined(WNT) && !defined(DISABLE_ATL) -STD_UNO_LIB_FILE( gid_File_Lib_Emser, emser ) +STD_LIB_FILE( gid_File_Lib_Emser, emser ) File gid_File_Lib_Inprocserv TXT_FILE_BODY; @@ -448,8 +434,7 @@ End #ifdef ENABLE_KAB File gid_File_Lib_Kab_1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(libkab1,UNXSUFFIX)); End @@ -466,8 +451,7 @@ End #ifdef MACOSX File gid_File_Lib_Macab_1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(libmacab1,UNXSUFFIX)); End @@ -483,7 +467,7 @@ End #ifdef ENABLE_EVOAB2 -STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab) +STD_LIB_FILE( gid_File_Lib_Evoab , evoab) #endif // #ifdef ENABLE_EVOAB2 @@ -491,8 +475,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab) File gid_File_Lib_Evtatt TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libevtatt,UNXSUFFIX)); @@ -501,24 +484,22 @@ File gid_File_Lib_Evtatt #endif End -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc) +SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc) File gid_File_Lib_Filterconfig1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; Name = SPECIAL_NAME(filterconfig1); End -STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat) +STD_LIB_FILE( gid_File_Lib_Flat, flat) #ifdef WNT File gid_File_Lib_Fop TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "fop.dll"; End @@ -529,8 +510,7 @@ End File gid_File_Lib_Fps TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "fps.dll"; End @@ -544,8 +524,6 @@ File gid_File_Lib_Desktopbe Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "desktopbe1-ucd.txt"; End #ifdef ENABLE_GTK @@ -553,10 +531,8 @@ End File gid_File_Lib_Fps_Gnome TXT_FILE_BODY; Styles = (PACKED); - RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; Name = SPECIAL_COMPONENT_LIB_NAME(fps_gnome.uno); - Regmergefile = "fps-gnome-ucd.txt"; End #endif #endif @@ -564,11 +540,9 @@ End #ifndef MACOSX File gid_File_Lib_Fps_Kde4 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = gid_Dir_Program; Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno); - Regmergefile = "fps-kde4-ucd.txt"; End #endif #endif @@ -579,32 +553,28 @@ End File gid_File_Lib_Fps_Aqua TXT_FILE_BODY; Styles = (PACKED); - RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno); - Regmergefile = "fps-aqua-ucd.txt"; End File gid_File_Lib_MacOSXSpell TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Name = LIBNAME(MacOSXSpell); Dir = SCP2_OOO_BIN_DIR; End File gid_File_Lib_avmediaQuickTime TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Name = LIBNAME(avmediaQuickTime); Dir = SCP2_OOO_BIN_DIR; End #endif #endif -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) #if (defined(ENABLE_CAIRO) && ! defined (SYSTEM_CAIRO)) @@ -630,16 +600,15 @@ End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Frm , frm) +STD_LIB_FILE( gid_File_Lib_Frm , frm) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno ) #ifdef WNT File gid_File_Lib_Ftransl TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "ftransl.dll"; End @@ -653,14 +622,13 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi) File gid_File_Lib_Fwk Name = LIBNAME(fwk); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; End -STD_UNO_LIB_FILE( gid_File_Lib_Fwl , fwl) +STD_LIB_FILE( gid_File_Lib_Fwl , fwl) -STD_UNO_LIB_FILE( gid_File_Lib_Fwm , fwm) +STD_LIB_FILE( gid_File_Lib_Fwm , fwm) #ifdef WNT File gid_File_Lib_Gdiplus @@ -671,14 +639,13 @@ File gid_File_Lib_Gdiplus End #endif -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno ) STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker) File gid_File_Lib_I18npool TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX)); @@ -700,8 +667,7 @@ End File gid_File_Lib_I18nsearch TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX)); @@ -782,15 +748,14 @@ End #ifdef SOLAR_JAVA -STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc) +STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc) #endif #ifdef SOLAR_JAVA File gid_File_Lib_Hsqldb_2 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libhsqldb,UNXSUFFIX)); @@ -856,7 +821,7 @@ End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng) +STD_LIB_FILE( gid_File_Lib_Lng, lng) File gid_File_Lib_Localedata_En TXT_FILE_BODY; @@ -904,8 +869,7 @@ End File gid_File_Lib_Mcnttype TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX)); @@ -916,15 +880,14 @@ End #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX) // #i91209# -STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab) +STD_LIB_FILE(gid_File_Lib_Mozab,mozab) STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv) #else File gid_File_Lib_Mozbootstrap TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX)); @@ -935,11 +898,11 @@ End #endif -STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft) +STD_LIB_FILE(gid_File_Lib_Wpft,wpft) -STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter) +STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter) -STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter) +STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter) #ifdef WNT #if defined(_gcc3) @@ -1048,12 +1011,12 @@ End #endif #endif -STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql) -STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc) +STD_LIB_FILE(gid_File_Lib_Mysql,mysql) +STD_LIB_FILE(gid_File_Lib_Odbc,odbc) // STD_LIB_FILE( gid_File_Lib_Ofa , ofa) -STD_UNO_LIB_FILE( gid_File_Lib_Offacc, offacc) +STD_LIB_FILE( gid_File_Lib_Offacc, offacc) #ifdef SOLAR_JAVA #ifndef MACOSX @@ -1076,23 +1039,22 @@ End File gid_File_Lib_Ole TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "oleautobridge.uno.dll"; End #endif -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Package2,package2) +SPECIAL_LIB_FILE(gid_File_Lib_Package2,package2) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno ) -STD_UNO_LIB_FILE( gid_File_Lib_Pcr, pcr) +STD_LIB_FILE( gid_File_Lib_Pcr, pcr) -STD_UNO_LIB_FILE( gid_File_Lib_Log, log) +STD_LIB_FILE( gid_File_Lib_Log, log) -STD_UNO_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter) +STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter) File gid_File_Lib_Deployment #if defined UNX @@ -1100,7 +1062,7 @@ File gid_File_Lib_Deployment #else Name = STRING(CONCAT3(deployment,DLLPOSTFIX,.uno.dll)); #endif - PACKED_UNO_LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; End File gid_File_Lib_DeploymentGui @@ -1109,18 +1071,18 @@ File gid_File_Lib_DeploymentGui #else Name = STRING(CONCAT3(deploymentgui,DLLPOSTFIX,.uno.dll)); #endif - PACKED_UNO_LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; End STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) #ifndef WITHOUT_MOZILLA -STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl) +STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif -STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload) +STD_LIB_FILE( gid_File_Lib_Preload, preload) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno ) #if defined(UNX) && ! defined(QUARTZ) File gid_File_Lib_Desktop_Detector @@ -1238,15 +1200,13 @@ End File gid_File_Lib_Res Name = LIBNAME(res); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; End File gid_File_Lib_Sax_Uno TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED,DONT_OVERWRITE); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(sax.uno,UNXSUFFIX)); @@ -1257,8 +1217,7 @@ End File gid_File_Lib_Fastsax_Uno TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED,DONT_OVERWRITE); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX)); @@ -1269,11 +1228,11 @@ End STD_LIB_FILE( gid_File_Lib_Sax , sax) -STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox) +STD_LIB_FILE( gid_File_Lib_Oox , oox) -STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb) +STD_LIB_FILE( gid_File_Lib_Sb , sb) -STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn) +STD_LIB_FILE( gid_File_Lib_Scn, scn) File gid_File_Lib_Scriptframe TXT_FILE_BODY; @@ -1286,18 +1245,16 @@ File gid_File_Lib_Scriptframe #else Name = "scriptframe.dll"; #endif - RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); End -STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd) +STD_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); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX)); @@ -1308,8 +1265,7 @@ End File gid_File_Lib_Sdbc_2 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX)); @@ -1318,16 +1274,15 @@ File gid_File_Lib_Sdbc_2 #endif End -STD_UNO_LIB_FILE( gid_File_Lib_Sdd , sdd) +STD_LIB_FILE( gid_File_Lib_Sdd , sdd) -STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler ) +STD_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); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; End #ifdef WNT @@ -1345,15 +1300,14 @@ End File gid_File_Lib_Smplmail TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "smplmail.uno.dll"; End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot ) +STD_LIB_FILE( gid_File_Lib_Sot, sot ) #if defined(UNX) && !defined(QUARTZ) @@ -1368,29 +1322,28 @@ End File gid_File_Lib_Spell TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Name = LIBNAME(spell); Dir = SCP2_OOO_BIN_DIR; End -STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl) +STD_LIB_FILE( gid_File_Lib_Spl, spl) -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) +SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) STD_LIB_FILE( gid_File_Lib_Sts , sts) -STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl ) -STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt ) +STD_LIB_FILE( gid_File_Lib_Svl, svl ) +STD_LIB_FILE( gid_File_Lib_Svtools, svt ) -STD_UNO_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) -STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx) -STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) +STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) +STD_LIB_FILE( gid_File_Lib_Svx, svx) +STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) STD_LIB_FILE( gid_File_Lib_Editeng, editeng) STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter) -STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw) +STD_LIB_FILE( gid_File_Lib_Sw , sw) STD_LIB_FILE( gid_File_Lib_Swui, swui) STD_LIB_FILE( gid_File_Lib_Msword, msword ) @@ -1398,33 +1351,31 @@ STD_LIB_FILE( gid_File_Lib_Msword, msword ) #if ! defined UNX File gid_File_Lib_Sysdtrans TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "sysdtrans.dll"; End #endif -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno ) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno ) #ifdef WNT -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno ) #endif #ifdef MACOSX -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno ) #endif -STD_UNO_LIB_FILE( gid_File_Lib_Tk, tk ) +STD_LIB_FILE( gid_File_Lib_Tk, tk ) STD_LIB_FILE( gid_File_Lib_Acc, acc ) STD_LIB_FILE( gid_File_Lib_Tools, tl ) File gid_File_Lib_Tvhlp1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX)); @@ -1435,8 +1386,7 @@ End File gid_File_Lib_Ucb1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libucb1,UNXSUFFIX)); @@ -1464,59 +1414,55 @@ File gid_File_Lib_Ucpchelp1 Name = "ucpchelp1.dll"; #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED, UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End #ifndef DISABLE_NEON -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) +SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) #ifndef SYSTEM_NEON SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) #endif #endif -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1) +SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1) -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1) +SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1) -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1) +SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1) -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1) +SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) File gid_File_Lib_Lnth TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Name = LIBNAME(lnth); Dir = SCP2_OOO_BIN_DIR; End File gid_File_Lib_Hyph TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Name = LIBNAME(hyphen); Dir = SCP2_OOO_BIN_DIR; End -STD_UNO_LIB_FILE( gid_File_Lib_Utl , utl) +STD_LIB_FILE( gid_File_Lib_Utl , utl) -STD_UNO_LIB_FILE( gid_File_Lib_Uui, uui ) +STD_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); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; End File gid_File_Lib_Vos @@ -1530,30 +1476,27 @@ File gid_File_Lib_Vos Styles = (PACKED); End -// STD_UNO_LIB_FILE( gid_File_Lib_Wrp, wrp) - -STD_UNO_LIB_FILE( gid_File_Lib_Xcr, xcr) -STD_UNO_LIB_FILE( gid_File_Lib_Xmx , xmx) -STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof) +STD_LIB_FILE( gid_File_Lib_Xcr, xcr) +STD_LIB_FILE( gid_File_Lib_Xmx , xmx) +STD_LIB_FILE( gid_File_Lib_Xof , xof) File gid_File_Lib_Xo Name = LIBNAME(xo); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; End -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Xstor,xstor) +SPECIAL_LIB_FILE(gid_File_Lib_Xstor,xstor) -STD_UNO_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg ) -STD_UNO_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter ) -STD_UNO_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa ) -STD_UNO_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd ) +STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg ) +STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter ) +STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa ) +STD_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd ) #ifdef SOLAR_JAVA -UNO_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter ) -UNO_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate ) +STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter ) +STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate ) #endif #ifndef SYSTEM_LIBXSLT @@ -1578,21 +1521,21 @@ End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml ) +STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml ) // AVMedia -STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia ) +STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia ) #if defined UNX #if defined ENABLE_GSTREAMER -SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst ) +SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst ) #endif #ifdef SOLAR_JAVA -UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia ) +STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia ) #endif #elif defined WNT #ifdef ENABLE_DIRECTX -SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin ) +SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin ) #endif #endif @@ -1605,8 +1548,7 @@ File gid_File_Lib_XSec_Framework Name = "xsec_fw.dll"; #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End File gid_File_Lib_XSec_XmlSec @@ -1617,8 +1559,7 @@ File gid_File_Lib_XSec_XmlSec Name = "xsec_xmlsec.dll"; #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End File gid_File_Lib_XSec_XMLSecurity @@ -1629,8 +1570,7 @@ File gid_File_Lib_XSec_XMLSecurity Name = "xmlsecurity.dll"; #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End #ifdef WNT @@ -1662,8 +1602,7 @@ End File gid_File_Lib_Migrationoo2 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(migrationoo2.uno,UNXSUFFIX)); @@ -1685,11 +1624,11 @@ File gid_File_Lib_Libtextcat End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang ) +STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang ) -STD_UNO_LIB_FILE( gid_File_Lib_Updchkui , updchk ) +STD_LIB_FILE( gid_File_Lib_Updchkui , updchk ) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno ) #ifdef WNT File gid_File_Lib_Onlinecheck @@ -1737,7 +1676,7 @@ File gid_File_Lib_Unopkgapp Styles = (PACKED); End -STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore) +STD_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) @@ -1816,8 +1755,8 @@ File gid_File_Lib_Rdf End #endif // SYSTEM_REDLAND -STD_UNO_LIB_FILE(gid_File_Lib_Unordf, unordf) +STD_LIB_FILE(gid_File_Lib_Unordf, unordf) -STD_UNO_LIB_FILE( gid_File_Lib_For, for) +STD_LIB_FILE( gid_File_Lib_For, for) STD_LIB_FILE( gid_File_Lib_Forui, forui) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index ed8c67d5e736..972c371ce489 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -417,14 +417,13 @@ File gid_File_Help_Schart_Zip EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart); End -#if defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT +#if defined WNT File gid_File_Jar_Accessbridge TXT_FILE_BODY; Name = "java_uno_accessbridge.jar"; - RegistryID = gid_Starregistry_Services_Rdb; Dir = gid_Dir_Classes; - Styles = (PACKED,DONT_OVERWRITE,UNO_COMPONENT); + Styles = (PACKED,DONT_OVERWRITE); End #endif @@ -443,7 +442,7 @@ STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 ) #endif #ifdef SOLAR_JAVA -UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper ) +STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper ) #endif #ifdef SOLAR_JAVA @@ -467,14 +466,14 @@ End #ifdef SOLAR_JAVA -UNO_JAR_FILE( gid_File_Jar_Report, report ) -UNO_JAR_FILE( gid_File_Jar_Table, table ) -UNO_JAR_FILE( gid_File_Jar_Letter, letter ) -UNO_JAR_FILE( gid_File_Jar_Form, form ) -UNO_JAR_FILE( gid_File_Jar_Fax, fax ) -UNO_JAR_FILE( gid_File_Jar_Agenda, agenda ) -UNO_JAR_FILE( gid_File_Jar_Query, query ) -UNO_JAR_FILE( gid_File_Jar_Web, web ) +STD_JAR_FILE( gid_File_Jar_Report, report ) +STD_JAR_FILE( gid_File_Jar_Table, table ) +STD_JAR_FILE( gid_File_Jar_Letter, letter ) +STD_JAR_FILE( gid_File_Jar_Form, form ) +STD_JAR_FILE( gid_File_Jar_Fax, fax ) +STD_JAR_FILE( gid_File_Jar_Agenda, agenda ) +STD_JAR_FILE( gid_File_Jar_Query, query ) +STD_JAR_FILE( gid_File_Jar_Web, web ) #endif #ifdef SOLAR_JAVA @@ -494,10 +493,10 @@ End #endif #ifdef SOLAR_JAVA -UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework ) -UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) -UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava ) -UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript ) +STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework ) +STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) +STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava ) +STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript ) #endif #ifdef SOLAR_JAVA @@ -1680,13 +1679,7 @@ File gid_Starregistry_Services_Rdb TXT_FILE_BODY; Name = "services.rdb"; Dir = gid_Dir_Program; - Styles = (PACKED, STARREGISTRY); -#if defined WNT - NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/"; -#else - NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/"; -#endif - JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/"; + Styles = (PACKED); End #ifdef LINUX @@ -1799,9 +1792,8 @@ End File gid_File_Jar_Productregistration TXT_FILE_BODY; Name = "productregistration.jar"; - RegistryID = gid_Starregistry_Services_Rdb; Dir = gid_Dir_Classes; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); End #endif diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index cf5751ba45e6..5f2e2795eaad 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -49,9 +49,6 @@ SCPDEFS+=-DBUILD_SPECIAL SCPDEFS+=-DBUILD_X64 .ENDIF - -SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE - .IF "$(PROF_EDITION)"!="" SCPDEFS+=-DPROF_EDITION .ENDIF diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp index 3cd20ef97142..4d78d3efb606 100644 --- a/scp2/source/ooo/ooo_brand.scp +++ b/scp2/source/ooo/ooo_brand.scp @@ -39,6 +39,13 @@ Directory gid_Dir_Brand_Root End #endif +File gid_Brand_File_ServicesRdb + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Program; + Name = "/ooo/services.rdb"; + Styles = (PACKED); +End + ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server ProfileID = gid_Brand_Profile_Bootstrap_Ini; ModuleID = gid_Module_Root_Brand; diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 9aeaf32c5bcb..804f0edad0b2 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -312,6 +312,13 @@ File gid_File_Dl_Store // CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066"; End +File gid_File_Dl_Xmlreader + TXT_FILE_BODY; + Dir = SCP2_URE_DL_DIR; + Name = SCP2_URE_DL_NORMAL("xmlreader"); + Styles = (PACKED); +End + File gid_File_Dl_Jvmaccess TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -667,8 +674,7 @@ File gid_File_Dl_Acceptor TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("acceptor.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "31183C51-C9A4-4D7A-A2F4-103252E1FEB0"; End @@ -676,8 +682,7 @@ File gid_File_Dl_Bootstrap TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("bootstrap.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "2620B307-25DB-498F-B2B8-46D928165331"; End @@ -685,8 +690,7 @@ File gid_File_Dl_Bridgefac TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("bridgefac.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "E025163F-FE1E-4E8C-B0E5-49C08924A646"; End @@ -694,8 +698,7 @@ File gid_File_Dl_Connector TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("connector.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "EBCE77E7-E244-40F6-96E2-5319D6571C5D"; End @@ -703,8 +706,7 @@ File gid_File_Dl_Introspection TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("introspection.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "E99960CF-FE59-4332-A2AC-47418C3A17C1"; End @@ -712,8 +714,7 @@ File gid_File_Dl_Invocadapt TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("invocadapt.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "77DDC112-1994-49D5-A086-FB16D4328AB9"; End @@ -721,8 +722,7 @@ File gid_File_Dl_Invocation TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("invocation.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "A79ACB80-DA65-47CA-81BA-7CD9E191C84C"; End @@ -732,8 +732,7 @@ File gid_File_Dl_Javaloader TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("javaloader.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "19A20968-E654-4E2C-9F58-7B66F07CA346"; End #endif @@ -743,8 +742,7 @@ File gid_File_Dl_Javavm TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("javavm.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "F1266B2B-80AD-4248-A921-9161759FA4DA"; End #endif @@ -753,8 +751,7 @@ File gid_File_Dl_Namingservice TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("namingservice.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "DD22BE3A-AD21-447D-B3A3-89B0FCDB0B31"; End @@ -762,8 +759,7 @@ File gid_File_Dl_Stocservices TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("stocservices.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "EBF6BBDE-EC50-4FB8-A0D4-BEC58F1C8C07"; End @@ -771,8 +767,7 @@ File gid_File_Dl_Proxyfac TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("proxyfac.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "A2CDDEC3-B9C7-48C9-AB35-65008777BC2F"; End @@ -780,8 +775,7 @@ File gid_File_Dl_Reflection TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("reflection.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "601C7946-CFEB-4F56-9429-6D5963188DF3"; End @@ -789,8 +783,7 @@ File gid_File_Dl_Remotebridge TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("remotebridge.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "B440B28E-B7AD-40C7-89E1-1508CA798347"; End @@ -798,8 +791,7 @@ File gid_File_Dl_Streams TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("streams.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "6028CF43-A9B7-40A8-8216-509CAB256A2B"; End @@ -807,8 +799,7 @@ File gid_File_Dl_Textinstream TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("textinstream.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "DAA39D01-D9C5-40C4-94EC-9E4B2F94EABA"; End @@ -816,8 +807,7 @@ File gid_File_Dl_Textoutstream TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("textoutstream.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "DD01EB0C-A119-43AE-9100-F7A595D099E4"; End @@ -825,8 +815,7 @@ File gid_File_Dl_Uuresolver TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("uuresolver.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "377090E1-5008-424F-B0F6-A9EFC9F11206"; End @@ -1018,8 +1007,7 @@ File gid_File_Java_JuhJar TXT_FILE_BODY; Dir = gid_Dir_Ure_Java; Name = "juh.jar"; - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "E77CC8B5-0345-4B7F-ABED-5EB9DC94E492"; End #endif @@ -1066,6 +1054,13 @@ File gid_File_Misc_TypesRdb // CompID = "E5086F6A-855B-4CAE-AD3A-A85A21C5AE44"; End +File gid_File_Misc_ServicesRdb + TXT_FILE_BODY; + Dir = gid_Dir_Ure_Misc; + Name = "/ure/services.rdb"; + Styles = (PACKED); +End + // Private Miscellaneous Files: #if defined SOLAR_JAVA @@ -1078,18 +1073,6 @@ File gid_File_Misc_JavavendorsXml End #endif -// StarRegistry File - -File gid_Starregistry_Services_Rdb_Ure - TXT_FILE_BODY; - Name = "services.rdb"; - Dir = gid_Dir_Ure_Misc; - Styles = (PACKED, STARREGISTRY, VERSION_INDEPENDENT_COMP_ID); - NativeServicesURLPrefix = "vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/"; - JavaServicesURLPrefix = "vnd.sun.star.expand:$URE_INTERNAL_JAVA_DIR/"; - // CompID = "F4BD7B0A-5A20-4167-9D10-18597C5F85AF"; -End - #if defined MACOSX Unixlink gid_Unixlink_Ure_Bin_Urelibs Dir = gid_Dir_Ure_Bin; @@ -1150,6 +1133,7 @@ Module gid_Module_Root_Ure_Hidden gid_File_Dl_Reg, gid_File_Dl_Rmcxt, gid_File_Dl_Store, + gid_File_Dl_Xmlreader, gid_File_Dl_Jvmaccess, gid_File_Dl_Jvmfwk, gid_File_Dl_Sunjavaplugin, @@ -1204,8 +1188,8 @@ Module gid_Module_Root_Ure_Hidden gid_File_Java_RidlJar, gid_File_Java_JavaUnoJar, gid_File_Misc_TypesRdb, - gid_File_Misc_JavavendorsXml, - gid_Starregistry_Services_Rdb_Ure); + gid_File_Misc_ServicesRdb, + gid_File_Misc_JavavendorsXml); Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs); End diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 5cd84d82b3e9..c99a93407e87 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -46,9 +46,7 @@ File gid_File_Lib_Pythonloader #else Name = "pythonloader.uno.dll"; #endif - RegistryID = gid_Starregistry_Services_Rdb; - NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/"; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); End File gid_File_Py_Unohelper @@ -110,8 +108,7 @@ File gid_File_Py_Pythonscript TXT_FILE_BODY; Dir = gid_Dir_Program; Name = "pythonscript.py"; - RegistryID = gid_Starregistry_Services_Rdb; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); End //Scripting Framework Python example scripts diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp index 00a5c30a122c..15177971ba1a 100644 --- a/scp2/source/python/module_python_mailmerge.scp +++ b/scp2/source/python/module_python_mailmerge.scp @@ -31,6 +31,5 @@ File gid_File_Pymailmerge TXT_FILE_BODY; Dir = gid_Dir_Program; Name = "mailmerge.py"; - RegistryID = gid_Starregistry_Services_Rdb; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); End diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index 3d7c22b9e7a9..e3f6c532fc0c 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -27,19 +27,9 @@ #include "macros.inc" -STD_UNO_LIB_FILE( gid_File_Lib_Swd , swd) +STD_LIB_FILE( gid_File_Lib_Swd , swd) -File gid_File_Lib_Hwpreader - TXT_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT2(libhwp,UNXSUFFIX)); - #else - Name = "hwp.dll"; - #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED, UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; -End +SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp) File gid_File_Exe_Swriter BIN_FILE_BODY; |