Attachment #83890 for issue #125400

View | Details | Raw Unified | Return to issue 125400
Collapse All | Expand All




    case SVX_NUM_CHARS_LOWER_LETTER_N:  nRet = 4;       break;
    case SVX_NUM_ROMAN_UPPER:           nRet = 1;       break;
    case SVX_NUM_ROMAN_LOWER:           nRet = 2;       break;
// Mark - append
    case SVX_NUM_FULL_WIDTH_ARABIC:	nRet=19;	break;
    case SVX_NUM_CIRCLE_NUMBER:		nRet=18;	break;
    case SVX_NUM_NUMBER_LOWER_ZH:	

	if (LANGUAGE_CHINESE_SIMPLIFIED == Application::GetSettings().GetLanguage())
	{
		nRet=39;/* 39 for ZH_CN*/
	} else {
		nRet=35;/* 35 for ZH_TW or the others*/
	}


	break; 
    case SVX_NUM_NUMBER_UPPER_ZH:	nRet=38;	break;
    case SVX_NUM_NUMBER_UPPER_ZH_TW:	nRet=34;	break;
    case SVX_NUM_TIAN_GAN_ZH:		nRet=30;	break;
    case SVX_NUM_DI_ZI_ZH:		nRet=31;	break;
/*  -- Not able to test these.
    case SVX_NUM_NUMBER_TRADITIONAL_JA:	nRet=10;	break;
    case SVX_NUM_AIU_FULLWIDTH_JA:	nRet=2046;	break;
    case SVX_NUM_AIU_HALFWIDTH_JA:	nRet=1246;	break;
    case SVX_NUM_IROHA_FULLWIDTH_JA:	nRet=2146;	break;
    case SVX_NUM_IROHA_HALFWIDTH_JA:	nRet=1346;	break;
*/
    case SVX_NUM_BITMAP:
    case SVX_NUM_CHAR_SPECIAL:          nRet = 23;      break;


Lines 117-122 Link Here

(-)main/sw/source/filter/ww8/rtfattributeoutput.cxx (+26 lines)
117	#include <rtl/ustring.hxx>	117	#include <rtl/ustring.hxx>
118	#include <tools/color.hxx>	118	#include <tools/color.hxx>
119	#include <vcl/cvtgrf.hxx>	119	#include <vcl/cvtgrf.hxx>
		120	#include <vcl/svapp.hxx>
120	#include <com/sun/star/i18n/ScriptType.hdl>	121	#include <com/sun/star/i18n/ScriptType.hdl>
121	#include <com/sun/star/drawing/XShape.hpp>	122	#include <com/sun/star/drawing/XShape.hpp>
122	#include <com/sun/star/frame/XModel.hpp>	123	#include <com/sun/star/frame/XModel.hpp>
Lines 1524-1530 Link Here
1524	case SVX_NUM_CHARS_UPPER_LETTER_N: nVal = 3; break;	1525	case SVX_NUM_CHARS_UPPER_LETTER_N: nVal = 3; break;
1525	case SVX_NUM_CHARS_LOWER_LETTER:	1526	case SVX_NUM_CHARS_LOWER_LETTER:
1526	case SVX_NUM_CHARS_LOWER_LETTER_N: nVal = 4; break;	1527	case SVX_NUM_CHARS_LOWER_LETTER_N: nVal = 4; break;
		1528	case SVX_NUM_FULL_WIDTH_ARABIC: nVal=19; break;
		1529	case SVX_NUM_CIRCLE_NUMBER: nVal=18; break;
		1530	case SVX_NUM_NUMBER_LOWER_ZH:
