[Libreoffice-commits] .: i18npool/source

[Libreoffice Gerrit user]

 i18npool/source/localedata/genstaticheader.pl |   19 +++++++++++++++++--
 i18npool/source/localedata/localedata.cxx     |    2 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 122f3e7e68c7679579309338d3f4befa3a0ba9f3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Oct 23 16:36:54 2012 +0300

    Handle getAllFormats1, too, but it exists only for en_US
    
    Change-Id: Ia8de5f1a619466e473f7a9586f53a38bdf9c2e51

diff --git a/i18npool/source/localedata/genstaticheader.pl b/i18npool/source/localedata/genstaticheader.pl
index adba340..3d99358 100644
--- a/i18npool/source/localedata/genstaticheader.pl
+++ b/i18npool/source/localedata/genstaticheader.pl
@@ -44,6 +44,7 @@ my @FUNCS = qw(
     getSearchOptions
     getTransliterations
     getUnicodeScripts
+    getAllFormats1
     );
 
 print 'extern "C" {
@@ -52,7 +53,13 @@ print 'extern "C" {
 
 foreach my $lang (@ARGV) {
     foreach my $func (@FUNCS) {
-	printf("void %s_%s();\n", $func, $lang);
+        if ($func eq 'getAllFormats1') {
+            if ($lang eq 'en_US') {
+                printf("void %s_%s();\n", $func, $lang);
+            }
+        } else {
+            printf("void %s_%s();\n", $func, $lang);
+        }
     }
 }
 
@@ -70,7 +77,15 @@ foreach my $lang (@ARGV) {
     printf("    {\n");
     printf("        \"%s\",\n", $lang);
     foreach my $func (@FUNCS) {
-	printf("        %s_%s,\n", $func, $lang);
+        if ($func eq 'getAllFormats1') {
+            if ($lang eq 'en_US') {
+                printf("        %s_%s,\n", $func, $lang);
+            } else {
+                printf("        0,\n");
+            }
+        } else {
+            printf("        %s_%s,\n", $func, $lang);
+        }
     }
     printf("    }%s\n", ($lang ne $ARGV[$#ARGV]) ? ',' : '');
 }
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 0fff9cf..300c5e1 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -533,6 +533,8 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
                 return aLibTable[i].getTransliterations;
             else if( strcmp(pFunction, "getUnicodeScripts") == 0 )
                 return aLibTable[i].getUnicodeScripts;
+            else if( strcmp(pFunction, "getAllFormats1") == 0 )
+                return aLibTable[i].getAllFormats1;
 #endif
         }
     }