commit: abi (BOTH): Helvetic Bug 8461

Changing "Helvetica" to "Helvetic" is a painful hack and not necessary,
afaik, on MacOSX. Perhaps it's only necessary on Windows? I don't know.

o for XP_TARGET_COCOA don't convert Helvetica to Helvetic during RTF
import
CVS:
----------------------------------------------------------------------
CVS: Enter Log. Lines beginning with `CVS:' are removed automatically
CVS:
CVS: Committing in .
CVS:
CVS: Modified Files:
CVS: Tag: ABI-2-2-0-STABLE
CVS: src/wp/impexp/xp/ie_imp_RTF.cpp
CVS:
----------------------------------------------------------------------

Regards, Frank

--- abi/src/wp/impexp/xp/ie_imp_RTF.cpp.~1.347.2.4.~ Thu Feb 24
07:49:25 2005
+++ abi/src/wp/impexp/xp/ie_imp_RTF.cpp Sat Feb 26 11:56:00 2005
@@ -7911,11 +7911,13 @@
         }

         keyword[count] = 0;
+#ifndef XP_TARGET_COCOA
         /*work around "helvetica" font name -replace it with
"Helvetic"*/
         if
(!UT_stricmp(reinterpret_cast<char*>(&keyword[0]),"helvetica"))
         {
                 strcpy(reinterpret_cast<char*>(&keyword[0]),"Helvetic");
         }
+#endif /* ! XP_TARGET_COCOA */

         if (!UT_cloneString(pFontName,
reinterpret_cast<char*>(&keyword[0])))
         {
Received on Sat Feb 26 13:13:00 2005