diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-02 16:09:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-03 12:13:44 +0000 |
| commit | 1cfedbc960d25ee322b0a0e7aae8dc73758b406e (patch) | |
| tree | 1bcaac3e77e9693f9c3897d7c091acd603aff3fa /sd | |
| parent | f1ea8c43a8ab6b8d158d4d8f3a0039b3a2ac2c37 (diff) | |
drop SvxNumType and rename SvxExtNumType->SvxNumType
Both of them are abstractions over the css::style::NumberingType
constants.
SvxNumType serves no useful purpose, since it's just a typedef to
sal_Int16.
At least SvxExtNumType wraps up the css::style::NumberingType constants
in a nice enum.
Change-Id: I7b3f97cd42b0aa23aff7a4db4930da86149d4f4e
Reviewed-on: https://gerrit.libreoffice.org/34816
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/drawdoc.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/eppt/text.hxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 3868bd8c2857..3a4a86e13260 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -168,7 +168,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) , meLanguage( LANGUAGE_SYSTEM ) , meLanguageCJK( LANGUAGE_SYSTEM ) , meLanguageCTL( LANGUAGE_SYSTEM ) -, mePageNumType(css::style::NumberingType::ARABIC) +, mePageNumType(SVX_NUM_ARABIC) , mbAllocDocSh(false) , meDocType(eType) , mpCharClass(nullptr) diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index b2f92b420ded..58fb320207ef 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -821,7 +821,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1 { OUString aPropName( pPropValue[ i ].Name ); if ( aPropName == "NumberingType" ) - nNumberingType = (SvxExtNumType)*o3tl::doAccess<sal_Int16>(pPropValue[i].Value); + nNumberingType = (SvxNumType)*o3tl::doAccess<sal_Int16>(pPropValue[i].Value); else if ( aPropName == "Adjust" ) nHorzAdjust = *o3tl::doAccess<sal_Int16>(pPropValue[i].Value); else if ( aPropName == "BulletChar" ) diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index efa8d4fa3a70..d215a80bbd18 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -39,14 +39,14 @@ namespace style { struct TabStop; } struct SOParagraph { - bool bExtendedParameters; + bool bExtendedParameters; sal_uInt32 nParaFlags; sal_Int16 nBulletFlags; OUString sPrefix; OUString sSuffix; OUString sGraphicUrl; // String to a graphic Size aBuGraSize; - SvxExtNumType nNumberingType; + SvxNumType nNumberingType; sal_uInt32 nHorzAdjust; sal_uInt32 nBulletColor; sal_Int32 nBulletOfs; @@ -55,7 +55,7 @@ struct SOParagraph sal_Int16 nBulletRealSize; // scale in percent sal_Int16 nDepth; // actual depth sal_Unicode cBulletId; // if Numbering Type == CharSpecial - css::awt::FontDescriptor aFontDesc; + css::awt::FontDescriptor aFontDesc; bool bExtendedBulletsUsed; sal_uInt16 nBulletId; |