Attachment #79256 for issue #120773

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




	SVX_NUM_PAGEDESC,   	// Numerierung aus der Seitenvorlage
	SVX_NUM_BITMAP,
	SVX_NUM_CHARS_UPPER_LETTER_N, // zaehlt von  a-z, aa-zz, aaa-zzz
	SVX_NUM_CHARS_LOWER_LETTER_N,
	SVX_NUM_TRANSLITERATION,
	SVX_NUM_NATIVE_NUMBERING,
	SVX_NUM_FULL_WIDTH_ARABIC,
	SVX_NUM_CIRCLE_NUMBER,
	SVX_NUM_NUMBER_LOWER_ZH,
	SVX_NUM_NUMBER_UPPER_ZH,
	SVX_NUM_NUMBER_UPPER_ZH_TW,
	SVX_NUM_TIAN_GAN_ZH,
	SVX_NUM_DI_ZI_ZH,
    SVX_NUM_NUMBER_TRADITIONAL_JA,
    SVX_NUM_AIU_FULLWIDTH_JA,
    SVX_NUM_AIU_HALFWIDTH_JA,
    SVX_NUM_IROHA_FULLWIDTH_JA,
    SVX_NUM_IROHA_HALFWIDTH_JA
};






				rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) );
			}
			break;
			case 16: // Simplified Chinese.
			{
				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
			}
			break;			
			case 17: // Simplified Chinese with single-byte period.
			{
				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
				rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
			}
			break;
			case 18: // Double byte circle numbers.
			case 19: // Wingdings white circle numbers.
			case 20: // Wingdings black circle numbers.
			{
				rNumberFormat.SetNumberingType( SVX_NUM_CIRCLE_NUMBER );
			}
			break;
			case 21: // Traditional Chinese.
			{
				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
			}
			break;
			case 22: // Traditional Chinese with single-byte period.
			{
				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
				rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
			}
			break;
			case 26: // Japanese/Korean.
			{
				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
			}
			break;
			case 27: // Japanese/Korean with single-byte period.
			{
				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
				rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
			}
			break;
			case 28: // Double-byte Arabic numbers.
			{
				rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
			}
			break;
			case 29: // Double-byte Arabic numbers with double-byte period.
			{
				rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
				rNumberFormat.SetSuffix( String( sal_Unicode(0xff0e) ) );
			}
			break;
			case 38: // Japanese with double-byte period.
			{
				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH ); // No such type. Instead with Lower Chinese Number
				rNumberFormat.SetSuffix( String( sal_Unicode(0xff0e) ) );
			}
			break;
		}
		rStartNumbering = boost::optional< sal_Int16 >( nAnmScheme >> 16 );
	}

Lines 2672-2677 Link Here

(-)main/sd/source/filter/eppt/epptso.cxx (+49 lines)
2672	case SVX_NUM_BITMAP :	2672	case SVX_NUM_BITMAP :
2673	case SVX_NUM_CHARS_UPPER_LETTER_N : // zaehlt von a-z, aa-zz, aaa-zzz	2673	case SVX_NUM_CHARS_UPPER_LETTER_N : // zaehlt von a-z, aa-zz, aaa-zzz
2674	case SVX_NUM_CHARS_LOWER_LETTER_N :	2674	case SVX_NUM_CHARS_LOWER_LETTER_N :
		2675	case SVX_NUM_NUMBER_UPPER_ZH:
		2676	case SVX_NUM_CIRCLE_NUMBER:
		2677	case SVX_NUM_NUMBER_UPPER_ZH_TW:
		2678	case SVX_NUM_NUMBER_LOWER_ZH:
		2679	case SVX_NUM_FULL_WIDTH_ARABIC:
2675	{	2680	{
2676	if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )	2681	if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
2677	{	2682	{
Lines 2757-2762 Link Here
2757	}	2762	}
2758	}	2763	}
2759	break;	2764	break;
		2765	case SVX_NUM_NUMBER_UPPER_ZH :
		2766	{
		2767	if ( sSuffix.Len() )
		2768	nMappedNumType = 0x110001; // Simplified Chinese with single-byte period.
		2769	else
		2770	nMappedNumType = 0x100001; // Simplified Chinese.
		2771	}
		2772	break;
		2773	case SVX_NUM_CIRCLE_NUMBER :
		2774	{
		2775	nMappedNumType = 0x120001; // Double byte circle numbers.
		2776	}
		2777	break;
		2778	case SVX_NUM_NUMBER_UPPER_ZH_TW :
		2779	{
		2780	if ( sSuffix.Len() )
		2781	nMappedNumType = 0x160001; // Traditional Chinese with single-byte period.
		2782	else
		2783	nMappedNumType = 0x150001; // Traditional Chinese.
		2784	}
		2785	break;
		2786	case SVX_NUM_NUMBER_LOWER_ZH :
		2787	{
		2788	if ( sSuffix == String( sal_Unicode(0xff0e)) )
		2789	nMappedNumType = 0x260001; // Japanese with double-byte period.
		2790	else if ( sSuffix.Len() )
		2791	nMappedNumType = 0x1B0001; // Japanese/Korean with single-byte period.
		2792	else
		2793	nMappedNumType = 0x1A0001; // Japanese/Korean.
		2794	}
		2795	break;
		2796	case SVX_NUM_FULL_WIDTH_ARABIC :
		2797	{
		2798	if ( sSuffix.Len() )
		2799	nMappedNumType = 0x1D0001; // Double-byte Arabic numbers with double-byte period.
		2800	else
		2801	nMappedNumType = 0x1C0001; // Double-byte Arabic numbers.
		2802	}
		2803	break;