1527		1531
		1532	if (LANGUAGE_CHINESE_SIMPLIFIED ==
		1533	Application::GetSettings().GetLanguage())
		1534	{
		1535	nVal=39;/* 39 for ZH_CN*/
		1536	} else {
		1537	nVal=35;/* 35 for ZH_TW or the others*/
		1538	}
		1539
		1540
		1541	break;
		1542	case SVX_NUM_NUMBER_UPPER_ZH: nVal=38; break;
		1543	case SVX_NUM_NUMBER_UPPER_ZH_TW: nVal=34; break;
		1544	case SVX_NUM_TIAN_GAN_ZH: nVal=30; break;
		1545	case SVX_NUM_DI_ZI_ZH: nVal=31; break;
		1546	/* -- Not able to test these.
		1547	case SVX_NUM_NUMBER_TRADITIONAL_JA: nVal=10; break;
		1548	case SVX_NUM_AIU_FULLWIDTH_JA: nVal=2046; break;
		1549	case SVX_NUM_AIU_HALFWIDTH_JA: nVal=1246; break;
		1550	case SVX_NUM_IROHA_FULLWIDTH_JA: nVal=2146; break;
		1551	case SVX_NUM_IROHA_HALFWIDTH_JA: nVal=1346; break;
		1552	*/
		1553
1528	case SVX_NUM_BITMAP:	1554	case SVX_NUM_BITMAP:
1529	case SVX_NUM_CHAR_SPECIAL: nVal = 23; break;	1555	case SVX_NUM_CHAR_SPECIAL: nVal = 23; break;
1530	}	1556	}





    static SvxAdjust eAdjA[4] =
    { SVX_ADJUST_LEFT, SVX_ADJUST_RIGHT, SVX_ADJUST_LEFT, SVX_ADJUST_LEFT };
    
    if (SVBT8ToByte( rAV.nfc ) < 8) {
    	rNum.SetNumberingType(static_cast< sal_Int16 >(eNumA[SVBT8ToByte( rAV.nfc ) ]));
    } else {
	SvxExtNumType eType = SVX_NUM_ARABIC; // Fallback to ARABIC instead of NONE
	switch(SVBT8ToByte( rAV.nfc )) {
		case 19:eType = SVX_NUM_FULL_WIDTH_ARABIC ;	break;
		case 30:eType = SVX_NUM_TIAN_GAN_ZH ;	break;
		case 31:eType = SVX_NUM_DI_ZI_ZH ;	break;
		case 35:
		case 36:
		case 37:
		case 39: 		
			eType = SVX_NUM_NUMBER_LOWER_ZH ;	break;
		case 34:eType = SVX_NUM_NUMBER_UPPER_ZH_TW ;	break;
		case 38:eType = SVX_NUM_NUMBER_UPPER_ZH ;	break;
	}

    	rNum.SetNumberingType(static_cast< sal_Int16 >(eType));
    }

#if 0
    rNum.SetNumberingType(
        static_cast< sal_Int16 >(( SVBT8ToByte( rAV.nfc ) < 8 )
            ? eNumA[SVBT8ToByte( rAV.nfc ) ]
            : SVX_NUM_NUMBER_NONE) );
#endif

    if ((SVBT8ToByte(rAV.aBits1 ) & 0x4) >> 2)
    {




        case 255:
            eType = SVX_NUM_NUMBER_NONE;
            break;
	case 18: 	eType = SVX_NUM_CIRCLE_NUMBER ;	break;
	case 19: 	eType = SVX_NUM_FULL_WIDTH_ARABIC ;	break;
	case 30: 	eType = SVX_NUM_TIAN_GAN_ZH ;	break;
	case 31: 	eType = SVX_NUM_DI_ZI_ZH ;	break;
	case 35:
	case 36:
	case 37:
	case 39: 		
			eType = SVX_NUM_NUMBER_LOWER_ZH ;	break;
	case 34: 	eType = SVX_NUM_NUMBER_UPPER_ZH_TW ;	break;
	case 38: 	eType = SVX_NUM_NUMBER_UPPER_ZH ;	break;
/*	Not able to test with these yet - need to verify with Japanese MSO
	case 10: 		
	case 11:
			eType = SVX_NUM_NUMBER_TRADITIONAL_JA ;	break;
	case 2046: 	eType = SVX_NUM_AIU_FULLWIDTH_JA ;	break;
	case 1246: 	eType = SVX_NUM_AIU_HALFWIDTH_JA ;	break;
	case 2146: 	eType = SVX_NUM_IROHA_FULLWIDTH_JA ;	break;
	case 1346: 	eType = SVX_NUM_IROHA_HALFWIDTH_JA ;	break;
*/
         default:
            // take default
            eType = SVX_NUM_ARABIC;




				case 4:		eType = SVX_NUM_CHARS_LOWER_LETTER_N;	break;
				case 255:
				case 23:	eType = SVX_NUM_CHAR_SPECIAL;			break;
				case 19: 	eType = SVX_NUM_FULL_WIDTH_ARABIC ;	break;
				case 18: 	eType = SVX_NUM_CIRCLE_NUMBER ;	break;
				case 35:
				case 36:
				case 37:
				case 39: 		
						eType = SVX_NUM_NUMBER_LOWER_ZH ;	break;
				case 38: 	eType = SVX_NUM_NUMBER_UPPER_ZH ;	break;
				case 34: 	eType = SVX_NUM_NUMBER_UPPER_ZH_TW ;	break;
				case 30: 	eType = SVX_NUM_TIAN_GAN_ZH ;	break;
				case 31: 	eType = SVX_NUM_DI_ZI_ZH ;	break;
/*	Not able to test with these yet - need to verify with Japanese MSO
				case 10: 		
				case 11:
						eType = SVX_NUM_NUMBER_TRADITIONAL_JA ;	break;
				case 2046: 	eType = SVX_NUM_AIU_FULLWIDTH_JA ;	break;
				case 1246: 	eType = SVX_NUM_AIU_HALFWIDTH_JA ;	break;
				case 2146: 	eType = SVX_NUM_IROHA_FULLWIDTH_JA ;	break;
				case 1346: 	eType = SVX_NUM_IROHA_HALFWIDTH_JA ;	break;
*/
				}
				if( pCurNumFmt )
					pCurNumFmt->SetNumberingType(eType);

