sal_Char->char in formula..i18npool

Change-Id: I765979f41842befcf25909944100d1caa97f81a8
Reviewed-on: https://gerrit.libreoffice.org/85476
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 31 insertions, 31 deletions

diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 80972f61092c..fe627d343767 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -70,7 +70,7 @@ const LocaleNode* LocaleNode::getRoot() const
     return pRoot;
 }
 
-const LocaleNode * LocaleNode::findNode ( const sal_Char *name) const {
+const LocaleNode * LocaleNode::findNode ( const char *name) const {
     if (aName.equalsAscii(name))
         return this;
     for (size_t i = 0; i< children.size(); i++)  {
@@ -1464,7 +1464,7 @@ void LCIndexNode::generateCode (const OFileWriter &of) const
 
 
 static void lcl_writeAbbrFullNarrNames( const OFileWriter & of, const LocaleNode* currNode,
-        const sal_Char* elementTag, sal_Int16 i, sal_Int16 j )
+        const char* elementTag, sal_Int16 i, sal_Int16 j )
 {
     OUString aAbbrName = currNode->getChildAt(1)->getValue();
     OUString aFullName = currNode->getChildAt(2)->getValue();
@@ -1483,7 +1483,7 @@ static void lcl_writeAbbrFullNarrNames( const OFileWriter & of, const LocaleNode
     of.writeParameter( elementTag, "DefaultNarrowName", aNarrName, i, j);
 }
 
-static void lcl_writeTabTagString( const OFileWriter & of, const sal_Char* pTag, const sal_Char* pStr )
+static void lcl_writeTabTagString( const OFileWriter & of, const char* pTag, const char* pStr )
 {
     of.writeAsciiString("\t");
     of.writeAsciiString( pTag);
@@ -1491,14 +1491,14 @@ static void lcl_writeTabTagString( const OFileWriter & of, const sal_Char* pTag,
 }
 
 static void lcl_writeTabTagStringNums( const OFileWriter & of,
-        const sal_Char* pTag, const sal_Char* pStr, sal_Int16 i, sal_Int16 j )
+        const char* pTag, const char* pStr, sal_Int16 i, sal_Int16 j )
 {
     lcl_writeTabTagString( of, pTag, pStr);
     of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
 }
 
 static void lcl_writeAbbrFullNarrArrays( const OFileWriter & of, sal_Int16 nCount,
-        const sal_Char* elementTag, sal_Int16 i, bool bNarrow )
+        const char* elementTag, sal_Int16 i, bool bNarrow )
 {
     if (nCount == 0)
     {
@@ -1553,7 +1553,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
         sal_Int16 nChild = 0;
 
         // Generate Days of Week
-        const sal_Char *elementTag;
+        const char *elementTag;
         LocaleNode * daysNode = nullptr;
         OUString ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
         ref_name = ref_name.replace( '-', '_');
@@ -1969,8 +1969,8 @@ void LCTransliterationNode::generateCode (const OFileWriter &of) const
 namespace {
 
 struct NameValuePair {
-    const sal_Char *name;
-    const sal_Char *value;
+    const char *name;
+    const char *value;
 };
 
 }
@@ -2305,7 +2305,7 @@ Attr::Attr (const Reference< XAttributeList > & attr) {
     }
 }
 
-OUString Attr::getValueByName (const sal_Char *str) const {
+OUString Attr::getValueByName (const char *str) const {
     auto pName = std::find_if(std::cbegin(name), std::cend(name),
         [&str](const OUString& rName) { return rName.equalsAscii(str); });
     if (pName != std::cend(name))
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 66f954352607..3663478853a3 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -48,13 +48,13 @@ public:
     void  writeRefFunction2(const char *func, const OUString& useLocale) const;
     void  writeFunction3(const char *func, const char *style, const char* levels, const char* attr, const char *array) const;
     void  writeRefFunction3(const char *func, const OUString& useLocale) const;
-    void  writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const;
-    bool  writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const;
-    void  writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const;
-    void  writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const;
-    void  writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
-    void  writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const;
-    void  writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
+    void  writeIntParameter(const char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const;
+    bool  writeDefaultParameter(const char* pAsciiStr, const OUString& str, sal_Int16 count) const;
+    void  writeParameter(const char* pAsciiStr, const OUString& aChars) const;
+    void  writeParameter(const char* pAsciiStr, const OUString& aChars, sal_Int16 count) const;
+    void  writeParameter(const char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
+    void  writeParameter(const char* pTagStr, const char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const;
+    void  writeParameter(const char* pTagStr, const char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
     void  closeOutput() const;
     /// Return the locale string, something like en_US or de_DE
     const char * getLocale() const { return theLocale.c_str(); }
@@ -69,7 +69,7 @@ class Attr {
 
 public:
     explicit Attr (const Reference< XAttributeList > & attr);
-    OUString getValueByName (const sal_Char *str) const;
+    OUString getValueByName (const char *str) const;
     const OUString& getValueByIndex (sal_Int32 idx) const ;
 };
 
@@ -92,7 +92,7 @@ public:
     const Attr& getAttr() const { return aAttribs; };
     sal_Int32 getNumberOfChildren () const { return sal_Int32(children.size()); };
     LocaleNode * getChildAt (sal_Int32 idx) const { return children[idx].get(); };
-    const LocaleNode * findNode ( const sal_Char *name) const;
+    const LocaleNode * findNode ( const char *name) const;
     virtual ~LocaleNode();
     void addChild (  LocaleNode * node);
     const LocaleNode* getRoot() const;
diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx
index 02540996e3ea..f4652fefd610 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -121,47 +121,47 @@ void OFileWriter::writeRefFunction3(const char *func, const OUString& useLocale)
     fprintf(m_f, "\treturn %s%s(nStyles, nLevels, nAttributes);\n}\n", func, locale);
 }
 
-void OFileWriter::writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const
+void OFileWriter::writeIntParameter(const char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const
 {
     fprintf(m_f, "static const sal_Unicode %s%d[] = {%d};\n", pAsciiStr, count, val);
 }
 
-bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const
+bool OFileWriter::writeDefaultParameter(const char* pAsciiStr, const OUString& str, sal_Int16 count) const
 {
     bool bBool = str == "true";
     fprintf(m_f,"static const sal_Unicode default%s%d[] = {%d};\n", pAsciiStr, count, bBool);
     return bBool;
 }
 
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const
+void OFileWriter::writeParameter(const char* pAsciiStr, const OUString& aChars) const
 {
     fprintf(m_f, "static const sal_Unicode %s[] = {", pAsciiStr);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const
+void OFileWriter::writeParameter(const char* pAsciiStr, const OUString& aChars, sal_Int16 count) const
 {
     fprintf(m_f, "static const sal_Unicode %s%d[] = {", pAsciiStr, count);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
+void OFileWriter::writeParameter(const char* pAsciiStr, const OUString& 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::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const
+void OFileWriter::writeParameter(const char* pTagStr, const char* pAsciiStr, const OUString& 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::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
+void OFileWriter::writeParameter(const char* pTagStr, const char* pAsciiStr, const OUString& 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);
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 91e4c5de21bb..f8ffd6e775bb 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -343,12 +343,12 @@ static const sal_Int16 nbOfLocales = SAL_N_ELEMENTS(aLibTable);
 
 struct LocaleDataLookupTableItem
 {
-    const sal_Char* dllName;
+    const char* dllName;
     osl::Module *module;
-    const sal_Char* localeName;
+    const char* localeName;
     css::lang::Locale aLocale;
 
-    LocaleDataLookupTableItem(const sal_Char *name, osl::Module* m, const sal_Char* lname) : dllName(name), module(m), localeName(lname)
+    LocaleDataLookupTableItem(const char *name, osl::Module* m, const char* lname) : dllName(name), module(m), localeName(lname)
     {
     }
     bool equals(const css::lang::Locale& rLocale)
@@ -485,7 +485,7 @@ public:
     ~lcl_LookupTableHelper();
 
     oslGenericFunction getFunctionSymbolByName(
-            const OUString& localeName, const sal_Char* pFunction,
+            const OUString& localeName, const char* pFunction,
             std::unique_ptr<LocaleDataLookupTableItem>* pOutCachedItem );
 
 private:
@@ -513,7 +513,7 @@ lcl_LookupTableHelper::~lcl_LookupTableHelper()
 }
 
 oslGenericFunction lcl_LookupTableHelper::getFunctionSymbolByName(
-        const OUString& localeName, const sal_Char* pFunction,
+        const OUString& localeName, const char* pFunction,
         std::unique_ptr<LocaleDataLookupTableItem>* pOutCachedItem )
 {
     OUString aFallback;
@@ -1427,7 +1427,7 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale )
 
 // helper functions
 
-oslGenericFunction LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction )
+oslGenericFunction LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const char* pFunction )
 {
     lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get();