[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters/kspread/excel/sidewinder
From:       Ariya Hidayat <ariya () kde ! org>
Date:       2003-08-16 22:43:29
[Download RAW message or body]

CVS commit by ariya: 

correctly get font name in Excel 95


  M +4 -2      excel.cpp   1.27


--- koffice/filters/kspread/excel/sidewinder/excel.cpp  #1.26:1.27
@@ -1512,6 +1512,7 @@ void FontRecord::setData( unsigned size,
   setCharacterSet( data[12] );
     
-  // FIXME how about excel < 97 ?
-  UString fn = EString::fromSheetName( data+14, size-14 ).str();
+  UString fn = ( version() >= Excel97 ) ?
+    EString::fromSheetName( data+6, size-6 ).str() :
+    EString::fromByteString( data+14, false, size-14 ).str();
   setFontName( fn );
 }
@@ -3425,4 +3426,5 @@ Format ExcelReader::convertFormat( unsig
   XFRecord xf = d->xfTable[ xfIndex ];  
   unsigned fontIndex = xf.fontIndex();
+  
   if( fontIndex < d->fontTable.size() )
   {


[prev in list] [next in list] [prev in thread] [next in thread]