diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-13 12:32:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-03-14 12:59:42 +0100 |
| commit | 9063dd06d15633f6c323c0146896b9e589bf1151 (patch) | |
| tree | 82e74e0084b97fd41140a0d149bc3bfed3f4a736 | |
| parent | 8e021eb1e73da8f008e8f35eaa01efbcddfbdaa7 (diff) | |
Revert "Revert "WaE: enumeration value not handled in switch""
Nah. Apparently there can be even more different values for this field in
documents which we should not handle, so using default: is wrong.
This reverts commit 7bd108e7586bab6f1ae50b0a2ce9715d8df0fd49.
(cherry picked from commit f4d4bb797b66908e9e45add4c94565576d8b6cf7)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
sd/source/filter/eppt/pptx-text.cxx
Change-Id: I5e811d0471581b02e8138b59fbac6530d7267d9f
| -rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 9e4876d10519..04578a28ec23 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( (SvxExtNumType)nNumberingType ) + switch( nNumberingType ) { case SVX_NUM_NUMBER_NONE : nParaFlags |= 0xf; break; @@ -896,14 +896,14 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 nParaFlags |= 0x90; // wir geben den Font und den Charset vor } } - case SVX_NUM_CHARS_UPPER_LETTER : // zaehlt von a-z, aa - az, ba - bz, ... + 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 : // Numerierung aus der Seitenvorlage + case SVX_NUM_PAGEDESC : // numbering from the page template 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 : // 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: |