summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/tabpages/tpcolor.cxx6
-rw-r--r--cui/source/tabpages/tplnedef.cxx2
-rw-r--r--cui/source/tabpages/tplneend.cxx2
-rw-r--r--include/svx/svdmodel.hxx17
-rw-r--r--include/svx/xtable.hxx26
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx42
-rw-r--r--svx/source/svdraw/svdmodel.cxx7
-rw-r--r--svx/source/tbxctrls/Palette.cxx2
-rw-r--r--svx/source/tbxctrls/PaletteManager.cxx2
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx2
-rw-r--r--svx/source/unodraw/unoctabl.cxx2
-rw-r--r--svx/source/xoutdev/xattr.cxx6
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx4
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx2
-rw-r--r--svx/source/xoutdev/xtabdash.cxx2
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx2
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx2
-rw-r--r--svx/source/xoutdev/xtable.cxx28
-rw-r--r--svx/source/xoutdev/xtablend.cxx2
19 files changed, 80 insertions, 78 deletions
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 634f2f782a15..912d338e2ab7 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -75,7 +75,7 @@ struct SvxColorTabPageShadow
SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", &rInAttrs)
- , meType( XCOLOR_LIST )
+ , meType( XPropertyListType::Color )
, mpTopDlg( GetParentDialog() )
, pShadow ( new SvxColorTabPageShadow() )
, rOutAttrs ( rInAttrs )
@@ -883,13 +883,13 @@ void SvxColorTabPage::SaveToViewFrame( SfxViewFrame *pViewFrame )
void SvxColorTabPage::SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef )
{
(void) t;
- OSL_ASSERT( t == XCOLOR_LIST );
+ OSL_ASSERT( t == XPropertyListType::Color );
pColorList = XColorListRef( static_cast<XColorList *>(xRef.get() ) );
}
void SvxColorTabPage::SetColorList( const XColorListRef& pColList )
{
- SetPropertyList( XCOLOR_LIST, XPropertyListRef( ( pColList.get() ) ) );
+ SetPropertyList( XPropertyListType::Color, XPropertyListRef( ( pColList.get() ) ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 701a43fd49ef..b4282dfe7ba4 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -752,7 +752,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void)
aPathURL.removeSegment();
aPathURL.removeFinalSlash();
- XDashListRef pDshLst = XPropertyList::AsDashList(XPropertyList::CreatePropertyList( XDASH_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ), "" ));
+ XDashListRef pDshLst = XPropertyList::AsDashList(XPropertyList::CreatePropertyList( XPropertyListType::Dash, aPathURL.GetMainURL( INetURLObject::NO_DECODE ), "" ));
pDshLst->SetName( aURL.getName() );
if( pDshLst->Load() )
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 8bbe4940c701..c17b18f7e14f 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -572,7 +572,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void)
XLineEndListRef pLeList = XPropertyList::AsLineEndList(
XPropertyList::CreatePropertyList(
- XLINE_END_LIST,
+ XPropertyListType::LineEnd,
aPathURL.GetMainURL(INetURLObject::NO_DECODE), ""));
pLeList->SetName( aURL.getName() );
if( pLeList->Load() )
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 3d1c7533ee99..ac1f82f83849 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -33,6 +33,7 @@
#include <tools/fract.hxx>
#include <svl/hint.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <o3tl/enumarray.hxx>
#include <svl/style.hxx>
#include <svx/xtable.hxx>
@@ -214,7 +215,7 @@ public:
bool mbInDestruction;
// Color, Dash, Line-End, Hatch, Gradient, Bitmap property lists ...
- XPropertyListRef maProperties[XPROPERTY_LIST_COUNT];
+ o3tl::enumarray<XPropertyListType, XPropertyListRef> maProperties;
// New src638: NumberFormatter for drawing layer and
// method for getting it. It is constructed on demand
@@ -505,13 +506,13 @@ public:
void SetPropertyList( XPropertyListRef const & p ) { maProperties[ p->Type() ] = p; }
// friendlier helpers
- XDashListRef GetDashList() const { return XPropertyList::AsDashList(GetPropertyList( XDASH_LIST )); }
- XHatchListRef GetHatchList() const { return XPropertyList::AsHatchList(GetPropertyList( XHATCH_LIST )); }
- XColorListRef GetColorList() const { return XPropertyList::AsColorList(GetPropertyList( XCOLOR_LIST )); }
- XBitmapListRef GetBitmapList() const { return XPropertyList::AsBitmapList(GetPropertyList( XBITMAP_LIST )); }
- XPatternListRef GetPatternList() const { return XPropertyList::AsPatternList(GetPropertyList( XPATTERN_LIST )); }
- XLineEndListRef GetLineEndList() const { return XPropertyList::AsLineEndList(GetPropertyList( XLINE_END_LIST )); }
- XGradientListRef GetGradientList() const { return XPropertyList::AsGradientList(GetPropertyList( XGRADIENT_LIST )); }
+ XDashListRef GetDashList() const { return XPropertyList::AsDashList(GetPropertyList( XPropertyListType::Dash )); }
+ XHatchListRef GetHatchList() const { return XPropertyList::AsHatchList(GetPropertyList( XPropertyListType::Hatch )); }
+ XColorListRef GetColorList() const { return XPropertyList::AsColorList(GetPropertyList( XPropertyListType::Color )); }
+ XBitmapListRef GetBitmapList() const { return XPropertyList::AsBitmapList(GetPropertyList( XPropertyListType::Bitmap )); }
+ XPatternListRef GetPatternList() const { return XPropertyList::AsPatternList(GetPropertyList( XPropertyListType::Pattern )); }
+ XLineEndListRef GetLineEndList() const { return XPropertyList::AsLineEndList(GetPropertyList( XPropertyListType::LineEnd )); }
+ XGradientListRef GetGradientList() const { return XPropertyList::AsGradientList(GetPropertyList( XPropertyListType::Gradient )); }
// The DrawingEngine only references the StyleSheetPool, whoever
// made it needs to delete it.
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 021627167449..18474537fa2b 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -144,16 +144,16 @@ public:
}
};
-enum XPropertyListType {
- UNKNOWN_XPROPERTYLISTTYPE = -1,
- XCOLOR_LIST,
- XLINE_END_LIST,
- XDASH_LIST,
- XHATCH_LIST,
- XGRADIENT_LIST,
- XBITMAP_LIST,
- XPATTERN_LIST,
- XPROPERTY_LIST_COUNT
+enum class XPropertyListType {
+ Unknown = -1,
+ Color,
+ LineEnd,
+ Dash,
+ Hatch,
+ Gradient,
+ Bitmap,
+ Pattern,
+ LAST
};
typedef rtl::Reference< class XPropertyList > XPropertyListRef;
@@ -265,7 +265,7 @@ protected:
public:
XColorList(const OUString& rPath, const OUString& rReferer)
- : XPropertyList(XCOLOR_LIST, rPath, rReferer) {}
+ : XPropertyList(XPropertyListType::Color, rPath, rReferer) {}
void Replace(long nIndex, std::unique_ptr<XColorEntry> pEntry);
XColorEntry* GetColor(long nIndex) const;
@@ -371,7 +371,7 @@ protected:
public:
XBitmapList(const OUString& rPath, const OUString& rReferer)
- : XPropertyList(XBITMAP_LIST, rPath, rReferer) {}
+ : XPropertyList(XPropertyListType::Bitmap, rPath, rReferer) {}
XBitmapEntry* GetBitmap(long nIndex) const;
Bitmap GetBitmapForPreview(long nIndex, const Size& rSize);
@@ -390,7 +390,7 @@ protected:
public:
XPatternList(const OUString& rPath, const OUString& rReferer)
- : XPropertyList(XPATTERN_LIST, rPath, rReferer) {}
+ : XPropertyList(XPropertyListType::Pattern, rPath, rReferer) {}
XBitmapEntry* GetBitmap(long nIndex) const;
Bitmap GetBitmapForPreview(long nIndex, const Size& rSize);
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index ec108a3afb0b..b34cdb12ba1e 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -268,12 +268,12 @@ static struct {
const char *pName;
XPropertyListType t;
} aURLPropertyNames[] = {
- { "ColorTableURL", XCOLOR_LIST },
- { "DashTableURL", XDASH_LIST },
- { "LineEndTableURL", XLINE_END_LIST },
- { "HatchTableURL", XHATCH_LIST },
- { "GradientTableURL", XGRADIENT_LIST },
- { "BitmapTableURL", XBITMAP_LIST }
+ { "ColorTableURL", XPropertyListType::Color },
+ { "DashTableURL", XPropertyListType::Dash },
+ { "LineEndTableURL", XPropertyListType::LineEnd },
+ { "HatchTableURL", XPropertyListType::Hatch },
+ { "GradientTableURL", XPropertyListType::Gradient },
+ { "BitmapTableURL", XPropertyListType::Bitmap }
};
static XPropertyListType getTypeOfName( const OUString &aName )
@@ -282,7 +282,7 @@ static XPropertyListType getTypeOfName( const OUString &aName )
if( aName.equalsAscii( rURLPropertyName.pName ) )
return rURLPropertyName.t;
}
- return UNKNOWN_XPROPERTYLISTTYPE;
+ return XPropertyListType::Unknown;
}
static OUString getNameOfType( XPropertyListType t )
@@ -307,7 +307,7 @@ uno::Sequence<beans::PropertyValue>
for( sal_Int32 i = 0; i < aConfigProps.getLength(); i++ )
{
XPropertyListType t = getTypeOfName( aConfigProps[i].Name );
- if (t == UNKNOWN_XPROPERTYLISTTYPE)
+ if (t == XPropertyListType::Unknown)
aRet[nRet++] = aConfigProps[i];
else
{
@@ -351,7 +351,7 @@ uno::Sequence<beans::PropertyValue>
{
XPropertyListType t = getTypeOfName( aConfigProps[i].Name );
aRet[i] = aConfigProps[i];
- if (t >= 0) {
+ if (t != XPropertyListType::Unknown) {
XPropertyListRef pList = pDoc->GetPropertyList( t );
if( !pList.is() || !pList->IsEmbedInDocument() )
continue; // no change ...
@@ -434,27 +434,27 @@ throw (UnknownPropertyException, PropertyVetoException,
switch( (*ppEntries)->mnHandle )
{
case HANDLE_COLORTABLEURL:
- AssignURL( XCOLOR_LIST, pValues, &bOk, &bChanged );
+ AssignURL( XPropertyListType::Color, pValues, &bOk, &bChanged );
break;
case HANDLE_DASHTABLEURL:
- AssignURL( XDASH_LIST, pValues, &bOk, &bChanged );
+ AssignURL( XPropertyListType::Dash, pValues, &bOk, &bChanged );
break;
case HANDLE_LINEENDTABLEURL:
- AssignURL( XLINE_END_LIST, pValues, &bOk, &bChanged );
+ AssignURL( XPropertyListType::LineEnd, pValues, &bOk, &bChanged );
break;
case HANDLE_HATCHTABLEURL:
- AssignURL( XHATCH_LIST, pValues, &bOk, &bChanged );
+ AssignURL( XPropertyListType::Hatch, pValues, &bOk, &bChanged );
break;
case HANDLE_GRADIENTTABLEURL:
- AssignURL( XGRADIENT_LIST, pValues, &bOk, &bChanged );
+ AssignURL( XPropertyListType::Gradient, pValues, &bOk, &bChanged );
break;
case HANDLE_BITMAPTABLEURL:
- AssignURL( XBITMAP_LIST, pValues, &bOk, &bChanged );
+ AssignURL( XPropertyListType::Bitmap, pValues, &bOk, &bChanged );
break;
case HANDLE_FORBIDDENCHARS:
@@ -1012,22 +1012,22 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::
switch( (*ppEntries)->mnHandle )
{
case HANDLE_COLORTABLEURL:
- ExtractURL( XCOLOR_LIST, pValue );
+ ExtractURL( XPropertyListType::Color, pValue );
break;
case HANDLE_DASHTABLEURL:
- ExtractURL( XDASH_LIST, pValue );
+ ExtractURL( XPropertyListType::Dash, pValue );
break;
case HANDLE_LINEENDTABLEURL:
- ExtractURL( XLINE_END_LIST, pValue );
+ ExtractURL( XPropertyListType::LineEnd, pValue );
break;
case HANDLE_HATCHTABLEURL:
- ExtractURL( XHATCH_LIST, pValue );
+ ExtractURL( XPropertyListType::Hatch, pValue );
break;
case HANDLE_GRADIENTTABLEURL:
- ExtractURL( XGRADIENT_LIST, pValue );
+ ExtractURL( XPropertyListType::Gradient, pValue );
break;
case HANDLE_BITMAPTABLEURL:
- ExtractURL( XBITMAP_LIST, pValue );
+ ExtractURL( XPropertyListType::Bitmap, pValue );
break;
case HANDLE_FORBIDDENCHARS:
*pValue <<= mxModel->getForbiddenCharsTable();
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 27952e494806..81ee1612e75b 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -94,6 +94,7 @@
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
#include <sfx2/viewsh.hxx>
+#include <o3tl/enumrange.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -650,11 +651,11 @@ bool SdrModel::IsUndoEnabled() const
void SdrModel::ImpCreateTables()
{
- for( int i = 0; i < XPROPERTY_LIST_COUNT; i++ )
+ for( auto i : o3tl::enumrange<XPropertyListType>() )
{
- if( !bExtColorTable || i != XCOLOR_LIST )
+ if( !bExtColorTable || i != XPropertyListType::Color )
maProperties[i] = XPropertyList::CreatePropertyList (
- (XPropertyListType) i, aTablePath, ""/*TODO?*/ );
+ i, aTablePath, ""/*TODO?*/ );
}
}
diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx
index 82789e99e193..aecaf565e86e 100644
--- a/svx/source/tbxctrls/Palette.cxx
+++ b/svx/source/tbxctrls/Palette.cxx
@@ -347,7 +347,7 @@ void PaletteSOC::LoadColorSet( SvxColorValueSet& rColorSet )
if( !mbLoadedPalette )
{
mbLoadedPalette = true;
- mpColorList = XPropertyList::AsColorList(XPropertyList::CreatePropertyListFromURL(XCOLOR_LIST, maFPath));
+ mpColorList = XPropertyList::AsColorList(XPropertyList::CreatePropertyListFromURL(XPropertyListType::Color, maFPath));
(void)mpColorList->Load();
}
rColorSet.Clear();
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index e2dbe421c885..cccf1672bc24 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -189,7 +189,7 @@ void PaletteManager::SetPalette( sal_Int32 nPos )
{
pColorList = XPropertyList::AsColorList(
XPropertyList::CreatePropertyListFromURL(
- XCOLOR_LIST, GetSelectedPalettePath()));
+ XPropertyListType::Color, GetSelectedPalettePath()));
pColorList->SetName(GetPaletteName());
if(pColorList->Load())
{
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 96f160254285..9251ff39eb89 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -499,7 +499,7 @@ void SvxFillToolBoxControl::Update()
XBitmapListRef xBitmapList =
XPropertyList::AsBitmapList(
XPropertyList::CreatePropertyList(
- XBITMAP_LIST, "TmpList", ""/*TODO?*/));
+ XPropertyListType::Bitmap, "TmpList", ""/*TODO?*/));
xBitmapList->Insert(o3tl::make_unique<XBitmapEntry>(mpBitmapItem->GetGraphicObject(), aTmpStr));
xBitmapList->SetDirty( false );
mpLbFillAttr->Fill( xBitmapList );
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 55f01081a6fe..11bb724ef4b3 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -67,7 +67,7 @@ SvxUnoColorTable::SvxUnoColorTable()
{
pList = XPropertyList::AsColorList(
XPropertyList::CreatePropertyList(
- XCOLOR_LIST, SvtPathOptions().GetPalettePath(), ""));
+ XPropertyListType::Color, SvtPathOptions().GetPalettePath(), ""));
}
sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
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 )
{
}