Lines 645-650 Link Here

(-)main/writerfilter/source/dmapper/ConversionHelper.cxx (+4 lines)
645	case NS_ooxml::LN_Value_ST_NumberFormat_chineseCounting:	645	case NS_ooxml::LN_Value_ST_NumberFormat_chineseCounting:
646	case NS_ooxml::LN_Value_ST_NumberFormat_japaneseCounting:	646	case NS_ooxml::LN_Value_ST_NumberFormat_japaneseCounting:
647	case NS_ooxml::LN_Value_ST_NumberFormat_taiwaneseCounting:	647	case NS_ooxml::LN_Value_ST_NumberFormat_taiwaneseCounting:
		648	case NS_ooxml::LN_Value_ST_NumberFormat_taiwaneseCountingThousand:
648	case NS_ooxml::LN_Value_ST_NumberFormat_ideographDigital:	649	case NS_ooxml::LN_Value_ST_NumberFormat_ideographDigital:
649	case NS_ooxml::LN_Value_ST_NumberFormat_chineseCountingThousand:	650	case NS_ooxml::LN_Value_ST_NumberFormat_chineseCountingThousand:
650	nRet = style::NumberingType::NUMBER_LOWER_ZH;	651	nRet = style::NumberingType::NUMBER_LOWER_ZH;
Lines 652-657 Link Here
652	case NS_ooxml::LN_Value_ST_NumberFormat_chineseLegalSimplified:	653	case NS_ooxml::LN_Value_ST_NumberFormat_chineseLegalSimplified:
653	nRet = style::NumberingType::NUMBER_UPPER_ZH;	654	nRet = style::NumberingType::NUMBER_UPPER_ZH;
654	break;	655	break;
		656	case NS_ooxml::LN_Value_ST_NumberFormat_decimalFullWidth:
		657	nRet = style::NumberingType::FULLWIDTH_ARABIC;
		658	break;
