createFromAscii -> OUString literals in ConvertChar

Change-Id: Ib430f39042e50036821e957b3406f07276a63fb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167562
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins

2 files changed, 24 insertions, 25 deletions

diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index ef03e8887a4b..55b70808ceae 100644
--- a/include/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.hxx
@@ -49,7 +49,7 @@ class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) ConvertChar
 {
 public:
     const sal_Unicode*  mpCvtTab;
-    const char*         mpSubsFontName;
+    OUString            maSubsFontName;
     sal_Unicode         (*mpCvtFunc)( sal_Unicode );
     sal_Unicode         RecodeChar( sal_Unicode c ) const;
     void                RecodeString( OUString& rStra, sal_Int32 nIndex, sal_Int32 nLen ) const;
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 60d2edb7788b..df15d9fcdc6e 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1256,9 +1256,9 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const
         {
             cRetVal = mpCvtTab[ cIndex - 0x0020 ];
 
-            if (!cRetVal && mpSubsFontName)
+            if (!cRetVal && !maSubsFontName.isEmpty())
             {
-                if ( IsOpenSymbol( OUString::createFromAscii(mpSubsFontName) ) )
+                if ( IsOpenSymbol( maSubsFontName ) )
                 {
                     cRetVal = 0xE12C;
                     SAL_WARN( "unotools.misc", "Forcing a bullet substitution from 0x" <<
@@ -1308,31 +1308,31 @@ const RecodeTable aStarSymbolRecodeTable[] =
 {
     // the first two entries must be StarMath and StarBats; do not reorder!
     // reason: see CreateFontToSubsFontConverter method
-    {"starbats",        {aStarBatsTab,  "StarSymbol", nullptr}},
-    {"starmath",        {aStarMathTab,  "StarSymbol", nullptr}},
-
-    {"symbol",          {aAdobeSymbolTab, "StarSymbol", nullptr}},
-    {"standardsymbols", {aAdobeSymbolTab, "StarSymbol", nullptr}},
-    {"standardsymbolsl",{aAdobeSymbolTab, "StarSymbol", nullptr}},
-
-    {"monotypesorts",   {aMonotypeSortsTab, "StarSymbol", nullptr}},
-//  {"monotypesorts2",  {aMonotypeSorts2Tab, "StarSymbol", NULL}}
-    {"zapfdingbats",    {aMonotypeSortsTab, "StarSymbol", nullptr}},  //ZapfDingbats=MonotypeSorts-X?
-    {"itczapfdingbats", {aMonotypeSortsTab, "StarSymbol", nullptr}},
-    {"dingbats",        {aMonotypeSortsTab, "StarSymbol", nullptr}},
-
-    {"webdings",        {aWebDingsTab,   "StarSymbol", nullptr}},
-    {"wingdings",       {aWingDingsTab,  "StarSymbol", nullptr}},
-    {"wingdings2",      {aWingDings2Tab, "StarSymbol", nullptr}},
-    {"wingdings3",      {aWingDings3Tab, "StarSymbol", nullptr}},
-    {"mtextra",         {aMTExtraTab, "StarSymbol", nullptr}}
+    {"starbats",        {aStarBatsTab,  u"StarSymbol"_ustr, nullptr}},
+    {"starmath",        {aStarMathTab,  u"StarSymbol"_ustr, nullptr}},
+
+    {"symbol",          {aAdobeSymbolTab, u"StarSymbol"_ustr, nullptr}},
+    {"standardsymbols", {aAdobeSymbolTab, u"StarSymbol"_ustr, nullptr}},
+    {"standardsymbolsl",{aAdobeSymbolTab, u"StarSymbol"_ustr, nullptr}},
+
+    {"monotypesorts",   {aMonotypeSortsTab, u"StarSymbol"_ustr, nullptr}},
+//  {"monotypesorts2",  {aMonotypeSorts2Tab, u"StarSymbol"_ustr, NULL}}
+    {"zapfdingbats",    {aMonotypeSortsTab, u"StarSymbol"_ustr, nullptr}},  //ZapfDingbats=MonotypeSorts-X?
+    {"itczapfdingbats", {aMonotypeSortsTab, u"StarSymbol"_ustr, nullptr}},
+    {"dingbats",        {aMonotypeSortsTab, u"StarSymbol"_ustr, nullptr}},
+
+    {"webdings",        {aWebDingsTab,   u"StarSymbol"_ustr, nullptr}},
+    {"wingdings",       {aWingDingsTab,  u"StarSymbol"_ustr, nullptr}},
+    {"wingdings2",      {aWingDings2Tab, u"StarSymbol"_ustr, nullptr}},
+    {"wingdings3",      {aWingDings3Tab, u"StarSymbol"_ustr, nullptr}},
+    {"mtextra",         {aMTExtraTab, u"StarSymbol"_ustr, nullptr}}
 };
 
 const RecodeTable aAppleSymbolRecodeTable[] = {
-    {"symbol",         {aAdobeSymbolToAppleSymbolTab, "AppleSymbol", nullptr}}
+    {"symbol",         {aAdobeSymbolToAppleSymbolTab, u"AppleSymbol"_ustr, nullptr}}
 };
 
-static ConvertChar aImplStarSymbolCvt = { nullptr, "StarBats", ImplStarSymbolToStarBats };
+static ConvertChar aImplStarSymbolCvt = { nullptr, u"StarBats"_ustr, ImplStarSymbolToStarBats };
 
 const ConvertChar* ConvertChar::GetRecodeData( std::u16string_view rOrgFontName, std::u16string_view rMapFontName )
 {
@@ -1424,8 +1424,7 @@ OUString GetFontToSubsFontName( FontToSubsFontConverter hConverter )
     if ( !hConverter )
         return OUString();
 
-    const char* pName = static_cast<ConvertChar*>(hConverter)->mpSubsFontName;
-    return OUString::createFromAscii( pName );
+    return static_cast<ConvertChar*>(hConverter)->maSubsFontName;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */