fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO

Conflicts:
Repository.mk

Change-Id: I1553317afe8df9877a41b1d4087c96d861ed1377

2 files changed, 0 insertions, 160 deletions

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a16c0ab853ec..8e57fb719781 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -125,72 +125,6 @@ End
 
 #endif
 
-File gid_File_Lib_Dbpool
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
-  #else
-    Name = "dbpool2.dll";
-  #endif
-End
-
-File gid_File_Lib_Dict_Ja
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libdict_ja,UNXSUFFIX));
-  #else
-    Name = "dict_ja.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Dict_Zh
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libdict_zh,UNXSUFFIX));
-  #else
-    Name = "dict_zh.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Collator_Data
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libcollator_data,UNXSUFFIX));
-  #else
-    Name = "collator_data.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Index_Data
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libindex_data,UNXSUFFIX));
-  #else
-    Name = "index_data.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Textconv_Dict
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libtextconv_dict,UNXSUFFIX));
-  #else
-    Name = "textconv_dict.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
 #ifdef WNT
 
 File gid_File_Lib_Dnd
@@ -213,8 +147,6 @@ End
 
 #endif
 
-SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
-
 /* fdo#60491 always need emboleobj library on non-WNT platforms */
 #if !defined(WNT) || !defined(DISABLE_ATL)
 SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
@@ -497,8 +429,6 @@ End
 STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
 #endif
 
-SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
-
 #if defined ENABLE_NPAPI_FROM_BROWSER
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
@@ -631,8 +561,6 @@ End
 STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
 #endif
 
-SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
-
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
     LIB_FILE_BODY;
@@ -651,17 +579,6 @@ STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 )
 STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 )
 #endif
 
-File gid_File_Lib_Ucpchelp1
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
-  #else
-    Name = "ucpchelp1.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
 #ifndef DISABLE_NEON
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
  #ifndef SYSTEM_NEON
@@ -701,20 +618,6 @@ End
 
 #endif
 
-SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
-
-SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
-
-SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
-
-STD_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1)
-
-STD_LIB_FILE(gid_File_Ucpext, ucpext)
-
-STD_LIB_FILE(gid_File_Ucpcmis, ucpcmis1)
-
-STD_LIB_FILE( gid_File_Lib_Textfd, textfd )
-
 #ifndef SYSTEM_LIBXSLT
 File gid_File_Lib_Xslt
     LIB_FILE_BODY;
@@ -754,40 +657,12 @@ File gid_File_Lib_eXslt
 End
 #endif
 
-#if defined ENABLE_GSTREAMER
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer, avmediagst )
-#endif
-#if defined ENABLE_GSTREAMER_0_10
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer_0_10, avmediagst_0_10 )
-#endif
 #if defined WNT
 #ifdef ENABLE_DIRECTX
 SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #endif
 #endif
 
-File gid_File_Lib_XSec_XMLSecurity
-    LIB_FILE_BODY;
-	#ifdef UNX
-        Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
-    #else
-        Name = "xmlsecurity.dll";
-    #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_XSec_Framework
-    LIB_FILE_BODY;
-	#ifdef UNX
-        Name = STRING(CONCAT2(libxsec_fw,UNXSUFFIX));
-    #else
-        Name = "xsec_fw.dll";
-    #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
 #ifdef WNT
 File gid_File_Lib_LibXMLSec_xmlseccore
     LIB_FILE_BODY;
@@ -825,12 +700,6 @@ End
 #endif
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Migrationoo2, migrationoo2 )
-
-STD_LIB_FILE( gid_File_Lib_Migrationoo3, migrationoo3 )
-
-STD_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed )
-
 #ifndef SYSTEM_OPENSSL
 File gid_File_Lib_Openssl
     LIB_FILE_BODY;
@@ -854,13 +723,6 @@ File gid_File_Lib_Crypto
 End
 #endif
 
-File gid_File_Lib_Unopkgapp
-    LIB_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SCP2_URE_DL_NORMAL("unopkgapp");
-    Styles = (PACKED);
-End
-
 #if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN
         // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
         // gid_Brand_File_Lib_Msvcr80
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 64f7072b4585..59ab1d47f282 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -90,7 +90,6 @@ Module gid_Module_Root_Files_2
 	gid_File_Bin_Uri_Encode,
 	gid_File_Bin_UIPreviewer,
 	gid_File_Exe_Nsplugin,
-        gid_File_Lib_Unopkgapp,
 	gid_File_Txt_Pagein_Common,
 	gid_File_Txt_Pagein_Calc,
 	gid_File_Txt_Pagein_Draw,
@@ -149,8 +148,6 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Pl,
 	gid_File_Lib_Spa,
 	gid_File_Lib_AVMediaWin,
-	gid_File_Lib_AVMediaGStreamer,
-	gid_File_Lib_AVMediaGStreamer_0_10,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_BaseBmp,
 	gid_File_Lib_Zip,
@@ -170,19 +167,12 @@ Module gid_Module_Root_Files_5
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root5,
-	gid_File_Lib_Dict_Ja,
-	gid_File_Lib_Dict_Zh,
-    gid_File_Lib_Collator_Data,
-    gid_File_Lib_Index_Data,
-    gid_File_Lib_Textconv_Dict,
 	gid_File_Lib_Crypto,
 #if ! defined SYSTEM_CLUCENE
         gid_File_Lib_CLucene,
 #endif
 	gid_File_Lib_Curl,
 	gid_Unixlink_File_Lib_Curl,
-	gid_File_Lib_Dbpool,
-	gid_File_Lib_Embobj,
 	gid_File_Lib_Emboleobj,
 	gid_File_Lib_Macab_1,
     gid_File_Lib_Macab_Drv_1,
@@ -195,14 +185,9 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Mozbootstrap,
 	gid_File_Lib_Officebean,
 	gid_File_Lib_Openssl,
-	gid_File_Lib_DeploymentGui,
 	gid_File_Lib_Recentfile,
-	gid_File_Lib_Srtrs1,
 	gid_File_Lib_Tab,
 	gid_File_Lib_Tab2,
-	gid_File_Lib_Migrationoo2,
-	gid_File_Lib_Migrationoo3,
-	gid_File_Ucptdoc1,
 	gid_File_Lib_Raptor,
 	gid_Unixlink_File_Lib_Raptor,
 	gid_File_Lib_Rasqal,
@@ -222,20 +207,14 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Sqlite3,
 	gid_File_Lib_Ssl3,
 	gid_File_Lib_Sndfile,
-	gid_File_Lib_Ucpchelp1,
 	gid_File_Lib_Ucpdav1,
 	gid_File_Lib_Neon,
-	gid_File_Lib_Ucpftp1,
-	gid_File_Lib_Ucphier1,
-	gid_File_Lib_Ucppkg1,
 	gid_File_Lib_Xslt,
 	gid_Unixlink_File_Lib_Xslt,
 	gid_Unixlink_File_Lib_eXslt,
 	gid_File_Lib_LibXMLSec_xmlsecnss,
 	gid_File_Lib_LibXMLSec_xmlseccore,
 	gid_File_Lib_LibXMLSec_xmlsecmscrypto,
-	gid_File_Lib_XSec_XMLSecurity,
-	gid_File_Lib_XSec_Framework,
 	gid_File_Lib_XSec_XmlSec,
 	gid_File_Lib_Cmdmail,
 	gid_File_Lib_I18n,
@@ -257,7 +236,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Smplmail,
 	gid_File_Lib_Wininetbe,
 	gid_File_Lib_Macbe,
-    gid_File_Lib_Updatefeed,
 	gid_File_Lib_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Config);