diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-02 14:24:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-03 06:45:05 +0000 |
| commit | afa675469cd9894f41a6b9eeb2e7acc8245d256c (patch) | |
| tree | ce8bcab207aef1534298b2369accc4ada5597b08 /sd | |
| parent | f091259ad2ec1590714645839668580cd7b8c7c4 (diff) | |
use SvxExtNumType in SvxNumberType
and follow the rabbit trail, fixing various other types in the process
Change-Id: I8fc7df3b585df21578ffb28fdd7e5e427b3bfd9d
Reviewed-on: https://gerrit.libreoffice.org/34814
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 8 | ||||
| -rw-r--r-- | sd/source/filter/eppt/text.hxx | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 8be0b03d9e8e..0dc89037dde2 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1363,7 +1363,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u case SVX_NUM_BITMAP : nNumberingType = 0; break; - + default: break; } rExtBuStr.WriteUInt32( nNumberingType ); } diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index ad68f06dd98a..b2f92b420ded 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -765,7 +765,7 @@ void ParagraphObj::ImplClear() void ParagraphObj::CalculateGraphicBulletSize( sal_uInt16 nFontHeight ) { - if ( ( (SvxExtNumType)nNumberingType == SVX_NUM_BITMAP ) && ( nBulletId != 0xffff ) ) + if ( ( nNumberingType == SVX_NUM_BITMAP ) && ( nBulletId != 0xffff ) ) { // calculate the bulletrealsize for this grafik if ( aBuGraSize.Width() && aBuGraSize.Height() ) @@ -821,7 +821,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1 { OUString aPropName( pPropValue[ i ].Name ); if ( aPropName == "NumberingType" ) - nNumberingType = *o3tl::doAccess<sal_Int16>(pPropValue[i].Value); + nNumberingType = (SvxExtNumType)*o3tl::doAccess<sal_Int16>(pPropValue[i].Value); else if ( aPropName == "Adjust" ) nHorzAdjust = *o3tl::doAccess<sal_Int16>(pPropValue[i].Value); else if ( aPropName == "BulletChar" ) @@ -959,7 +959,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1 else cBulletId = 0x2022; - switch( (SvxExtNumType)nNumberingType ) + switch( nNumberingType ) { case SVX_NUM_CHARS_UPPER_LETTER : case SVX_NUM_CHARS_UPPER_LETTER_N : @@ -1075,6 +1075,8 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1 default: break; } + break; + default: break; } nParaFlags |= 0x2f; nBulletFlags |= 6; diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index 35c6f4475ad2..efa8d4fa3a70 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -46,7 +46,7 @@ struct SOParagraph OUString sSuffix; OUString sGraphicUrl; // String to a graphic Size aBuGraSize; - sal_uInt32 nNumberingType; // this is actually a SvxEnum + SvxExtNumType nNumberingType; sal_uInt32 nHorzAdjust; sal_uInt32 nBulletColor; sal_Int32 nBulletOfs; |