[Libwpd-cvs] libwpd2/src/lib libwpd_internal.cpp,1.10.2.4,1.10.2.5

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/libwpd/libwpd2/src/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14005/src/lib

Modified Files:
      Tag: fs_refactoring1
	libwpd_internal.cpp 
Log Message:
synchronizing with HEAD


Index: libwpd_internal.cpp
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -C2 -d -r1.10.2.4 -r1.10.2.5
*** libwpd_internal.cpp	18 Jun 2005 06:57:20 -0000	1.10.2.4
--- libwpd_internal.cpp	19 Jun 2005 19:20:21 -0000	1.10.2.5
***************
*** 493,561 ****
  	{
  	case WP6_MULTINATIONAL_CHARACTER_SET:
! 		if (character < WP6_NUM_MULTINATIONAL_CHARACTERS) {
  			*chars = &multinationalWP6[character];
! 			return 1;
! 		}
! 
  	case WP6_PHONETIC_SYMBOL_CHARACTER_SET:
! 		if (character < WP6_NUM_PHONETIC_CHARACTERS) {
  			*chars = &phoneticWP6[character];
! 			return 1;
! 		}
  
  	case WP6_BOX_DRAWING_CHARACTER_SET:
! 		if (character < WP6_NUM_BOX_DRAWING_CHARACTERS) {
  			*chars = &boxdrawingWP6[character];
! 			return 1;
! 		}
! 
  
  	case WP6_TYPOGRAPHIC_SYMBOL_CHARACTER_SET:
! 		if (character < WP6_NUM_TYPOGRAPHIC_CHARACTERS) {
  			*chars = &typographicWP6[character];
! 			return 1;
! 		}
  
  	case WP6_ICONIC_SYMBOL_CHARACTER_SET:
! 		if (character < WP6_NUM_ICONIC_CHARACTERS) {
  			*chars = &iconicWP6[character];
! 			return 1;
! 		}
  
  	case WP6_MATH_SCIENTIFIC_CHARACTER_SET:
! 		if (character < WP6_NUM_MATH_SCIENTIFIC_CHARACTERS) {
  			*chars = &mathWP6[character];
! 			return 1;
! 		}
  
  	case WP6_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET:
! 		if (character < WP6_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS) {
  			*chars = &mathextWP6[character];
! 			return 1;
! 		}
  
  	case WP6_GREEK_CHARACTER_SET:
! 		if (character < WP6_NUM_GREEK_CHARACTERS) {
  			*chars = &greekWP6[character];
! 			return 1;
! 		}
  
  	case WP6_HEBREW_CHARACTER_SET:
! 		if (character < WP6_NUM_HEBREW_CHARACTERS) {
  			*chars = &hebrewWP6[character];
! 			return 1;
! 		}
  
  	case WP6_CYRILLIC_CHARACTER_SET:
! 		if (character < WP6_NUM_CYRILLIC_CHARACTERS) {
  			*chars = &cyrillicWP6[character];
! 			return 1;
! 		}
  
  	case WP6_JAPANESE_CHARACTER_SET:
! 		if (character < WP6_NUM_JAPANESE_CHARACTERS) {
  			*chars = &japaneseWP6[character];
! 			return 1;
! 		}
  
  	case WP6_TIBETAN_CHARACTER_SET:
--- 493,571 ----
  	{
  	case WP6_MULTINATIONAL_CHARACTER_SET:
! 		if (character < WP6_NUM_MULTINATIONAL_CHARACTERS)
  			*chars = &multinationalWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
! 		
  	case WP6_PHONETIC_SYMBOL_CHARACTER_SET:
! 		if (character < WP6_NUM_PHONETIC_CHARACTERS)
  			*chars = &phoneticWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_BOX_DRAWING_CHARACTER_SET:
! 		if (character < WP6_NUM_BOX_DRAWING_CHARACTERS)
  			*chars = &boxdrawingWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_TYPOGRAPHIC_SYMBOL_CHARACTER_SET:
! 		if (character < WP6_NUM_TYPOGRAPHIC_CHARACTERS)
  			*chars = &typographicWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_ICONIC_SYMBOL_CHARACTER_SET:
! 		if (character < WP6_NUM_ICONIC_CHARACTERS)
  			*chars = &iconicWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_MATH_SCIENTIFIC_CHARACTER_SET:
! 		if (character < WP6_NUM_MATH_SCIENTIFIC_CHARACTERS)
  			*chars = &mathWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET:
! 		if (character < WP6_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS)
  			*chars = &mathextWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_GREEK_CHARACTER_SET:
! 		if (character < WP6_NUM_GREEK_CHARACTERS)
  			*chars = &greekWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_HEBREW_CHARACTER_SET:
! 		if (character < WP6_NUM_HEBREW_CHARACTERS)
  			*chars = &hebrewWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_CYRILLIC_CHARACTER_SET:
! 		if (character < WP6_NUM_CYRILLIC_CHARACTERS)
  			*chars = &cyrillicWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_JAPANESE_CHARACTER_SET:
! 		if (character < WP6_NUM_JAPANESE_CHARACTERS)
  			*chars = &japaneseWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_TIBETAN_CHARACTER_SET:
***************
*** 566,581 ****
  			return i;
  		}
  
  	case WP6_ARABIC_CHARACTER_SET:
! 		if (character < WP6_NUM_ARABIC_CHARACTERS) {
  			*chars = &arabicWP6[character];
! 			return 1;
! 		}
  
  	case WP6_ARABIC_SCRIPT_CHARACTER_SET:
! 		if (character < WP6_NUM_ARABIC_SCRIPT_CHARACTERS) {
  			*chars = &arabicScriptWP6[character];
! 			return 1;
! 		}
  	}
  
