#81658# dont use big5 or koi8r for latin chars

2 files changed, 36 insertions, 14 deletions

diff --git a/vcl/unx/source/gdi/salcvt.cxx b/vcl/unx/source/gdi/salcvt.cxx
index 49359471a25f..b598eb875317 100644
--- a/vcl/unx/source/gdi/salcvt.cxx
+++ b/vcl/unx/source/gdi/salcvt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salcvt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:05:43 $
+ *  last change: $Author: cp $ $Date: 2000-12-12 14:42:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -257,6 +257,17 @@ SalConverterCache::EncodingHasChar( rtl_TextEncoding nEncoding,
             bMatch = True;
             break;
 
+        case RTL_TEXTENCODING_EUC_KR:
+        case RTL_TEXTENCODING_BIG5:
+
+            // XXX Big5 and Korean EUC contain Ascii chars, but Solaris
+            // *-big5-1 and *-ksc5601.1992-3 fonts dont
+            if (nChar <= 0xFF)
+            {
+                bMatch = False;
+                break;
+            }
+
         default:
             // XXX really convert the unicode char into the encoding
             // and check for conversion errors, this is expensive !
diff --git a/vcl/unx/source/gdi/xlfd_extd.cxx b/vcl/unx/source/gdi/xlfd_extd.cxx
index a49b54fc1494..224d648f14e5 100644
--- a/vcl/unx/source/gdi/xlfd_extd.cxx
+++ b/vcl/unx/source/gdi/xlfd_extd.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xlfd_extd.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cp $ $Date: 2000-12-10 20:14:58 $
+ *  last change: $Author: cp $ $Date: 2000-12-12 14:43:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -556,17 +556,28 @@ BitmapXlfd::ToString( ByteString &rString,
 
     rString += '-';
     rString += ByteString::CreateFromInt32( mnPixelSize );
-    rString += "-";
-    rString += ByteString::CreateFromInt32( mnPointSize );
-    rString += "-";
-    rString += ByteString::CreateFromInt32( rInfo.mnResolutionX );
-    rString += '-';
-    rString += ByteString::CreateFromInt32( rInfo.mnResolutionY );
-    rString += '-';
+    #ifdef __notdef__
+        // since mnPointSize is not asked when comparing two bitmap font xlfd
+        // it may differ (and it does) for two fonts with same pixelsize
+        rString += "-";
+        rString += ByteString::CreateFromInt32( mnPointSize );
+        rString += "-";
+        rString += ByteString::CreateFromInt32( rInfo.mnResolutionX );
+        rString += '-';
+        rString += ByteString::CreateFromInt32( rInfo.mnResolutionY );
+        rString += '-';
+    #else
+        rString += "-*-*-*-";
+    #endif /* __notdef__ */
+
     rString += rInfo.mcSpacing;
-    rString += '-';
-    // rString += ByteString::CreateFromInt32( mnAverageWidth );
-    rString += '*';
+
+    #ifdef __notdef__
+        rString += '-';
+        rString += ByteString::CreateFromInt32( mnAverageWidth );
+    #else
+        rString += "-*";
+    #endif
 
     AppendAttribute( mpFactory->RetrieveCharset(rInfo.mnCharset), rString );
 }