655	default: nRet = style::NumberingType::ARABIC;	659	default: nRet = style::NumberingType::ARABIC;
656	}	660	}
657	/* TODO: Lots of additional values are available - some are supported in the I18 framework	661	/* TODO: Lots of additional values are available - some are supported in the I18 framework

Return to issue 125400

Lines 669-675 Link Here

(-)main/sw/source/filter/ww8/ww8atr.cxx (+24 lines)
669	case SVX_NUM_CHARS_LOWER_LETTER_N: nRet = 4; break;	669	case SVX_NUM_CHARS_LOWER_LETTER_N: nRet = 4; break;
670	case SVX_NUM_ROMAN_UPPER: nRet = 1; break;	670	case SVX_NUM_ROMAN_UPPER: nRet = 1; break;
671	case SVX_NUM_ROMAN_LOWER: nRet = 2; break;	671	case SVX_NUM_ROMAN_LOWER: nRet = 2; break;
		672	// Mark - append
		673	case SVX_NUM_FULL_WIDTH_ARABIC: nRet=19; break;
		674	case SVX_NUM_CIRCLE_NUMBER: nRet=18; break;
		675	case SVX_NUM_NUMBER_LOWER_ZH:
672		676
		677	if (LANGUAGE_CHINESE_SIMPLIFIED == Application::GetSettings().GetLanguage())
		678	{
		679	nRet=39;/* 39 for ZH_CN*/
		680	} else {
		681	nRet=35;/* 35 for ZH_TW or the others*/
		682	}
		683
		684
		685	break;
		686	case SVX_NUM_NUMBER_UPPER_ZH: nRet=38; break;
		687	case SVX_NUM_NUMBER_UPPER_ZH_TW: nRet=34; break;
		688	case SVX_NUM_TIAN_GAN_ZH: nRet=30; break;
		689	case SVX_NUM_DI_ZI_ZH: nRet=31; break;
		690	/* -- Not able to test these.
		691	case SVX_NUM_NUMBER_TRADITIONAL_JA: nRet=10; break;
		692	case SVX_NUM_AIU_FULLWIDTH_JA: nRet=2046; break;
		693	case SVX_NUM_AIU_HALFWIDTH_JA: nRet=1246; break;
		694	case SVX_NUM_IROHA_FULLWIDTH_JA: nRet=2146; break;
		695	case SVX_NUM_IROHA_HALFWIDTH_JA: nRet=1346; break;
		696	*/
673	case SVX_NUM_BITMAP:	697	case SVX_NUM_BITMAP:
674	case SVX_NUM_CHAR_SPECIAL: nRet = 23; break;	698	case SVX_NUM_CHAR_SPECIAL: nRet = 23; break;
675		699

Lines 790-795 Link Here

(-)main/sw/source/filter/ww8/ww8par3.cxx (+20 lines)
790	case 255:	790	case 255:
791	eType = SVX_NUM_NUMBER_NONE;	791	eType = SVX_NUM_NUMBER_NONE;
792	break;	792	break;
		793	case 18: eType = SVX_NUM_CIRCLE_NUMBER ; break;
		794	case 19: eType = SVX_NUM_FULL_WIDTH_ARABIC ; break;
		795	case 30: eType = SVX_NUM_TIAN_GAN_ZH ; break;
		796	case 31: eType = SVX_NUM_DI_ZI_ZH ; break;
		797	case 35:
		798	case 36:
		799	case 37:
		800	case 39:
		801	eType = SVX_NUM_NUMBER_LOWER_ZH ; break;
		802	case 34: eType = SVX_NUM_NUMBER_UPPER_ZH_TW ; break;
		803	case 38: eType = SVX_NUM_NUMBER_UPPER_ZH ; break;
		804	/* Not able to test with these yet - need to verify with Japanese MSO
		805	case 10:
		806	case 11:
		807	eType = SVX_NUM_NUMBER_TRADITIONAL_JA ; break;
		808	case 2046: eType = SVX_NUM_AIU_FULLWIDTH_JA ; break;
		809	case 1246: eType = SVX_NUM_AIU_HALFWIDTH_JA ; break;
		810	case 2146: eType = SVX_NUM_IROHA_FULLWIDTH_JA ; break;
		811	case 1346: eType = SVX_NUM_IROHA_HALFWIDTH_JA ; break;
		812	*/
793	default:	813	default:
794	// take default	814	// take default
795	eType = SVX_NUM_ARABIC;	815	eType = SVX_NUM_ARABIC;

Lines 161-166 Link Here

