summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/svx/svdundo.hxx8
-rw-r--r--svx/source/svdraw/svdobj.cxx6
-rw-r--r--svx/source/svdraw/svdundo.cxx18
3 files changed, 16 insertions, 16 deletions
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index fa6cc8a424c7..906f565d2d14 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -436,11 +436,11 @@ public:
class SdrUndoObjStrAttr : public SdrUndoObj
{
public:
- enum ObjStrAttrType
+ enum class ObjStrAttrType
{
- OBJ_NAME,
- OBJ_TITLE,
- OBJ_DESCRIPTION
+ Name,
+ Title,
+ Description
};
protected:
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index defafc5ab92b..6379c4f02793 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -657,7 +657,7 @@ void SdrObject::SetName(const OUString& rStr)
SdrUndoAction* pUndoAction =
SdrUndoFactory::CreateUndoObjectStrAttr(
*this,
- SdrUndoObjStrAttr::OBJ_NAME,
+ SdrUndoObjStrAttr::ObjStrAttrType::Name,
GetName(),
rStr );
GetModel()->BegUndo( pUndoAction->GetComment() );
@@ -701,7 +701,7 @@ void SdrObject::SetTitle(const OUString& rStr)
SdrUndoAction* pUndoAction =
SdrUndoFactory::CreateUndoObjectStrAttr(
*this,
- SdrUndoObjStrAttr::OBJ_TITLE,
+ SdrUndoObjStrAttr::ObjStrAttrType::Title,
GetTitle(),
rStr );
GetModel()->BegUndo( pUndoAction->GetComment() );
@@ -745,7 +745,7 @@ void SdrObject::SetDescription(const OUString& rStr)
SdrUndoAction* pUndoAction =
SdrUndoFactory::CreateUndoObjectStrAttr(
*this,
- SdrUndoObjStrAttr::OBJ_DESCRIPTION,
+ SdrUndoObjStrAttr::ObjStrAttrType::Description,
GetDescription(),
rStr );
GetModel()->BegUndo( pUndoAction->GetComment() );
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 42b8337db3b1..71af6719d067 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1245,13 +1245,13 @@ void SdrUndoObjStrAttr::Undo()
switch ( meObjStrAttr )
{
- case OBJ_NAME:
+ case ObjStrAttrType::Name:
pObj->SetName( msOldStr );
break;
- case OBJ_TITLE:
+ case ObjStrAttrType::Title:
pObj->SetTitle( msOldStr );
break;
- case OBJ_DESCRIPTION:
+ case ObjStrAttrType::Description:
pObj->SetDescription( msOldStr );
break;
}
@@ -1261,13 +1261,13 @@ void SdrUndoObjStrAttr::Redo()
{
switch ( meObjStrAttr )
{
- case OBJ_NAME:
+ case ObjStrAttrType::Name:
pObj->SetName( msNewStr );
break;
- case OBJ_TITLE:
+ case ObjStrAttrType::Title:
pObj->SetTitle( msNewStr );
break;
- case OBJ_DESCRIPTION:
+ case ObjStrAttrType::Description:
pObj->SetDescription( msNewStr );
break;
}
@@ -1280,14 +1280,14 @@ OUString SdrUndoObjStrAttr::GetComment() const
OUString aStr;
switch ( meObjStrAttr )
{
- case OBJ_NAME:
+ case ObjStrAttrType::Name:
ImpTakeDescriptionStr( STR_UndoObjName, aStr );
aStr += " '" + msNewStr + "'";
break;
- case OBJ_TITLE:
+ case ObjStrAttrType::Title:
ImpTakeDescriptionStr( STR_UndoObjTitle, aStr );
break;
- case OBJ_DESCRIPTION:
+ case ObjStrAttrType::Description:
ImpTakeDescriptionStr( STR_UndoObjDescription, aStr );
break;
}