[Libreoffice-commits] core.git: 2 commits - i18nlangtag/source

[Eike Rathke]

 i18nlangtag/source/isolang/langid.pl |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 1edc24e8ef01fb9bc780d268d8dd20bfc42b3110
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Nov 6 18:38:41 2013 +0100

    more cruft
    
    Change-Id: Ia6b975080598a87c5e262374efde9efb186051b1

diff --git a/i18nlangtag/source/isolang/langid.pl b/i18nlangtag/source/isolang/langid.pl
index 2fad0b1..4de9218 100755
--- a/i18nlangtag/source/isolang/langid.pl
+++ b/i18nlangtag/source/isolang/langid.pl
@@ -338,13 +338,8 @@ sub main()
             $modifier . '^\s*case\s*.*' . $grepdef . '.*\s*:',
             "$SRC_ROOT", "i18nlangtag", "source/isolang/mslangid.cxx", ());
 
-        # With CWS 'langstatusbar' the language listbox resource file gets a new location.
-        my $module = "svx";
-        my $name = "source/dialog/langtab.src";
-        if (!(-e "$SRC_ROOT/$module/$name")) {
-            $module = "svtools";
-            $name = "source/misc/langtab.src";
-        }
+        my $module = "svtools";
+        my $name = "source/misc/langtab.src";
         #         < "Afrikaans" ; LANGUAGE_AFRIKAANS ; > ;
         # lookup define
         @resultlist = grepFile(
commit 105c0a1626c5c15c9e3e08dc24aba6ef1977e3de
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Nov 6 17:33:26 2013 +0100

    make this work again
    
    Change-Id: I0ac5dfdea6b5785b1651c3b362bbddea2354e7c1

diff --git a/i18nlangtag/source/isolang/langid.pl b/i18nlangtag/source/isolang/langid.pl
index 0ac2017..2fad0b1 100755
--- a/i18nlangtag/source/isolang/langid.pl
+++ b/i18nlangtag/source/isolang/langid.pl
@@ -214,7 +214,7 @@ sub main()
         # #define LANGUAGE_AFRIKAANS                  0x0436
         @resultlist = grepFile(
             $modifier . '^\s*#\s*define\s+[A-Z_]*' . $grepdef,
-            "$SRC_ROOT", "i18nlangtag", "lang.h", ());
+            "$SRC_ROOT", "include", "i18nlangtag/lang.h", ());
     }
     else
     {
@@ -223,7 +223,7 @@ sub main()
         my $buf = sprintf( "0x%04X", $lcid);
         @resultlist = grepFile(
             '^\s*#\s*define\s+\w+\s+' . $buf,
-            "$SRC_ROOT", "i18nlangtag", "lang.h", ());
+            "$SRC_ROOT", "include", "i18nlangtag/lang.h", ());
     }
     for $result (@resultlist)
     {
@@ -276,7 +276,7 @@ sub main()
         # #define LANGUAGE_AFRIKAANS                  0x0436
         @resultlist = grepFile(
             $modifier . '^\s*#\s*define\s+[A-Z_]*' . $grepdef,
-            "$SRC_ROOT", "i18nlangtag", "lang.h", ());
+            "$SRC_ROOT", "include", "i18nlangtag/lang.h", ());
         my @lcidlist;
         for $result (@resultlist)
         {