(-)main/sw/source/filter/rtf/rtfnum.cxx (+20 lines)
161	case 4: eType = SVX_NUM_CHARS_LOWER_LETTER_N; break;	161	case 4: eType = SVX_NUM_CHARS_LOWER_LETTER_N; break;
162	case 255:	162	case 255:
163	case 23: eType = SVX_NUM_CHAR_SPECIAL; break;	163	case 23: eType = SVX_NUM_CHAR_SPECIAL; break;
		164	case 19: eType = SVX_NUM_FULL_WIDTH_ARABIC ; break;
		165	case 18: eType = SVX_NUM_CIRCLE_NUMBER ; break;
		166	case 35:
		167	case 36:
		168	case 37:
		169	case 39:
		170	eType = SVX_NUM_NUMBER_LOWER_ZH ; break;
		171	case 38: eType = SVX_NUM_NUMBER_UPPER_ZH ; break;
		172	case 34: eType = SVX_NUM_NUMBER_UPPER_ZH_TW ; break;
		173	case 30: eType = SVX_NUM_TIAN_GAN_ZH ; break;
		174	case 31: eType = SVX_NUM_DI_ZI_ZH ; break;
		175	/* Not able to test with these yet - need to verify with Japanese MSO
		176	case 10:
		177	case 11:
		178	eType = SVX_NUM_NUMBER_TRADITIONAL_JA ; break;
		179	case 2046: eType = SVX_NUM_AIU_FULLWIDTH_JA ; break;
		180	case 1246: eType = SVX_NUM_AIU_HALFWIDTH_JA ; break;
		181	case 2146: eType = SVX_NUM_IROHA_FULLWIDTH_JA ; break;
		182	case 1346: eType = SVX_NUM_IROHA_HALFWIDTH_JA ; break;
		183	*/
164	}	184	}
165	if( pCurNumFmt )	185	if( pCurNumFmt )
166	pCurNumFmt->SetNumberingType(eType);	186	pCurNumFmt->SetNumberingType(eType);

Lines 648-658 Link Here

(-)main/sw/source/filter/ww8/ww8par2.cxx (+22 lines)
648		648
649	static SvxAdjust eAdjA[4] =	649	static SvxAdjust eAdjA[4] =
650	{ SVX_ADJUST_LEFT, SVX_ADJUST_RIGHT, SVX_ADJUST_LEFT, SVX_ADJUST_LEFT };	650	{ SVX_ADJUST_LEFT, SVX_ADJUST_RIGHT, SVX_ADJUST_LEFT, SVX_ADJUST_LEFT };
		651
		652	if (SVBT8ToByte( rAV.nfc ) < 8) {
		653	rNum.SetNumberingType(static_cast< sal_Int16 >(eNumA[SVBT8ToByte( rAV.nfc ) ]));
		654	} else {
		655	SvxExtNumType eType = SVX_NUM_ARABIC; // Fallback to ARABIC instead of NONE
		656	switch(SVBT8ToByte( rAV.nfc )) {
		657	case 19:eType = SVX_NUM_FULL_WIDTH_ARABIC ; break;
		658	case 30:eType = SVX_NUM_TIAN_GAN_ZH ; break;
		659	case 31:eType = SVX_NUM_DI_ZI_ZH ; break;
		660	case 35:
		661	case 36:
		662	case 37:
		663	case 39:
		664	eType = SVX_NUM_NUMBER_LOWER_ZH ; break;
		665	case 34:eType = SVX_NUM_NUMBER_UPPER_ZH_TW ; break;
		666	case 38:eType = SVX_NUM_NUMBER_UPPER_ZH ; break;
		667	}
651		668
		669	rNum.SetNumberingType(static_cast< sal_Int16 >(eType));
		670	}
		671
		672	#if 0
652	rNum.SetNumberingType(	673	rNum.SetNumberingType(
653	static_cast< sal_Int16 >(( SVBT8ToByte( rAV.nfc ) < 8 )	674	static_cast< sal_Int16 >(( SVBT8ToByte( rAV.nfc ) < 8 )
654	? eNumA[SVBT8ToByte( rAV.nfc ) ]	675	? eNumA[SVBT8ToByte( rAV.nfc ) ]
655	: SVX_NUM_NUMBER_NONE) );	676	: SVX_NUM_NUMBER_NONE) );
		677	#endif
656		678
657	if ((SVBT8ToByte(rAV.aBits1 ) & 0x4) >> 2)	679	if ((SVBT8ToByte(rAV.aBits1 ) & 0x4) >> 2)
658	{	680	{