[Libreoffice-commits] core.git: i18npool/source

[Julien Nabet (via logerrit)]

 i18npool/source/localedata/filewriter.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b0bdc7c11cdc98aa02b6bef11868d06f623d5d01
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Jun 18 18:08:19 2023 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 18 19:00:45 2023 +0200

    Regression from speed up startup 
time(e51b4fc8c278bfa0b0671bbdb0ab35346881ebb7)
    
    for getOutlineNumberingLevels
    
    TB Jenkins_Linux_Ubsan
    26316         [_RUN_____] SwDialogsTest::openAnyDialog
    26317 NEXT    /i18npool/source/localedata/localedata.cxx:1330:33: runtime 
error: call to function getOutlineNumberingLevels_de_DE through pointer to 
incorrect function type ´const rtl::OUString ***(*)(short &, short &, short &)´
    26318         
/workdir/CustomTarget/i18npool/localedata/localedata_de_DE.cxx:1475: note: 
getOutlineNumberingLevels_de_DE defined here
    26319             #0 0x7f5f948b75d8 in 
i18npool::LocaleDataImpl::getOutlineNumberingLevels(com::sun::star::lang::Locale
 const&) /i18npool/source/localedata/localedata.cxx:1330:33
    26320             #1 0x7f5f948263ba in 
i18npool::DefaultNumberingProvider::getDefaultOutlineNumberings(com::sun::star::lang::Locale
 const&) 
/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx:345:36
    26321             #2 0x7f5f948264ee in non-virtual thunk to 
i18npool::DefaultNumberingProvider::getDefaultOutlineNumberings(com::sun::star::lang::Locale
 const&) /i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
    26322             #3 0x7f5fc2d8e917 in svx::sidebar::OutlineTypeMgr::Init() 
/svx/source/sidebar/nbdtmg.cxx:585:35
    
    Change-Id: Ic291f9badad2047980bff848e83bc56b8beaa723
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153235
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/i18npool/source/localedata/filewriter.cxx 
b/i18npool/source/localedata/filewriter.cxx
index 30a759573278..d9167ed1e950 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -127,8 +127,8 @@ void OFileWriter::writeOUStringRefFunction3(const char 
*func, std::u16string_vie
 {
     OString aRefLocale( OUStringToOString(useLocale, 
RTL_TEXTENCODING_ASCII_US) );
     const char* locale = aRefLocale.getStr();
-    fprintf(m_f, "extern const OUString ****  SAL_CALL %s%s(sal_Int16& 
nStyles, sal_Int16& nLevels, sal_Int16& nAttributes);\n", func, locale);
-    fprintf(m_f, "const OUString ****  SAL_CALL %s%s(sal_Int16& nStyles, 
sal_Int16& nLevels, sal_Int16& nAttributes)\n{\n", func, theLocale.c_str());
+    fprintf(m_f, "extern const OUString ***  SAL_CALL %s%s(sal_Int16& nStyles, 
sal_Int16& nLevels, sal_Int16& nAttributes);\n", func, locale);
+    fprintf(m_f, "const OUString ***  SAL_CALL %s%s(sal_Int16& nStyles, 
sal_Int16& nLevels, sal_Int16& nAttributes)\n{\n", func, theLocale.c_str());
     fprintf(m_f, "\treturn %s%s(nStyles, nLevels, nAttributes);\n}\n", func, 
locale);
 }