i18npool/source/localedata/LocaleNode.cxx | 56 ---------------
i18npool/source/localedata/LocaleNode.hxx | 15 ----
i18npool/source/localedata/filewriter.cxx | 106 ------------------------------
3 files changed, 177 deletions(-)
New commits:
commit 42e156fd19659bead5eebd78c7bd6fd3d38901ad
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jun 15 12:52:53 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jun 16 16:05:10 2023 +0200
remove dead code
Change-Id: Ia8523e992b30ba8674ca88374906cb3c671df5e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153126
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/i18npool/source/localedata/LocaleNode.cxx
b/i18npool/source/localedata/LocaleNode.cxx
index 7531afa5aff2..1a6cc7796611 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -141,44 +141,6 @@ void LocaleNode::generateCode (const OFileWriter &of) const
}
-OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
- const char* pParameterName, const LocaleNode* pNode,
- sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
-{
- OUString aVal;
- if (pNode)
- aVal = pNode->getValue();
- else if (nMinLen >= 0) // -1: optional => empty, 0: must be present, empty
- {
- ++nError;
- fprintf( stderr, "Error: node NULL pointer for parameter %s.\n",
- pParameterName);
- }
- // write empty data if error
- of.writeParameter( pParameterName, aVal);
- sal_Int32 nLen = aVal.getLength();
- if (nLen < nMinLen)
- {
- ++nError;
- fprintf( stderr, "Error: less than %" SAL_PRIdINT32 " character%s (%"
SAL_PRIdINT32 ") in %s '%s'.\n",
- nMinLen, (nMinLen > 1 ? "s" : ""),
- nLen,
- (pNode ? OSTR( pNode->getName()) : ""),
- OSTR( aVal));
- }
- else if (nLen > nMaxLen && nMaxLen >= 0)
- {
- ++nError;
- fprintf( stderr,
- "Error: more than %" SAL_PRIdINT32 " character%s (%"
SAL_PRIdINT32 ") in %s '%s' not supported by application.\n",
- nMaxLen, (nMaxLen > 1 ? "s" : ""),
- nLen,
- (pNode ? OSTR( pNode->getName()) : ""),
- OSTR( aVal));
- }
- return aVal;
-}
-
OUString LocaleNode::writeOUStringLiteralParameterCheckLen( const OFileWriter
&of,
const char* pParameterName, const LocaleNode* pNode,
sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
@@ -217,24 +179,6 @@ OUString
LocaleNode::writeOUStringLiteralParameterCheckLen( const OFileWriter &o
return aVal;
}
-OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
- const char* pNodeName, const char* pParameterName,
- sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
-{
- OUString aVal;
- const LocaleNode * pNode = findNode( pNodeName);
- if (pNode || nMinLen < 0)
- aVal = writeParameterCheckLen( of, pParameterName, pNode, nMinLen,
nMaxLen);
- else
- {
- ++nError;
- fprintf( stderr, "Error: node %s not found.\n", pNodeName);
- // write empty data if error
- of.writeParameter( pParameterName, aVal);
- }
- return aVal;
-}
-
OUString LocaleNode::writeOUStringLiteralParameterCheckLen( const OFileWriter
&of,
const char* pNodeName, const char* pParameterName,
sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
diff --git a/i18npool/source/localedata/LocaleNode.hxx
b/i18npool/source/localedata/LocaleNode.hxx
index cedd3711fa78..e5d45f4cef42 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -43,33 +43,20 @@ public:
void writeHexInt(sal_Int16 nb) const;
void writeOUStringRefFunction(const char *func, std::u16string_view
useLocale) const;
void writeOUStringRefFunction(const char *func, std::u16string_view
useLocale, const char *to) const;
- void writeFunction(const char *func, const char *count, const char
*array) const;
void writeOUStringFunction(const char *func, const char *count, const
char *array) const;
- void writeRefFunction(const char *func, std::u16string_view useLocale)
const;
- void writeFunction(const char *func, const char *count, const char
*array, const char *from, const char *to) const;
void writeOUStringFunction(const char *func, const char *count, const
char *array, const char *from, const char *to) const;
- void writeRefFunction(const char *func, std::u16string_view useLocale,
const char *to) const;
- void writeFunction2(const char *func, const char *style, const char*
attr, const char *array) const;
void writeOUStringFunction2(const char *func, const char *style, const
char* attr, const char *array) const;
- void writeRefFunction2(const char *func, std::u16string_view useLocale)
const;
void writeOUStringRefFunction2(const char *func, std::u16string_view
useLocale) const;
- void writeFunction3(const char *func, const char *style, const char*
levels, const char* attr, const char *array) const;
void writeOUStringFunction3(const char *func, const char *style, const
char* levels, const char* attr, const char *array) const;
- void writeRefFunction3(const char *func, std::u16string_view useLocale)
const;
void writeOUStringRefFunction3(const char *func, std::u16string_view
useLocale) const;
void writeIntParameter(const char* pAsciiStr, const sal_Int16 count,
sal_Int16 val) const;
void writeOUStringLiteralIntParameter(const char* pAsciiStr, const
sal_Int16 count, sal_Int16 val) const;
- bool writeDefaultParameter(const char* pAsciiStr, std::u16string_view
str, sal_Int16 count) const;
bool writeOUStringLiteralDefaultParameter(const char* pAsciiStr,
std::u16string_view str, sal_Int16 count) const;
- void writeParameter(const char* pAsciiStr, std::u16string_view aChars)
const;
void writeOUStringLiteralParameter(const char* pAsciiStr,
std::u16string_view aChars) const;
void writeParameter(const char* pAsciiStr, std::u16string_view aChars,
sal_Int16 count) const;
void writeOUStringLiteralParameter(const char* pAsciiStr,
std::u16string_view aChars, sal_Int16 count) const;
- void writeParameter(const char* pAsciiStr, std::u16string_view aChars,
sal_Int16 count0, sal_Int16 count1) const;
void writeOUStringLiteralParameter(const char* pAsciiStr,
std::u16string_view aChars, sal_Int16 count0, sal_Int16 count1) const;
- void writeParameter(const char* pTagStr, const char* pAsciiStr,
std::u16string_view aChars, const sal_Int16 count) const;
void writeOUStringLiteralParameter(const char* pTagStr, const char*
pAsciiStr, std::u16string_view aChars, const sal_Int16 count) const;
- void writeParameter(const char* pTagStr, const char* pAsciiStr,
std::u16string_view aChars, sal_Int16 count0, sal_Int16 count1) const;
void writeOUStringLiteralParameter(const char* pTagStr, const char*
pAsciiStr, std::u16string_view aChars, sal_Int16 count0, sal_Int16 count1)
const;
void closeOutput() const;
/// Return the locale string, something like en_US or de_DE
@@ -120,9 +107,7 @@ public:
// SHOULD NOT > nMaxLen
// nMaxLen < 0 : any length
// nMaxLen >= 0 : warning if more than nMaxLen characters
- OUString writeParameterCheckLen( const OFileWriter &of, const char*
pParameterName, const LocaleNode* pNode, sal_Int32 nMinLen, sal_Int32 nMaxLen )
const;
OUString writeOUStringLiteralParameterCheckLen( const OFileWriter &of,
const char* pParameterName, const LocaleNode* pNode, sal_Int32 nMinLen,
sal_Int32 nMaxLen ) const;
- OUString writeParameterCheckLen( const OFileWriter &of, const char*
pNodeName, const char* pParameterName, sal_Int32 nMinLen, sal_Int32 nMaxLen )
const;
OUString writeOUStringLiteralParameterCheckLen( const OFileWriter &of,
const char* pNodeName, const char* pParameterName, sal_Int32 nMinLen, sal_Int32
nMaxLen ) const;
// ++nError with output to stderr
void incError( const char* pStr ) const;
diff --git a/i18npool/source/localedata/filewriter.cxx
b/i18npool/source/localedata/filewriter.cxx
index 9aaa27bbb47f..30a759573278 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -81,13 +81,6 @@ void OFileWriter::writeOUStringRefFunction(const char *func,
std::u16string_view
fprintf(m_f, "\treturn %s%s(count, from, tmp);\n}\n", func, locale);
}
-void OFileWriter::writeFunction(const char *func, const char *count, const
char *array) const
-{
- fprintf(m_f, "sal_Unicode ** SAL_CALL %s%s(sal_Int16& count)\n{\n", func,
theLocale.c_str());
- fprintf(m_f, "\tcount = %s;\n", count);
- fprintf(m_f, "\treturn (sal_Unicode**)%s;\n}\n", array);
-}
-
void OFileWriter::writeOUStringFunction(const char *func, const char *count,
const char *array) const
{
fprintf(m_f, "OUString const * SAL_CALL %s%s(sal_Int16& count)\n{\n",
func, theLocale.c_str());
@@ -95,24 +88,6 @@ void OFileWriter::writeOUStringFunction(const char *func,
const char *count, con
fprintf(m_f, "\treturn (OUString const *)%s;\n}\n", array);
}
-void OFileWriter::writeRefFunction(const char *func, std::u16string_view
useLocale) const
-{
- OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
- const char* locale = aRefLocale.getStr();
- fprintf(m_f, "extern sal_Unicode ** SAL_CALL %s%s(sal_Int16& count);\n",
func, locale);
- fprintf(m_f, "sal_Unicode ** SAL_CALL %s%s(sal_Int16& count)\n{\n", func,
theLocale.c_str());
- fprintf(m_f, "\treturn %s%s(count);\n}\n", func, locale);
-}
-
-void OFileWriter::writeFunction(const char *func, const char *count, const
char *array, const char *from, const char *to) const
-{
- fprintf(m_f, "sal_Unicode const * const * SAL_CALL %s%s(sal_Int16& count,
const sal_Unicode*& from, const sal_Unicode*& to)\n{\n", func,
theLocale.c_str());
- fprintf(m_f, "\tcount = %s;\n", count);
- fprintf(m_f, "\tfrom = %s;\n", from);
- fprintf(m_f, "\tto = %s;\n", to);
- fprintf(m_f, "\treturn (sal_Unicode**)%s;\n}\n", array);
-}
-
void OFileWriter::writeOUStringFunction(const char *func, const char *count,
const char *array, const char *from, const char *to) const
{
fprintf(m_f, "OUString const * SAL_CALL %s%s(sal_Int16& count, const
sal_Unicode*& from, const sal_Unicode*& to)\n{\n", func, theLocale.c_str());
@@ -122,25 +97,6 @@ void OFileWriter::writeOUStringFunction(const char *func,
const char *count, con
fprintf(m_f, "\treturn (const OUString *)%s;\n}\n", array);
}
-void OFileWriter::writeRefFunction(const char *func, std::u16string_view
useLocale, const char *to) const
-{
- OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
- const char* locale = aRefLocale.getStr();
- fprintf(m_f, "extern sal_Unicode const * const * SAL_CALL %s%s(sal_Int16&
count, const sal_Unicode*& from, const sal_Unicode*& to);\n", func, locale);
- fprintf(m_f, "sal_Unicode const * const * SAL_CALL %s%s(sal_Int16& count,
const sal_Unicode*& from, const sal_Unicode*& to)\n{\n", func,
theLocale.c_str());
- fprintf(m_f, "\tto = %s;\n", to);
- fprintf(m_f, "\tconst sal_Unicode* tmp;\n");
- fprintf(m_f, "\treturn %s%s(count, from, tmp);\n}\n", func, locale);
-}
-
-void OFileWriter::writeFunction2(const char *func, const char *style, const
char* attr, const char *array) const
-{
- fprintf(m_f, "const sal_Unicode *** SAL_CALL %s%s( sal_Int16& nStyles,
sal_Int16& nAttributes )\n{\n", func, theLocale.c_str());
- fprintf(m_f, "\tnStyles = %s;\n", style);
- fprintf(m_f, "\tnAttributes = %s;\n", attr);
- fprintf(m_f, "\treturn %s;\n}\n", array);
-}
-
void OFileWriter::writeOUStringFunction2(const char *func, const char *style,
const char* attr, const char *array) const
{
fprintf(m_f, "const OUString ** SAL_CALL %s%s( sal_Int16& nStyles,
sal_Int16& nAttributes )\n{\n", func, theLocale.c_str());
@@ -149,15 +105,6 @@ void OFileWriter::writeOUStringFunction2(const char *func,
const char *style, co
fprintf(m_f, "\treturn (const OUString **)%s;\n}\n", array);
}
-void OFileWriter::writeRefFunction2(const char *func, std::u16string_view
useLocale) const
-{
- OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
- const char* locale = aRefLocale.getStr();
- fprintf(m_f, "extern const sal_Unicode *** SAL_CALL %s%s(sal_Int16&
nStyles, sal_Int16& nAttributes);\n", func, locale);
- fprintf(m_f, "const sal_Unicode *** SAL_CALL %s%s(sal_Int16& nStyles,
sal_Int16& nAttributes)\n{\n", func, theLocale.c_str());
- fprintf(m_f, "\treturn %s%s(nStyles, nAttributes);\n}\n", func, locale);
-}
-
void OFileWriter::writeOUStringRefFunction2(const char *func,
std::u16string_view useLocale) const
{
OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
@@ -167,15 +114,6 @@ void OFileWriter::writeOUStringRefFunction2(const char
*func, std::u16string_vie
fprintf(m_f, "\treturn %s%s(nStyles, nAttributes);\n}\n", func, locale);
}
-void OFileWriter::writeFunction3(const char *func, const char *style, const
char* levels, const char* attr, const char *array) const
-{
- fprintf(m_f, "const sal_Unicode **** SAL_CALL %s%s( sal_Int16& nStyles,
sal_Int16& nLevels, sal_Int16& nAttributes )\n{\n", func, theLocale.c_str());
- fprintf(m_f, "\tnStyles = %s;\n", style);
- fprintf(m_f, "\tnLevels = %s;\n", levels);
- fprintf(m_f, "\tnAttributes = %s;\n", attr);
- fprintf(m_f, "\treturn %s;\n}\n", array);
-}
-
void OFileWriter::writeOUStringFunction3(const char *func, const char *style,
const char* levels, const char* attr, const char *array) const
{
fprintf(m_f, "const OUString *** SAL_CALL %s%s( sal_Int16& nStyles,
sal_Int16& nLevels, sal_Int16& nAttributes )\n{\n", func, theLocale.c_str());
@@ -185,15 +123,6 @@ void OFileWriter::writeOUStringFunction3(const char *func,
const char *style, co
fprintf(m_f, "\treturn (const OUString ***) %s;\n}\n", array);
}
-void OFileWriter::writeRefFunction3(const char *func, std::u16string_view
useLocale) const
-{
- OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
- const char* locale = aRefLocale.getStr();
- fprintf(m_f, "extern const sal_Unicode **** SAL_CALL %s%s(sal_Int16&
nStyles, sal_Int16& nLevels, sal_Int16& nAttributes);\n", func, locale);
- fprintf(m_f, "const sal_Unicode **** 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);
-}
-
void OFileWriter::writeOUStringRefFunction3(const char *func,
std::u16string_view useLocale) const
{
OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
@@ -213,13 +142,6 @@ void OFileWriter::writeOUStringLiteralIntParameter(const
char* pAsciiStr, const
fprintf(m_f, "static constexpr OUStringLiteral %s%d = u\"\\x%x\";\n",
pAsciiStr, count, val);
}
-bool OFileWriter::writeDefaultParameter(const char* pAsciiStr,
std::u16string_view str, sal_Int16 count) const
-{
- bool bBool = str == u"true";
- fprintf(m_f,"static const sal_Unicode default%s%d[] = {%d};\n", pAsciiStr,
count, bBool);
- return bBool;
-}
-
bool OFileWriter::writeOUStringLiteralDefaultParameter(const char* pAsciiStr,
std::u16string_view str, sal_Int16 count) const
{
bool bBool = str == u"true";
@@ -227,13 +149,6 @@ bool
OFileWriter::writeOUStringLiteralDefaultParameter(const char* pAsciiStr, st
return bBool;
}
-void OFileWriter::writeParameter(const char* pAsciiStr, std::u16string_view
aChars) const
-{
- fprintf(m_f, "static const sal_Unicode %s[] = {", pAsciiStr);
- writeStringCharacters(aChars);
- fprintf(m_f, "0x0};\n");
-}
-
void OFileWriter::writeOUStringLiteralParameter(const char* pAsciiStr,
std::u16string_view aChars) const
{
fprintf(m_f, "static constexpr OUStringLiteral %s = u\"", pAsciiStr);
@@ -255,13 +170,6 @@ void OFileWriter::writeOUStringLiteralParameter(const
char* pAsciiStr, std::u16s
fprintf(m_f, "\";\n");
}
-void OFileWriter::writeParameter(const char* pAsciiStr, std::u16string_view
aChars, sal_Int16 count0, sal_Int16 count1) const
-{
- fprintf(m_f, "static const sal_Unicode %s%d%d[] = {", pAsciiStr, count0,
count1);
- writeStringCharacters(aChars);
- fprintf(m_f, "0x0};\n");
-}
-
void OFileWriter::writeOUStringLiteralParameter(const char* pAsciiStr,
std::u16string_view aChars, sal_Int16 count0, sal_Int16 count1) const
{
fprintf(m_f, "static constexpr OUStringLiteral %s%d%d = u\"", pAsciiStr,
count0, count1);
@@ -269,13 +177,6 @@ void OFileWriter::writeOUStringLiteralParameter(const
char* pAsciiStr, std::u16s
fprintf(m_f, "\";\n");
}
-void OFileWriter::writeParameter(const char* pTagStr, const char* pAsciiStr,
std::u16string_view aChars, const sal_Int16 count) const
-{
- fprintf(m_f, "static const sal_Unicode %s%s%d[] = {", pTagStr, pAsciiStr,
count);
- writeStringCharacters(aChars);
- fprintf(m_f, "0x0};\n");
-}
-
void OFileWriter::writeOUStringLiteralParameter(const char* pTagStr, const
char* pAsciiStr, std::u16string_view aChars, const sal_Int16 count) const
{
fprintf(m_f, "static constexpr OUStringLiteral %s%s%d = u\"", pTagStr,
pAsciiStr, count);
@@ -283,13 +184,6 @@ void OFileWriter::writeOUStringLiteralParameter(const
char* pTagStr, const char*
fprintf(m_f, "\";\n");
}
-void OFileWriter::writeParameter(const char* pTagStr, const char* pAsciiStr,
std::u16string_view aChars, sal_Int16 count0, sal_Int16 count1) const
-{
- fprintf(m_f, "static const sal_Unicode %s%s%d%d[] = {", pTagStr,
pAsciiStr, count0, count1);
- writeStringCharacters(aChars);
- fprintf(m_f, "0x0};\n");
-}
-
void OFileWriter::writeOUStringLiteralParameter(const char* pTagStr, const
char* pAsciiStr, std::u16string_view aChars, sal_Int16 count0, sal_Int16
count1) const
{
fprintf(m_f, "static constexpr OUStringLiteral %s%s%d%d = u\"", pTagStr,
pAsciiStr, count0, count1);
