diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-16 15:51:26 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-08-17 08:45:15 +0200 |
commit | 48cb92cb1671bfdef3fcf43978455f19b26ca7bd (patch) | |
tree | c50dec2c019daff055e253d1b8230d8d00b8b369 /svx/source/xoutdev | |
parent | 430b93f7f3c9f5aeb89db634447cb554acd125aa (diff) |
convert XPropertyListType to scoped enum
Change-Id: I071c0d17c7c5982af47bccd92580bbac62bdf7b3
Diffstat (limited to 'svx/source/xoutdev')
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 6 | ||||
-rw-r--r-- | svx/source/xoutdev/xattrbmp.cxx | 4 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabcolr.cxx | 2 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabdash.cxx | 2 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabgrdt.cxx | 2 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabhtch.cxx | 2 | ||||
-rw-r--r-- | svx/source/xoutdev/xtable.cxx | 28 | ||||
-rw-r--r-- | svx/source/xoutdev/xtablend.cxx | 2 |
8 files changed, 24 insertions, 24 deletions
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index c0884bd9c6b2..8d1472d02845 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1001,7 +1001,7 @@ XLineDashItem* XLineDashItem::checkForUniqueItem( SdrModel* pModel ) const this, XATTR_LINEDASH, &pModel->GetItemPool(), pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XLineDashItem::CompareValueFunc, RID_SVXSTR_DASH11, - pModel->GetPropertyList( XDASH_LIST ) ); + pModel->GetPropertyList( XPropertyListType::Dash ) ); // if the given name is not valid, replace it! if( aUniqueName != GetName() ) @@ -2741,7 +2741,7 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con this, Which(), &pModel->GetItemPool(), pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XFillGradientItem::CompareValueFunc, RID_SVXSTR_GRADIENT, - pModel->GetPropertyList( XGRADIENT_LIST ) ); + pModel->GetPropertyList( XPropertyListType::Gradient ) ); // if the given name is not valid, replace it! if( aUniqueName != GetName() ) @@ -3148,7 +3148,7 @@ XFillHatchItem* XFillHatchItem::checkForUniqueItem( SdrModel* pModel ) const this, XATTR_FILLHATCH, &pModel->GetItemPool(), pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XFillHatchItem::CompareValueFunc, RID_SVXSTR_HATCH10, - pModel->GetPropertyList( XHATCH_LIST ) ); + pModel->GetPropertyList( XPropertyListType::Hatch ) ); // if the given name is not valid, replace it! if( aUniqueName != GetName() ) diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 31129f4d748c..86bcf178d8e7 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -523,9 +523,9 @@ XFillBitmapItem* XFillBitmapItem::checkForUniqueItem( SdrModel* pModel ) const { if( pModel ) { - XPropertyListType aListType = XBITMAP_LIST; + XPropertyListType aListType = XPropertyListType::Bitmap; if(isPattern()) - aListType = XPATTERN_LIST; + aListType = XPropertyListType::Pattern; const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, XATTR_FILLBITMAP, &pModel->GetItemPool(), pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 3d16c4d26440..374f6fc9a6cb 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -33,7 +33,7 @@ XColorListRef XColorList::CreateStdColorList() { return XPropertyList::AsColorList( XPropertyList::CreatePropertyList( - XCOLOR_LIST, SvtPathOptions().GetPalettePath(), "")); + XPropertyListType::Color, SvtPathOptions().GetPalettePath(), "")); } XColorListRef XColorList::GetStdColorList() diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 817f115563a8..962ff658fb05 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star; XDashList::XDashList(const OUString& rPath, const OUString& rReferer) - : XPropertyList(XDASH_LIST, rPath, rReferer) + : XPropertyList(XPropertyListType::Dash, rPath, rReferer) , maBitmapSolidLine() , maStringSolidLine() , maStringNoLine() diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 78c358558e27..4a21b58903e9 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star; XGradientList::XGradientList( const OUString& rPath, const OUString& rReferer ) -: XPropertyList( XGRADIENT_LIST, rPath, rReferer ) +: XPropertyList( XPropertyListType::Gradient, rPath, rReferer ) { } diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index a5227ba7b2b2..51b71def653d 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; XHatchList::XHatchList(const OUString& rPath, const OUString& rReferer) - : XPropertyList( XHATCH_LIST, rPath, rReferer ) + : XPropertyList( XPropertyListType::Hatch, rPath, rReferer ) { } diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index e8c9d825848a..c088d342c1fa 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -334,25 +334,25 @@ XPropertyListRef XPropertyList::CreatePropertyList( XPropertyListType aType, XPropertyListRef pRet; switch (aType) { - case XCOLOR_LIST: + case XPropertyListType::Color: pRet = XPropertyListRef(new XColorList(rPath, rReferer)); break; - case XLINE_END_LIST: + case XPropertyListType::LineEnd: pRet = XPropertyListRef(new XLineEndList(rPath, rReferer)); break; - case XDASH_LIST: + case XPropertyListType::Dash: pRet = XPropertyListRef(new XDashList(rPath, rReferer)); break; - case XHATCH_LIST: + case XPropertyListType::Hatch: pRet = XPropertyListRef(new XHatchList(rPath, rReferer)); break; - case XGRADIENT_LIST: + case XPropertyListType::Gradient: pRet = XPropertyListRef(new XGradientList(rPath, rReferer)); break; - case XBITMAP_LIST: + case XPropertyListType::Bitmap: pRet = XPropertyListRef(new XBitmapList(rPath, rReferer)); break; - case XPATTERN_LIST: + case XPropertyListType::Pattern: pRet = XPropertyListRef(new XPatternList(rPath, rReferer)); break; default: @@ -397,13 +397,13 @@ static struct { XPropertyListType t; const char *pExt; } pExtnMap[] = { - { XCOLOR_LIST, "soc" }, - { XLINE_END_LIST, "soe" }, - { XDASH_LIST, "sod" }, - { XHATCH_LIST, "soh" }, - { XGRADIENT_LIST, "sog" }, - { XBITMAP_LIST, "sob" }, - { XPATTERN_LIST, "sop"} + { XPropertyListType::Color, "soc" }, + { XPropertyListType::LineEnd, "soe" }, + { XPropertyListType::Dash, "sod" }, + { XPropertyListType::Hatch, "soh" }, + { XPropertyListType::Gradient, "sog" }, + { XPropertyListType::Bitmap, "sob" }, + { XPropertyListType::Pattern, "sop"} }; OUString XPropertyList::GetDefaultExt( XPropertyListType t ) diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 988bcb8edfa1..ec94f1730bd1 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star; XLineEndList::XLineEndList( const OUString& rPath, const OUString& rReferer ) - : XPropertyList( XLINE_END_LIST, rPath, rReferer ) + : XPropertyList( XPropertyListType::LineEnd, rPath, rReferer ) { } |