Kaydet (Commit) 7bd108e7 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Revert "WaE: enumeration value not handled in switch"

I think the intent is to handle all the other values in that case, so just use
a "default:" case then, instead of trying (and failing) to list all other enum
values.

This reverts commit 0451325a.

Change-Id: Idda7f24c901364394be1859f2cd6598803799423
üst d1449a9b
...@@ -878,7 +878,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 ...@@ -878,7 +878,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
PortionObj* pPortion = front(); PortionObj* pPortion = front();
CalculateGraphicBulletSize( ( pPortion ) ? pPortion->mnCharHeight : 24 ); CalculateGraphicBulletSize( ( pPortion ) ? pPortion->mnCharHeight : 24 );
switch( nNumberingType ) switch( (SvxExtNumType)nNumberingType )
{ {
case SVX_NUM_NUMBER_NONE : nParaFlags |= 0xf; break; case SVX_NUM_NUMBER_NONE : nParaFlags |= 0xf; break;
...@@ -896,20 +896,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 ...@@ -896,20 +896,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
nParaFlags |= 0x90; // we define the font and charset nParaFlags |= 0x90; // we define the font and charset
} }
} }
case SVX_NUM_CHARS_UPPER_LETTER : // count from a-z, aa - az, ba - bz, ... default:
case SVX_NUM_CHARS_LOWER_LETTER :
case SVX_NUM_ROMAN_UPPER :
case SVX_NUM_ROMAN_LOWER :
case SVX_NUM_ARABIC :
case SVX_NUM_PAGEDESC : // numbering from the page template
case SVX_NUM_BITMAP :
case SVX_NUM_CHARS_UPPER_LETTER_N : // count from a-z, aa-zz, aaa-zzz
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 )
{ {
......
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