--- 576,597 ----
  			return i;
  		}
+ 		else {
+ 			*chars = &asciiMap[' '];
+ 			return 1;
+ 		}
  
  	case WP6_ARABIC_CHARACTER_SET:
! 		if (character < WP6_NUM_ARABIC_CHARACTERS)
  			*chars = &arabicWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP6_ARABIC_SCRIPT_CHARACTER_SET:
! 		if (character < WP6_NUM_ARABIC_SCRIPT_CHARACTERS)
  			*chars = &arabicScriptWP6[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  	}
  
***************
*** 860,928 ****
  	{
  	case WP5_INTERNATIONAL_1_CHARACTER_SET:
! 		if (character < WP5_NUM_INTERNATIONAL_1_CHARACTERS) {
  			*chars = &international1WP5[character];
! 			return 1;
! 		}
  
  	case WP5_INTERNATIONAL_2_CHARACTER_SET:
! 		if (character < WP5_NUM_INTERNATIONAL_2_CHARACTERS) {
  			*chars = &international2WP5[character];
! 			return 1;
! 		}
  
  	case WP5_BOX_DRAWING_CHARACTER_SET:
! 		if (character < WP5_NUM_BOX_DRAWING_CHARACTERS) {
  			*chars = &boxdrawingWP5[character];
! 			return 1;
! 		}
! 
  
  	case WP5_TYPOGRAPHIC_SYMBOL_CHARACTER_SET:
! 		if (character < WP5_NUM_TYPOGRAPHIC_CHARACTERS) {
  			*chars = &typographicWP5[character];
! 			return 1;
! 		}
  
  	case WP5_ICONIC_SYMBOL_CHARACTER_SET:
! 		if (character < WP5_NUM_ICONIC_CHARACTERS) {
  			*chars = &iconicWP5[character];
! 			return 1;
! 		}
  
  	case WP5_MATH_SCIENTIFIC_CHARACTER_SET:
! 		if (character < WP5_NUM_MATH_SCIENTIFIC_CHARACTERS) {
  			*chars = &mathWP5[character];
! 			return 1;
! 		}
  
  	case WP5_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET:
! 		if (character < WP5_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS) {
  			*chars = &mathextWP5[character];
! 			return 1;
! 		}
  
  	case WP5_GREEK_CHARACTER_SET:
! 		if (character < WP5_NUM_GREEK_CHARACTERS) {
  			*chars = &greekWP5[character];
! 			return 1;
! 		}
  
  	case WP5_HEBREW_CHARACTER_SET:
! 		if (character < WP5_NUM_HEBREW_CHARACTERS) {
  			*chars = &hebrewWP5[character];
! 			return 1;
! 		}
  
  	case WP5_CYRILLIC_CHARACTER_SET:
! 		if (character < WP5_NUM_CYRILLIC_CHARACTERS) {
  			*chars = &cyrillicWP5[character];
  			return 1;
- 		}
  
  	case WP5_JAPANESE_CHARACTER_SET:
! 		if (character < WP5_NUM_JAPANESE_CHARACTERS) {
  			*chars = &japaneseWP5[character];
! 			return 1;
! 		}
  	}
  
--- 876,952 ----
  	{
  	case WP5_INTERNATIONAL_1_CHARACTER_SET:
! 		if (character < WP5_NUM_INTERNATIONAL_1_CHARACTERS)
  			*chars = &international1WP5[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP5_INTERNATIONAL_2_CHARACTER_SET:
! 		if (character < WP5_NUM_INTERNATIONAL_2_CHARACTERS)
  			*chars = &international2WP5[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP5_BOX_DRAWING_CHARACTER_SET:
! 		if (character < WP5_NUM_BOX_DRAWING_CHARACTERS)
  			*chars = &boxdrawingWP5[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP5_TYPOGRAPHIC_SYMBOL_CHARACTER_SET:
! 		if (character < WP5_NUM_TYPOGRAPHIC_CHARACTERS)
  			*chars = &typographicWP5[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP5_ICONIC_SYMBOL_CHARACTER_SET:
! 		if (character < WP5_NUM_ICONIC_CHARACTERS)
  			*chars = &iconicWP5[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP5_MATH_SCIENTIFIC_CHARACTER_SET:
! 		if (character < WP5_NUM_MATH_SCIENTIFIC_CHARACTERS)
  			*chars = &mathWP5[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP5_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET:
! 		if (character < WP5_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS)
  			*chars = &mathextWP5[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP5_GREEK_CHARACTER_SET:
! 		if (character < WP5_NUM_GREEK_CHARACTERS)
  			*chars = &greekWP5[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP5_HEBREW_CHARACTER_SET:
! 		if (character < WP5_NUM_HEBREW_CHARACTERS)
  			*chars = &hebrewWP5[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  
  	case WP5_CYRILLIC_CHARACTER_SET:
! 		if (character < WP5_NUM_CYRILLIC_CHARACTERS)
  			*chars = &cyrillicWP5[character];
  			return 1;
  
  	case WP5_JAPANESE_CHARACTER_SET:
! 		if (character < WP5_NUM_JAPANESE_CHARACTERS)
  			*chars = &japaneseWP5[character];
! 		else
! 			*chars = &asciiMap[' '];
! 		return 1;
  	}