2760	default:	2804	default:
2761	break;	2805	break;
2762	}	2806	}
Lines 3397-3402 Link Here
3397	case SVX_NUM_ROMAN_UPPER :	3441	case SVX_NUM_ROMAN_UPPER :
3398	case SVX_NUM_ROMAN_LOWER :	3442	case SVX_NUM_ROMAN_LOWER :
3399	case SVX_NUM_ARABIC :	3443	case SVX_NUM_ARABIC :
		3444	case SVX_NUM_NUMBER_UPPER_ZH:
		3445	case SVX_NUM_CIRCLE_NUMBER:
		3446	case SVX_NUM_NUMBER_UPPER_ZH_TW:
		3447	case SVX_NUM_NUMBER_LOWER_ZH:
		3448	case SVX_NUM_FULL_WIDTH_ARABIC:
3400	nNumberingType = pBulletPara->nMappedNumType;	3449	nNumberingType = pBulletPara->nMappedNumType;
3401	break;	3450	break;
3402		3451

Return to issue 120773

Lines 207-213 Link Here

(-)main/editeng/inc/editeng/svxenum.hxx (-1 / +15 lines)
207	SVX_NUM_PAGEDESC, // Numerierung aus der Seitenvorlage	207	SVX_NUM_PAGEDESC, // Numerierung aus der Seitenvorlage
208	SVX_NUM_BITMAP,	208	SVX_NUM_BITMAP,
209	SVX_NUM_CHARS_UPPER_LETTER_N, // zaehlt von a-z, aa-zz, aaa-zzz	209	SVX_NUM_CHARS_UPPER_LETTER_N, // zaehlt von a-z, aa-zz, aaa-zzz
210	SVX_NUM_CHARS_LOWER_LETTER_N	210	SVX_NUM_CHARS_LOWER_LETTER_N,
		211	SVX_NUM_TRANSLITERATION,
		212	SVX_NUM_NATIVE_NUMBERING,
		213	SVX_NUM_FULL_WIDTH_ARABIC,
		214	SVX_NUM_CIRCLE_NUMBER,
		215	SVX_NUM_NUMBER_LOWER_ZH,
		216	SVX_NUM_NUMBER_UPPER_ZH,
		217	SVX_NUM_NUMBER_UPPER_ZH_TW,
		218	SVX_NUM_TIAN_GAN_ZH,
		219	SVX_NUM_DI_ZI_ZH,
		220	SVX_NUM_NUMBER_TRADITIONAL_JA,
		221	SVX_NUM_AIU_FULLWIDTH_JA,
		222	SVX_NUM_AIU_HALFWIDTH_JA,
		223	SVX_NUM_IROHA_FULLWIDTH_JA,
		224	SVX_NUM_IROHA_HALFWIDTH_JA
211	};	225	};
212		226
213		227

Lines 3851-3856 Link Here

(-)main/filter/source/msfilter/svdfppt.cxx (+57 lines)
3851	rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) );	3851	rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) );
3852	}	3852	}
3853	break;	3853	break;
		3854	case 16: // Simplified Chinese.
		3855	{
		3856	rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
		3857	}
		3858	break;
		3859	case 17: // Simplified Chinese with single-byte period.
		3860	{
		3861	rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
		3862	rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
		3863	}
		3864	break;
		3865	case 18: // Double byte circle numbers.
		3866	case 19: // Wingdings white circle numbers.
		3867	case 20: // Wingdings black circle numbers.
		3868	{
		3869	rNumberFormat.SetNumberingType( SVX_NUM_CIRCLE_NUMBER );
		3870	}
		3871	break;
		3872	case 21: // Traditional Chinese.
		3873	{
		3874	rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
		3875	}
		3876	break;
		3877	case 22: // Traditional Chinese with single-byte period.
		3878	{
		3879	rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
		3880	rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
		3881	}
		3882	break;
		3883	case 26: // Japanese/Korean.
		3884	{
		3885	rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
		3886	}
		3887	break;
		3888	case 27: // Japanese/Korean with single-byte period.
		3889	{
		3890	rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
		3891	rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
		3892	}
		3893	break;
		3894	case 28: // Double-byte Arabic numbers.
		3895	{
		3896	rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
		3897	}
		3898	break;
		3899	case 29: // Double-byte Arabic numbers with double-byte period.
		3900	{
		3901	rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
		3902	rNumberFormat.SetSuffix( String( sal_Unicode(0xff0e) ) );
		3903	}
		3904	break;
		3905	case 38: // Japanese with double-byte period.
		3906	{
		3907	rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH ); // No such type. Instead with Lower Chinese Number
		3908	rNumberFormat.SetSuffix( String( sal_Unicode(0xff0e) ) );
		3909	}
		3910	break;
3854	}	3911	}
3855	rStartNumbering = boost::optional< sal_Int16 >( nAnmScheme >> 16 );	3912	rStartNumbering = boost::optional< sal_Int16 >( nAnmScheme >> 16 );
3856	}	3913	}