fdo#60924 scp2: use auto_foo instead of gid_foo_auto_installed

Change-Id: I646c5219d3eb1d09206de93a2b21a6a5b3ac2846

3 files changed, 33 insertions, 33 deletions

diff --git a/scp2/AutoInstallLibs_ooo.mk b/scp2/AutoInstallLibs_ooo.mk
index c3544c24ebba..d65a6fc1f9bc 100644
--- a/scp2/AutoInstallLibs_ooo.mk
+++ b/scp2/AutoInstallLibs_ooo.mk
@@ -7,6 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,STD_LIB_FILE(gid_File_Lib_$$(1)_auto_installed,$$(1))))
+$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,STD_LIB_FILE(auto_File_Lib_$$(1),$$(1))))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 3004622e5dce..188a2f0ae778 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -180,32 +180,32 @@ Module gid_Module_Root_Files_4
 	gid_File_Filter_Ira,
 	gid_File_Filter_Itg,
 	gid_File_Filter_Iti,
-	gid_File_Lib_basctl_auto_installed,
+	auto_File_Lib_basctl,
 	gid_File_Lib_Bib,
-	gid_File_Lib_chartcore_auto_installed,
-	gid_File_Lib_chartcontroller_auto_installed,
-	gid_File_Lib_ctl_auto_installed,
-	gid_File_Lib_cui_auto_installed,
-	gid_File_Lib_sdbt_auto_installed,
-	gid_File_Lib_dbmm_auto_installed,
-	gid_File_Lib_dba_auto_installed,
-	gid_File_Lib_dbase_auto_installed,
-	gid_File_Lib_dbaxml_auto_installed,
-	gid_File_Lib_dbt_auto_installed,
-	gid_File_Lib_file_auto_installed,
-	gid_File_Lib_drawinglayer_auto_installed,
+	auto_File_Lib_chartcore,
+	auto_File_Lib_chartcontroller,
+	auto_File_Lib_ctl,
+	auto_File_Lib_cui,
+	auto_File_Lib_sdbt,
+	auto_File_Lib_dbmm,
+	auto_File_Lib_dba,
+	auto_File_Lib_dbase,
+	auto_File_Lib_dbaxml,
+	auto_File_Lib_dbt,
+	auto_File_Lib_file,
+	auto_File_Lib_drawinglayer,
 	gid_File_Lib_Editeng,
 	gid_File_Lib_Flat,
-	gid_File_Lib_for_auto_installed,
-	gid_File_Lib_forui_auto_installed,
-	gid_File_Lib_frm_auto_installed,
-	gid_File_Lib_fwe_auto_installed,
-	gid_File_Lib_fwi_auto_installed,
+	auto_File_Lib_for,
+	auto_File_Lib_forui,
+	auto_File_Lib_frm,
+	auto_File_Lib_fwe,
+	auto_File_Lib_fwi,
 	gid_File_Lib_Fwk,
-	gid_File_Lib_fwl_auto_installed,
+	auto_File_Lib_fwl,
 	gid_File_Lib_Helplinker,
 	gid_File_Lib_J,
-	gid_File_Lib_lng_auto_installed,
+	auto_File_Lib_lng,
 	gid_File_Lib_Offacc,
 	gid_File_Lib_Oox,
 	gid_File_Lib_Pcr,
@@ -226,12 +226,12 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Svl,
 	gid_File_Lib_Svtools,
 	gid_File_Lib_Svx,
-	gid_File_Lib_avmedia_auto_installed,
+	auto_File_Lib_avmedia,
 	gid_File_Lib_AVMediaWin,
 	gid_File_Lib_AVMediaGStreamer,
 	gid_File_Lib_AVMediaGStreamer_0_10,
 	gid_File_Lib_BaseGfx,
-	gid_File_Lib_merged_auto_installed,
+	auto_File_Lib_merged,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_Sw,
 	gid_File_Lib_TextConversionDlgs,
@@ -256,9 +256,9 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Vclplug_Kde,
 	gid_File_Lib_Vclplug_Kde4,
 	gid_File_Lib_Vclplug_Svp,
-	gid_File_Lib_canvastools_auto_installed,
-	gid_File_Lib_cppcanvas_auto_installed,
-	gid_File_Lib_fwm_auto_installed,
+	auto_File_Lib_canvastools,
+	auto_File_Lib_cppcanvas,
+	auto_File_Lib_fwm,
 	gid_File_Lib_Guesslang);
 End
 
@@ -336,7 +336,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Srtrs1,
 	gid_File_Lib_Tab,
 	gid_File_Lib_Tab2,
-    gid_File_Lib_unoxml_auto_installed,
+    auto_File_Lib_unoxml,
 	gid_File_Lib_Localebe,
 	gid_File_Lib_Migrationoo2,
 	gid_File_Lib_Migrationoo3,
@@ -361,7 +361,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Smime3,
 	gid_File_Lib_Sqlite3,
 	gid_File_Lib_Ssl3,
-    gid_File_Lib_unordf_auto_installed,
+    auto_File_Lib_unordf,
 	gid_File_Lib_Sndfile,
 	gid_File_Lib_Tvhlp1,
 	gid_File_Lib_Ucb1,
@@ -395,7 +395,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Dl,
 	gid_File_Lib_Dnd,
 	gid_File_Lib_Dtrans,
-	gid_File_Lib_emser_auto_installed,
+	auto_File_Lib_emser,
 	gid_File_Lib_Inprocserv,
 	gid_File_Lib_Fps,
 	gid_File_Lib_Ftransl,
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 525f650a12e3..8aafb19a71b6 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -48,11 +48,11 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Lib_Swd,
     gid_File_Lib_Swui,
     gid_File_Lib_Msword,
-    gid_File_Lib_wpftwriter_auto_installed,
-    gid_File_Lib_t602filter_auto_installed,
+    auto_File_Lib_wpftwriter,
+    auto_File_Lib_t602filter,
     gid_File_Lib_Vbaswobj,
-    gid_File_Lib_writerfilter_auto_installed,
-    gid_File_Lib_lwpft_auto_installed,
+    auto_File_Lib_writerfilter,
+    auto_File_Lib_lwpft,
     gid_File_Jar_Email, 
     gid_File_Jar_Mail, 
     gid_File_Jar_Activation,