Skip to content

C
core
Kaydet (Commit) 39e9cae1 authored tarafından Zhe Wang's avatar Zhe Wang
Dosyalara gözat
Seçenekler

Fix issue #i120773#: [From Symphony] Numbering will lose when saving or opening a ppt file 

* subversion/main/editeng/inc/editeng/svxenum.hxx
Define some numbering types supported by MS ppt
* subversion/main/filter/source/msfilter/svdfppt.cxx
Mapping added MS numbering types to Symphony numbering types
* subversion/main/sd/source/filter/eppt/epptso.cxx
Export added MS numbering types

Patch by: Yin Bing <steve.yin.aoo@gmail.com>
Suggested by: Wang Zhe <kingwisemmx@gmail.com>
Found by: Yin Bing <steve.yin.aoo@gmail.com>
Review by: Wang Zhe <kingwisemmx@gmail.com>
üst 155cf194
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 1 deletion
editeng/inc/editeng/svxenum.hxx
Dosyayı görüntüle @ 39e9cae1
...@@ -207,7 +207,21 @@ enum SvxExtNumType ...@@ -207,7 +207,21 @@ enum SvxExtNumType
SVX_NUM_PAGEDESC, // Numerierung aus der Seitenvorlage SVX_NUM_PAGEDESC, // Numerierung aus der Seitenvorlage
SVX_NUM_BITMAP, SVX_NUM_BITMAP,
SVX_NUM_CHARS_UPPER_LETTER_N, // zaehlt von a-z, aa-zz, aaa-zzz SVX_NUM_CHARS_UPPER_LETTER_N, // zaehlt von a-z, aa-zz, aaa-zzz
SVX_NUM_CHARS_LOWER_LETTER_N 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
}; };
......
filter/source/msfilter/svdfppt.cxx
Dosyayı görüntüle @ 39e9cae1
...@@ -3851,6 +3851,63 @@ sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rM ...@@ -3851,6 +3851,63 @@ sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rM
rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) ); rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) );
} }
break; 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 ); rStartNumbering = boost::optional< sal_Int16 >( nAnmScheme >> 16 );
} }
......
sd/source/filter/eppt/epptso.cxx
Dosyayı görüntüle @ 39e9cae1
...@@ -2672,6 +2672,11 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 ...@@ -2672,6 +2672,11 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
case SVX_NUM_BITMAP : case SVX_NUM_BITMAP :
case SVX_NUM_CHARS_UPPER_LETTER_N : // zaehlt von a-z, aa-zz, aaa-zzz case SVX_NUM_CHARS_UPPER_LETTER_N : // zaehlt von a-z, aa-zz, aaa-zzz
case SVX_NUM_CHARS_LOWER_LETTER_N : case SVX_NUM_CHARS_LOWER_LETTER_N :
case SVX_NUM_NUMBER_UPPER_ZH:
case SVX_NUM_CIRCLE_NUMBER:
case SVX_NUM_NUMBER_UPPER_ZH_TW:
case SVX_NUM_NUMBER_LOWER_ZH:
case SVX_NUM_FULL_WIDTH_ARABIC:
{ {
if ( nNumberingType != SVX_NUM_CHAR_SPECIAL ) if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
{ {
...@@ -2757,6 +2762,45 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 ...@@ -2757,6 +2762,45 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
} }
} }
break; break;
case SVX_NUM_NUMBER_UPPER_ZH :
{
if ( sSuffix.Len() )
nMappedNumType = 0x110001; // Simplified Chinese with single-byte period.
else
nMappedNumType = 0x100001; // Simplified Chinese.
}
break;
case SVX_NUM_CIRCLE_NUMBER :
{
nMappedNumType = 0x120001; // Double byte circle numbers.
}
break;
case SVX_NUM_NUMBER_UPPER_ZH_TW :
{
if ( sSuffix.Len() )
nMappedNumType = 0x160001; // Traditional Chinese with single-byte period.
else
nMappedNumType = 0x150001; // Traditional Chinese.
}
break;
case SVX_NUM_NUMBER_LOWER_ZH :
{
if ( sSuffix == String( sal_Unicode(0xff0e)) )
nMappedNumType = 0x260001; // Japanese with double-byte period.
else if ( sSuffix.Len() )
nMappedNumType = 0x1B0001; // Japanese/Korean with single-byte period.
else
nMappedNumType = 0x1A0001; // Japanese/Korean.
}
break;
case SVX_NUM_FULL_WIDTH_ARABIC :
{
if ( sSuffix.Len() )
nMappedNumType = 0x1D0001; // Double-byte Arabic numbers with double-byte period.
else
nMappedNumType = 0x1C0001; // Double-byte Arabic numbers.
}
break;
default: default:
break; break;
} }
...@@ -3397,6 +3441,11 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u ...@@ -3397,6 +3441,11 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
case SVX_NUM_ROMAN_UPPER : case SVX_NUM_ROMAN_UPPER :
case SVX_NUM_ROMAN_LOWER : case SVX_NUM_ROMAN_LOWER :
case SVX_NUM_ARABIC : case SVX_NUM_ARABIC :
case SVX_NUM_NUMBER_UPPER_ZH:
case SVX_NUM_CIRCLE_NUMBER:
case SVX_NUM_NUMBER_UPPER_ZH_TW:
case SVX_NUM_NUMBER_LOWER_ZH:
case SVX_NUM_FULL_WIDTH_ARABIC:
nNumberingType = pBulletPara->nMappedNumType; nNumberingType = pBulletPara->nMappedNumType;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment