diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-13 10:54:39 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-13 10:56:25 +0200 |
| commit | 7bd108e7586bab6f1ae50b0a2ce9715d8df0fd49 (patch) | |
| tree | fe6dfe0a0a7882d799e015aa139a5803ca8406e7 /sd | |
| parent | d1449a9b990bf054adeb66c2bab871ce396cca18 (diff) | |
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 0451325ae7456da5812564428d73b0226606450f.
Change-Id: Idda7f24c901364394be1859f2cd6598803799423
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 534a31b71c91..0d0cf17563a0 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -878,7 +878,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 PortionObj* pPortion = front(); CalculateGraphicBulletSize( ( pPortion ) ? pPortion->mnCharHeight : 24 ); - switch( nNumberingType ) + switch( (SvxExtNumType)nNumberingType ) { case SVX_NUM_NUMBER_NONE : nParaFlags |= 0xf; break; @@ -896,20 +896,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 nParaFlags |= 0x90; // we define the font and charset } } - case SVX_NUM_CHARS_UPPER_LETTER : // count from a-z, aa - az, ba - bz, ... - 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: + default: { if ( nNumberingType != SVX_NUM_CHAR_SPECIAL ) { |