[Libreoffice-commits] core.git: scp2/macros scp2/source

Thomas Arnhold thomas at arnhold.org
Wed Apr 17 00:35:24 PDT 2013


 scp2/macros/macro.pl              |   11 -
 scp2/source/ooo/directory_ooo.scp |  303 --------------------------------------
 2 files changed, 314 deletions(-)

New commits:
commit e70ea92b3632c376975dd85dbcb26e7ca6b95498
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Apr 15 03:53:39 2013 +0200

    scp: remove unused macros
    
    Change-Id: I48ac97bd6ac8cbd534e50c617f3d54ff10bd2908
    Reviewed-on: https://gerrit.libreoffice.org/3410
    Reviewed-by: Matúš Kukan <matus.kukan at gmail.com>
    Tested-by: Matúš Kukan <matus.kukan at gmail.com>

diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 2ad3fad..4580874 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -61,7 +61,6 @@ write_OTHER_LANGS();
 write_DIR_ISOLANGUAGE_ALL_LANG_2();
 write_DIR_ISOLANGUAGE_ALL_LANG();
 write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
-write_DIR_IDENT_ALL_LANG();
 write_EXTRA_ALL_LANG();
 write_EXTRA_ALL_LANG_BUT_EN_US();
 write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG();
@@ -126,16 +125,6 @@ sub write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ
     print OUTFILE "\n\n";
 }
 
