core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/collator/collator_unicode.cxx |    2 +-
 i18npool/source/collator/gencoll_rule.cxx     |    5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 164cab17d4125d2a4b6b5cc607c9b316ef46c115
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 14 10:39:46 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 14 13:30:18 2024 +0100

    rename some of the collator function symbols
    
    to prevent conflicts when I merge some of these libraries
    
    Change-Id: Iaa09924dc5b88ecd6d381e9529a8862a5b539a69
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163359
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index a3a1b4f84e66..589c8ad6e6e9 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -159,7 +159,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
             constexpr OUString sModuleName( u"" SAL_MODULENAME( "i18npool" ) 
""_ustr );
             hModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 
SAL_LOADMODULE_DEFAULT );
             if (hModule) {
-                OUStringBuffer aBuf("get_" + rLocale.Language + "_");
+                OUStringBuffer aBuf("get_collator_data_" + rLocale.Language + 
"_");
                 if ( rLocale.Language == "zh" ) {
                     OUString func_base = aBuf.makeStringAndClear();
                     if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
diff --git a/i18npool/source/collator/gencoll_rule.cxx 
b/i18npool/source/collator/gencoll_rule.cxx
index 2d55e0c8917d..d8254f46bb9d 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.cxx
@@ -62,13 +62,8 @@ static void data_write(char* file, char* name, sal_uInt8 
*data, sal_Int32 len)
     }
     fprintf(fp, "
};

");
 
-    fprintf(fp, "#ifndef DISABLE_DYNLOADING
");
-    fprintf(fp, "SAL_DLLPUBLIC_EXPORT const sal_uInt8* get_%s() { return %s; }
", name, name);
-    fprintf(fp, "SAL_DLLPUBLIC_EXPORT size_t get_%s_length() { return 
sizeof(%s); }
", name, name);
-    fprintf(fp, "#else
");
     fprintf(fp, "SAL_DLLPUBLIC_EXPORT const sal_uInt8* get_collator_data_%s() 
{ return %s; }
", name, name);
     fprintf(fp, "SAL_DLLPUBLIC_EXPORT size_t get_collator_data_%s_length() { 
return sizeof(%s); }
", name, name);
-    fprintf(fp, "#endif
");
     fprintf(fp, "
");
     fprintf (fp, "}
");