diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-03-21 10:03:06 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-21 11:23:02 +0000 |
commit | 1d81ca98f8d10431ea69eef71d8f633c27648743 (patch) | |
tree | a54ab72c2e41bc255b9526ddcae98ed33fa12447 /scp2 | |
parent | f6cd982a68528ac1bfd130080cea3f96e6cc7edd (diff) |
move remaining padmin dialogs into vcl
and so padmin is no more
Change-Id: I554cefa8b38581daad8a78bafa167448b0a0ef61
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 10 | ||||
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 6 | ||||
-rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 6 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 3 | ||||
-rw-r--r-- | scp2/source/ooo/module_lang_template.scp | 3 |
5 files changed, 0 insertions, 28 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index e731d8f9dae9..323289d5ba5c 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -56,7 +56,6 @@ Module gid_Module_Root_Brand gid_Brand_File_Bin_Soffice, gid_Brand_File_Bin_Soffice_Bin, gid_Brand_File_Bin_Soffice_Bin_Manifest, - gid_Brand_File_Bin_Spadmin, gid_Brand_File_Bin_Unoinfo, gid_Brand_File_Bin_Unopkgcom, gid_Brand_File_Bin_Unopkgexe, @@ -525,15 +524,6 @@ End #endif -#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) -File gid_Brand_File_Bin_Spadmin - BIN_FILE_BODY; - Dir = FILELIST_DIR; - Name = "padmin.filelist"; - Styles = (PACKED, FILELIST); -End -#endif - #ifndef MACOSX File gid_Brand_File_Bin_Soffice_Bin BIN_FILE_BODY; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a88907cb6bb4..ac0e199eee7d 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -564,9 +564,6 @@ UI_FILELIST(sfx, "UIConfig/sfx.filelist") UI_FILELIST(sglobal, "UIConfig/modules/sglobal.filelist") UI_FILELIST(simpress, "UIConfig/modules/simpress.filelist") UI_FILELIST(smath, "UIConfig/modules/smath.filelist") -#ifdef GUIBASE_UNX -UI_FILELIST(spa, "UIConfig/spa.filelist") -#endif UI_FILELIST(startmodule, "UIConfig/modules/StartModule.filelist") UI_FILELIST(svt, "UIConfig/svt.filelist") UI_FILELIST(svx, "UIConfig/svx.filelist") @@ -595,9 +592,6 @@ UI_FILELIST_ALL_LANG(sdraw, modules/sdraw) UI_FILELIST_ALL_LANG(sfx, sfx) UI_FILELIST_ALL_LANG(simpress, modules/simpress) UI_FILELIST_ALL_LANG(smath, modules/smath) -#ifdef GUIBASE_UNX -UI_FILELIST_ALL_LANG(spa, spa) -#endif UI_FILELIST_ALL_LANG(svt, svt) UI_FILELIST_ALL_LANG(svx, svx) UI_FILELIST_ALL_LANG(swriter, modules/swriter) diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 68293d1dc1b5..a8dd5eb8b027 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -69,12 +69,6 @@ STD_RES_FILE( gid_File_Res_Sd, sd ) STD_RES_FILE( gid_File_Res_Sfx, sfx ) -#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) - -STD_RES_FILE( gid_File_Res_Spa, spa ) - -#endif - STD_RES_FILE( gid_File_Res_Sb, sb ) STD_RES_FILE( gid_File_Res_Svl, svl ) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 024a347e045d..010f3cf3c1a0 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -262,9 +262,6 @@ Module gid_Module_Root_Files_6 gid_File_Share_Config_Sofficecfg_uiconfig_sglobal, gid_File_Share_Config_Sofficecfg_uiconfig_simpress, gid_File_Share_Config_Sofficecfg_uiconfig_smath, -#ifdef GUIBASE_UNX - gid_File_Share_Config_Sofficecfg_uiconfig_spa, -#endif gid_File_Share_Config_Sofficecfg_uiconfig_startmodule, gid_File_Share_Config_Sofficecfg_uiconfig_svt, gid_File_Share_Config_Sofficecfg_uiconfig_svx, diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 08b7f7482217..104712bf93d2 100644 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -35,9 +35,6 @@ Module gid_Module_Langpack_Basis_Template gid_File_Share_Config_Sofficecfg_uiconfig_sfx_Lang, gid_File_Share_Config_Sofficecfg_uiconfig_simpress_Lang, gid_File_Share_Config_Sofficecfg_uiconfig_smath_Lang, -#ifdef GUIBASE_UNX - gid_File_Share_Config_Sofficecfg_uiconfig_spa_Lang, -#endif gid_File_Share_Config_Sofficecfg_uiconfig_svt_Lang, gid_File_Share_Config_Sofficecfg_uiconfig_svx_Lang, gid_File_Share_Config_Sofficecfg_uiconfig_swriter_Lang, |