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

(-)../dist/OOO_2_0_3/svx/source/svdraw/svdfppt.cxx (-33 / +67 lines)
Lines 299-304 Link Here
299
using namespace drawing	            ;
299
using namespace drawing	            ;
300
using namespace container	        ;
300
using namespace container	        ;
301
301
302
// Ugly global variable for i37316 
303
SvxLanguageItem PPT_FORMAT_LANG ( LANGUAGE_ENGLISH );
304
302
////////////////////////////////////////////////////////////////////////////////////////////////////
305
////////////////////////////////////////////////////////////////////////////////////////////////////
303
306
304
PowerPointImportParam::PowerPointImportParam( SvStream& rDocStrm, sal_uInt32 nFlags, MSFilterTracer* pT ) :
307
PowerPointImportParam::PowerPointImportParam( SvStream& rDocStrm, sal_uInt32 nFlags, MSFilterTracer* pT ) :
Lines 5845-5850 Link Here
5845
		rSet.Put( SvxLanguageItem( mnLanguage[ 1 ], EE_CHAR_LANGUAGE_CJK ) );
5854
		rSet.Put( SvxLanguageItem( mnLanguage[ 1 ], EE_CHAR_LANGUAGE_CJK ) );
5846
	if ( mnLanguage[ 2 ] )
5855
	if ( mnLanguage[ 2 ] )
5847
		rSet.Put( SvxLanguageItem( mnLanguage[ 2 ], EE_CHAR_LANGUAGE_CTL ) );
5856
		rSet.Put( SvxLanguageItem( mnLanguage[ 2 ], EE_CHAR_LANGUAGE_CTL ) );
5857
	
5858
	PPT_FORMAT_LANG.SetLanguage( mnLanguage[ 0 ] );
5848
}
5859
}
5849
5860
5850
SvxFieldItem* PPTPortionObj::GetTextField()
5861
SvxFieldItem* PPTPortionObj::GetTextField()
Lines 6462-6501 Link Here
6462
{
6473
{
6463
	eDateFormat = SVXDATEFORMAT_APPDEFAULT;
6474
	eDateFormat = SVXDATEFORMAT_APPDEFAULT;
6464
	eTimeFormat = SVXTIMEFORMAT_APPDEFAULT;
6475
	eTimeFormat = SVXTIMEFORMAT_APPDEFAULT;
6465
	// ID auswerten
6476
6466
	switch( nVal )
6477
	// for i37316
6478
6479
	int nTmp = nVal - 7;
6480
	if ( PPT_FORMAT_LANG.GetLanguage() == LANGUAGE_HEBREW)
6467
	{
6481
	{
6468
		case 0:
6482
		switch( nTmp )
6469
		case 6:
6483
		{
6470
			eDateFormat = SVXDATEFORMAT_A;
6484
				case 0:
6471
		break;
6485
				case 1:
6472
		case 1:
6486
				case 2:
6473
			eDateFormat = SVXDATEFORMAT_F;
6487
					eDateFormat = SVXDATEFORMAT_A;
6474
		break;
6488
					break;
6475
		case 2:
6489
				case 3:
6476
		case 3:
6490
					eDateFormat = SVXDATEFORMAT_F;
6477
			eDateFormat = SVXDATEFORMAT_D;
6491
					break;
6478
		break;
6492
				case 4:
6479
		case 4:
6493
					eDateFormat = SVXDATEFORMAT_A;
6480
		case 5:
6494
					eTimeFormat = SVXTIMEFORMAT_24_HM;
6481
			eDateFormat = SVXDATEFORMAT_C;
6495
					break;
6482
		break;
6496
				case 5:
6483
		case 7:
6497
					eDateFormat = SVXDATEFORMAT_A;
6484
			eDateFormat = SVXDATEFORMAT_A;
6498
					break;
6485
		case 9:
6499
		}
6486
			eTimeFormat = SVXTIMEFORMAT_24_HM;
6500
	}	
6487
		break;
6501
	else
6488
		case 8:
6502
	{
6489
			eDateFormat = SVXDATEFORMAT_A;
6503
		switch( nVal )
6490
		case 11:
6504
		{
6491
			eTimeFormat = SVXTIMEFORMAT_12_HM;
6505
				case 0:
6492
		break;
6506
				case 6:
6493
		case 10:
6507
					eDateFormat = SVXDATEFORMAT_A;
6494
			eTimeFormat = SVXTIMEFORMAT_24_HMS;
6508
				break;
6495
		break;
6509
				case 1:
6496
		case 12:
6510
					eDateFormat = SVXDATEFORMAT_F;
6497
			eTimeFormat = SVXTIMEFORMAT_12_HMS;
6511
				break;
6498
		break;
6512
				case 2:
6513
				case 3:
6514
					eDateFormat = SVXDATEFORMAT_D;
6515
				break;
6516
				case 4:
6517
				case 5:
6518
					eDateFormat = SVXDATEFORMAT_C;
6519
				break;
6520
				case 7:
6521
					eDateFormat = SVXDATEFORMAT_A;
6522
				case 9:
6523
					eTimeFormat = SVXTIMEFORMAT_24_HM;
6524
				break;
6525
				case 8:
6526
					eDateFormat = SVXDATEFORMAT_A;
6527
				case 11:
6528
					eTimeFormat = SVXTIMEFORMAT_12_HM;
6529
				break;
6530
				case 10:
6531
					eTimeFormat = SVXTIMEFORMAT_24_HMS;
6532
				break;
6533
				case 12:
6534
					eTimeFormat = SVXTIMEFORMAT_12_HMS;
6535
				break;
6536
			
6537
				break;
6538
			}
6499
	}
6539
	}
6500
}
6540
}
6501
6541

Return to issue 37316