-sub write_DIR_IDENT_ALL_LANG
-{
-    print OUTFILE "#define DIR_IDENT_ALL_LANG(name) ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tDosName ($lang) = STRING(name)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
 sub write_EXTRA_ALL_LANG
 {
     print OUTFILE "#define EXTRA_ALL_LANG(name,ext) ";
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 6012032..f1b412d 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -69,22 +69,6 @@ Directory gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents
 End
 #endif
 
-#if defined MACOSX
-Unixlink gid_Unixlink_Applications
-    BIN_FILE_BODY;
-    Styles = ();
-    Dir = PD_PROGDIR;
-    Name = "Applications";
-    Target = "/Applications";
-End
-#endif
-
-Directory gid_Dir_Addin
-    Styles = (CREATE);
-    ParentID = gid_Brand_Dir_Program;
-    DosName = "addin";
-End
-
 Directory gid_Dir_Wizards
     Styles = (CREATE);
     ParentID = gid_Brand_Dir_Program;
@@ -97,30 +81,6 @@ Directory gid_Dir_Wizards_Ui
     DosName = "ui";
 End
 
-Directory gid_Dir_Wizards_Ui_Event
-    Styles = (CREATE);
-    ParentID = gid_Dir_Wizards_Ui;
-    DosName = "event";
-End
-
-Directory gid_Dir_Wizards_Fax
-    Styles = (CREATE);
-    ParentID = gid_Dir_Wizards;
-    DosName = "fax";
-End
-
-Directory gid_Dir_Wizards_Letter
-    Styles = (CREATE);
-    ParentID = gid_Dir_Wizards;
-    DosName = "letter";
-End
-
-Directory gid_Dir_Wizards_Agenda
-    Styles = (CREATE);
-    ParentID = gid_Dir_Wizards;
-    DosName = "agenda";
-End
-
 Directory gid_Dir_Resource
     ParentID = gid_Brand_Dir_Program;
     DosName = "resource";
@@ -149,54 +109,12 @@ Directory gid_Dir_User
     DosName = "presets";
 End
 
-Directory gid_Dir_User_Autotext
-    ParentID = gid_Dir_User;
-    DosName = "autotext";
-    Styles = (WORKSTATION, CREATE);
-End
-
 Directory gid_Dir_User_Uno_Packages
     ParentID = gid_Dir_User;
     DosName = "uno_packages";
     Styles = (CREATE);
 End
 
-Directory gid_Dir_User_Uno_Packages_Cache
-    ParentID = gid_Dir_User_Uno_Packages;
-    DosName = "cache";
-    Styles = (CREATE);
-End
-
-Directory gid_Dir_User_Temp
-    ParentID = gid_Dir_User;
-    DosName = "temp";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Autocorr
-    ParentID = gid_Dir_User;
-    DosName = "autocorr";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Bookmark
-    ParentID = gid_Dir_User;
-    DosName = "bookmark";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Scripts
-    ParentID = gid_Dir_User;
-    DosName = "Scripts";
-    Styles = (WORKSTATION,CREATE);
-End
-
-Directory gid_Dir_Backup
-    ParentID = gid_Dir_User;
-    DosName = "backup";
-    Styles = (WORKSTATION, CREATE);
-End
-
 Directory gid_Dir_User_Basic
     ParentID = gid_Dir_User;
     DosName = "basic";
@@ -214,54 +132,6 @@ Directory gid_Dir_User_Config
     Styles = (WORKSTATION, CREATE);
 End
 
-Directory gid_Dir_User_Config_Sofficecfg
-    ParentID = gid_Dir_User_Config;
-    DosName = "soffice.cfg";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Template
-    ParentID = gid_Dir_User;
-    DosName = "template";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Database
-    ParentID = gid_Dir_User;
-    DosName = "database";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Database_Biblio
-    ParentID = gid_Dir_Database;
-    DosName = "biblio";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Gallery
-    ParentID = gid_Dir_User;
-    DosName = "gallery";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Wordbook
-    ParentID = gid_Dir_User;
-    DosName = "wordbook";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Store
-    ParentID = gid_Dir_User;
-    DosName = "store";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Plugin
-    ParentID = gid_Brand_Dir_Program;
-    DosName = "plugin";
-    Styles = (WORKSTATION, CREATE);
-End
-
 Directory gid_Dir_Fonts
     ParentID = gid_Brand_Dir_Share;
     DosName = "fonts";
@@ -398,61 +268,11 @@ Directory gid_Dir_Share_Config_Sofficecfg
     DosName = "soffice.cfg";
 End
 
-Directory gid_Dir_Share_Config_Sofficecfg_Basicide
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "BasicIDE";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbquery
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "dbquery";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Scalc
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "scalc";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Schart
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "schart";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sdraw
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "sdraw";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sglobal
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "sglobal";
-End
-
 Directory gid_Dir_Share_Config_Sofficecfg_Simpress
     ParentID = gid_Dir_Share_Config_Sofficecfg;
     DosName = "simpress";
 End
 
-Directory gid_Dir_Share_Config_Sofficecfg_Smath
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "smath";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Startmodule
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "StartModule";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sweb
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "sweb";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Swriter
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "swriter";
-End
-
 Directory gid_Dir_Share_Registry_Res
     ParentID = gid_Brand_Dir_Share_Registry;
     HostName = "res";
@@ -463,17 +283,6 @@ Directory gid_Dir_Autotext
     DosName = "autotext";
 End
 
-Directory gid_Dir_Autotext_Language
-    ParentID = gid_Dir_Autotext;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_Share_Autocorr
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "autocorr";
-    Styles = (WORKSTATION, CREATE);
-End
-
 #if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
 Directory gid_Dir_Share_Liblangtag
     ParentID = gid_Brand_Dir_Share;
@@ -547,36 +356,6 @@ Directory gid_Dir_Gallery
     DosName = "gallery";
 End
 
-Directory gid_Dir_Gallery_Bullets
-    ParentID = gid_Dir_Gallery;
-    DosName = "bullets";
-End
-
-Directory gid_Dir_Gallery_Htmlexpo
-    ParentID = gid_Dir_Gallery;
-    DosName = "htmlexpo";
-End
-
-Directory gid_Dir_Gallery_Rulers
-    ParentID = gid_Dir_Gallery;
-    DosName = "rulers";
-End
-
-Directory gid_Dir_Gallery_Sounds
-    ParentID = gid_Dir_Gallery;
-    DosName = "sounds";
-End
-
-Directory gid_Dir_Gallery_Wwwback
-    ParentID = gid_Dir_Gallery;
-    DosName = "www-back";
-End
-
-Directory gid_Dir_Gallery_Wwwgraf
-    ParentID = gid_Dir_Gallery;
-    DosName = "www-graf";
-End
-
 Directory gid_Dir_Template
     ParentID = gid_Brand_Dir_Share;
     DosName = "template";
@@ -627,56 +406,6 @@ Directory gid_Dir_Template_Language
     DIR_ISOLANGUAGE_ALL_LANG_2;
 End
 
-Directory gid_Dir_Template_Educate
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(educate);
-End
-
-Directory gid_Dir_Template_Finance
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(finance);
-End
-
-Directory gid_Dir_Template_Forms
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(forms);
-End
-
-Directory gid_Dir_Template_Labels
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(labels);
-End
-
-Directory gid_Dir_Template_Layout
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(layout);
-End
-
-Directory gid_Dir_Template_Misc
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(misc);
-End
-
-Directory gid_Dir_Template_Officorr
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(officorr);
-End
-
-Directory gid_Dir_Template_Offimisc
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(offimisc);
-End
-
-Directory gid_Dir_Template_Personal
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(personal);
-End
-
-Directory gid_Dir_Template_Presnt
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(presnt);
-End
-
 Directory gid_Dir_Wordbook
     ParentID = gid_Brand_Dir_Share;
     DosName = "wordbook";
@@ -718,26 +447,6 @@ End
 
 #ifdef UNX
 
-Directory gid_Dir_User_Psprint_Driver
-    ParentID = gid_Dir_User_Psprint;
-    DosName = "driver";
-    Styles = (CREATE);
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_User_Psprint_Fontmetric
-    ParentID = gid_Dir_User_Psprint;
-    DosName = "fontmetric";
-    Styles = (CREATE);
-End
-
-#endif
-
-#ifdef UNX
-
 Directory gid_Dir_Fonts_Truetype
     ParentID = gid_Dir_Fonts;
     DosName = "truetype";
@@ -882,18 +591,6 @@ Directory gid_Dir_Samples_Language
     DIR_ISOLANGUAGE_ALL_LANG_2;
 End
 
-/* Samples - Documentations */
-Directory gid_Dir_Samples_Documentations
-    ParentID = gid_Dir_Samples_Language;
-    DosName = "Documentations";
-End
-
-/* Samples - Advertisement */
-Directory gid_Dir_Samples_Advertisement
-    ParentID = gid_Dir_Samples_Language;
-    DosName = "Advertisement";
-End
-
 /* Elements */
 Directory gid_Dir_Gallery_Elements
     ParentID = gid_Dir_Gallery;


More information about the Libreoffice-commits mailing list