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

[Stephan Bergmann (via logerrit)]

 scp2/macros/macro.pl              |   14 --------------
 scp2/source/ooo/directory_ooo.scp |    4 ----
 2 files changed, 18 deletions(-)

New commits:
commit 8e3f4aeb401cb478374928d78bcbfc737bfd4d97
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Apr 25 18:36:55 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Apr 26 07:46:11 2019 +0200

    ITERATE_ALL_LANG_DIR_LPROJ appears to be unused
    
    The Bundle_Contents_Resources_Lang dir gids (its only use) have been unused
    since f0b57c30fdb5ecdd25879844159b9038399bc6de "Info.plist et al were no longer
    found when creating a .dmg", and those Contents/Resources/*.lproj dirs are
    created on demand now, anyway.
    
    Change-Id: Ia3e867307c4fc31180594d507721577a21cc20b1
    Reviewed-on: https://gerrit.libreoffice.org/71319
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 20f456917937..38ea02eb31dc 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -76,20 +76,6 @@ sub write_ITERATE_ALL_LANG
         print OUTFILE "\\\n";
     }
     print OUTFILE "\n\n";
-
-    print OUTFILE "#define ITERATE_ALL_LANG_DIR_LPROJ(gid,parent) ";
-    foreach $lang (@helplangs) {
-        my $shortlang = $lang;
-        $shortlang = "en" if $shortlang eq "en-US";
-        my $speciallang = $lang;
-        $speciallang =~ s/-/_/;
-        print OUTFILE "\\\nDirectory CONCAT3(gid_Dir_,gid,_$speciallang)";
-        print OUTFILE "\\\n\tParentID = CONCAT2(gid_Dir_,parent);";
-        print OUTFILE "\\\n\tDosName = \"$shortlang.lproj\"; ";
-        print OUTFILE "\\\nEnd ";
-        print OUTFILE "\\\n";
-    }
-    print OUTFILE "\n\n";
 }
 
 sub write_ALL_LANG
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 60e3f842173b..d172f74a3f84 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -38,10 +38,6 @@ End
 #endif
 
 #ifdef MACOSX
-ITERATE_ALL_LANG_DIR_LPROJ(Bundle_Contents_Resources_Lang,Bundle_Contents_Resources)
-#endif
-
-#ifdef MACOSX
 Directory gid_Dir_Bundle_Contents_Library
     ParentID = gid_Dir_Bundle_Contents;
     HostName = "Library";