diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index bbea2d116ffa..07d6ccf8f5cf 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -103,6 +103,7 @@ my_components = \ component/scripting/source/basprov/basprov \ component/scripting/source/dlgprov/dlgprov \ component/scripting/source/protocolhandler/protocolhandler \ + component/scripting/source/pyprov/mailmerge \ component/scripting/source/stringresource/stringresource \ component/scripting/source/vbaevents/vbaevents \ component/scripting/util/scriptframe \ @@ -365,11 +366,9 @@ my_components += evoab my_components += component/avmedia/source/gstreamer/avmediagstreamer .END -my_ooo_components = component/scripting/source/pyprov/mailmerge - .INCLUDE: target.mk -ALLTAR : $(MISC)/services.rdb $(MISC)/ooo-services.rdb +ALLTAR : $(MISC)/services.rdb $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component") @@ -380,14 +379,3 @@ $(MISC)/services.input : makefile.mk echo \ '$(my_components:^"":+".component")' \ > $@ - -$(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ - $(MISC)/ooo-services.input \ - $(my_ooo_components:^"$(SOLARXMLDIR)/":+".component") - $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ - $(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input - -$(MISC)/ooo-services.input : makefile.mk - echo '' \ - '$(my_ooo_components:^"":+".component")' \ - '' > $@ diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst index 603802446552..171e9db91e33 100644 --- a/postprocess/prj/d.lst +++ b/postprocess/prj/d.lst @@ -2,6 +2,4 @@ mkdir: %_DEST%\xml\ooo ..\%__SRC%\bin\uiconfig.zip %_DEST%\bin\uiconfig.zip ..\%__SRC%\misc\*.xcd %_DEST%\xml\ ..\%__SRC%\misc\lang\*.xcd %_DEST%\xml\ -..\%__SRC%\misc\ooo-services.rdb %_DEST%\xml\ooo\services.rdb -..\%__SRC%\misc\services.input %_DEST%\xml\services.input ..\%__SRC%\misc\services.rdb %_DEST%\xml\services.rdb diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp index c1d1b1cb2685..538d1a25e318 100644 --- a/scp2/source/binfilter/file_binfilter.scp +++ b/scp2/source/binfilter/file_binfilter.scp @@ -38,7 +38,7 @@ End File gid_Starregistry_Legacy_Binfilters_Rdb TXT_FILE_BODY; Name = "legacy_binfilters.rdb"; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); End diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index c9aae2b85696..a0270cdcecab 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -86,7 +86,6 @@ 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_O5oo_Xcd, gid_Brand_File_Script_Unopkg, gid_Brand_File_Share_Xdg_Base, @@ -1209,7 +1208,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types ProfileID = gid_Brand_Profile_Fundamental_Ini; Section = "Bootstrap"; Key = "URE_MORE_TYPES"; - Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_TYPES}"; + Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_TYPES}"; End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index b7b329457d89..769eba649080 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -629,14 +629,14 @@ End File gid_File_Rdb_Offapi TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = "offapi.rdb"; End File gid_File_Rdb_TypesVba TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED, OVERWRITE); Name = "oovbaapi.rdb"; End @@ -1142,14 +1142,14 @@ End File gid_Starregistry_Services_Rdb TXT_FILE_BODY; Name = "services.rdb"; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); End #ifdef LINUX File gid_File_Dat_Root3 TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Name = "root3.dat"; Styles = (PACKED); End @@ -1158,7 +1158,7 @@ End #ifdef LINUX File gid_File_Dat_Root4 TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Name = "root4.dat"; Styles = (PACKED); End @@ -1167,7 +1167,7 @@ End #ifdef LINUX File gid_File_Dat_Root5 TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Name = "root5.dat"; Styles = (PACKED); End diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp index 649c6b6f69e8..a4106b6614a5 100644 --- a/scp2/source/ooo/ooo_brand.scp +++ b/scp2/source/ooo/ooo_brand.scp @@ -39,13 +39,6 @@ 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/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index 78b960685163..37d30a1d7784 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -333,7 +333,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types ProfileID = gid_Profile_Fundamentalbasis_Ini; Section = "Bootstrap"; Key = "URE_MORE_TYPES"; - Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}"; + Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}"; End ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services @@ -341,7 +341,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services ProfileID = gid_Profile_Fundamentalbasis_Ini; Section = "Bootstrap"; Key = "URE_MORE_SERVICES"; - Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb"; + Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES}"; End ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types