Kaydet (Commit) e5301736 authored tarafından Noel Grandin's avatar Noel Grandin

convert SdrViewContext to scoped enum

Change-Id: Ic41d522cdb7f80614bd5f269fe1d63f022d8dd84
üst 565e08cd
......@@ -51,12 +51,14 @@
class SvxURLField;
enum SdrViewContext {SDRCONTEXT_STANDARD,
SDRCONTEXT_POINTEDIT,
SDRCONTEXT_GLUEPOINTEDIT,
SDRCONTEXT_GRAPHIC,
SDRCONTEXT_MEDIA,
SDRCONTEXT_TABLE};
enum class SdrViewContext {
Standard,
PointEdit,
GluePointEdit,
Graphic,
Media,
Table
};
enum class SdrEventKind {
NONE,
......
......@@ -839,7 +839,7 @@ bool MotionPathTag::getContext( SdrViewContext& rContext )
{
if( mpPathObj && isSelected() && !mrView.IsFrameDragSingles() )
{
rContext = SDRCONTEXT_POINTEDIT;
rContext = SdrViewContext::PointEdit;
return true;
}
else
......
......@@ -1086,22 +1086,22 @@ void ToolBarRules::SelectionHasChanged (
switch (rView.GetContext())
{
case SDRCONTEXT_GRAPHIC:
case SdrViewContext::Graphic:
if( !bTextEdit )
mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_GRAF_TOOLBOX);
break;
case SDRCONTEXT_MEDIA:
case SdrViewContext::Media:
if( !bTextEdit )
mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_MEDIA_TOOLBOX);
break;
case SDRCONTEXT_TABLE:
case SdrViewContext::Table:
mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_TABLE_TOOLBOX);
bTextEdit = true;
break;
case SDRCONTEXT_STANDARD:
case SdrViewContext::Standard:
default:
if( !bTextEdit )
{
......@@ -1135,7 +1135,7 @@ void ToolBarRules::SelectionHasChanged (
mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_SVX_FONTWORK_BAR);
// Switch on additional context-sensitive tool bars.
if (rView.GetContext() == SDRCONTEXT_POINTEDIT)
if (rView.GetContext() == SdrViewContext::PointEdit)
mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_BEZIER_TOOLBOX);
}
......
......@@ -1137,7 +1137,7 @@ void View::updateHandles()
SdrViewContext View::GetContext() const
{
SdrViewContext eContext = SDRCONTEXT_STANDARD;
SdrViewContext eContext = SdrViewContext::Standard;
if( maSmartTags.getContext( eContext ) )
return eContext;
else
......
......@@ -1296,7 +1296,7 @@ OUString SdrView::GetStatusText()
SdrViewContext SdrView::GetContext() const
{
if( IsGluePointEditMode() )
return SDRCONTEXT_GLUEPOINTEDIT;
return SdrViewContext::GluePointEdit;
const size_t nMarkCount = GetMarkedObjectCount();
......@@ -1308,7 +1308,7 @@ SdrViewContext SdrView::GetContext() const
bPath=false;
if( bPath )
return SDRCONTEXT_POINTEDIT;
return SdrViewContext::PointEdit;
}
if( GetMarkedObjectCount() )
......@@ -1334,14 +1334,14 @@ SdrViewContext SdrView::GetContext() const
}
if( bGraf )
return SDRCONTEXT_GRAPHIC;
return SdrViewContext::Graphic;
else if( bMedia )
return SDRCONTEXT_MEDIA;
return SdrViewContext::Media;
else if( bTable )
return SDRCONTEXT_TABLE;
return SdrViewContext::Table;
}
return SDRCONTEXT_STANDARD;
return SdrViewContext::Standard;
}
void SdrView::MarkAll()
......@@ -1398,7 +1398,7 @@ void SdrView::DeleteMarked()
{
DeleteMarkedGluePoints();
}
else if (GetContext()==SDRCONTEXT_POINTEDIT && HasMarkedPoints())
else if (GetContext()==SdrViewContext::PointEdit && HasMarkedPoints())
{
DeleteMarkedPoints();
}
......
......@@ -1381,7 +1381,7 @@ SelectionType SwWrtShell::GetSelectionType() const
if (_rView.IsBezierEditMode())
nCnt |= nsSelectionType::SEL_BEZ;
else if( GetDrawView()->GetContext() == SDRCONTEXT_MEDIA )
else if( GetDrawView()->GetContext() == SdrViewContext::Media )
nCnt |= nsSelectionType::SEL_MEDIA;
if (svx::checkForSelectedCustomShapes(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment