sd/source/filter/eppt/pptx-text.cxx | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit f4d4bb797b66908e9e45add4c94565576d8b6cf7
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Mar 13 12:32:56 2013 +0200
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.
diff --git a/sd/source/filter/eppt/pptx-text.cxx
b/sd/source/filter/eppt/pptx-text.cxx
index 0d0cf17..534a31b 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,7 +896,20 @@ void ParagraphObj::ImplGetNumberingLevel(
PPTExBulletProvider& rBuProv, sal_Int1
nParaFlags |= 0x90; // we define the font and
charset
}
}
- default:
+ 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:
{
if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
