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 @@ ...@@ -51,12 +51,14 @@
class SvxURLField; class SvxURLField;
enum SdrViewContext {SDRCONTEXT_STANDARD, enum class SdrViewContext {
SDRCONTEXT_POINTEDIT, Standard,
SDRCONTEXT_GLUEPOINTEDIT, PointEdit,
SDRCONTEXT_GRAPHIC, GluePointEdit,
SDRCONTEXT_MEDIA, Graphic,
SDRCONTEXT_TABLE}; Media,
Table
};
enum class SdrEventKind { enum class SdrEventKind {
NONE, NONE,
......
...@@ -839,7 +839,7 @@ bool MotionPathTag::getContext( SdrViewContext& rContext ) ...@@ -839,7 +839,7 @@ bool MotionPathTag::getContext( SdrViewContext& rContext )
{ {
if( mpPathObj && isSelected() && !mrView.IsFrameDragSingles() ) if( mpPathObj && isSelected() && !mrView.IsFrameDragSingles() )
{ {
rContext = SDRCONTEXT_POINTEDIT; rContext = SdrViewContext::PointEdit;
return true; return true;
} }
else else
......
...@@ -1086,22 +1086,22 @@ void ToolBarRules::SelectionHasChanged ( ...@@ -1086,22 +1086,22 @@ void ToolBarRules::SelectionHasChanged (
switch (rView.GetContext()) switch (rView.GetContext())
{ {
case SDRCONTEXT_GRAPHIC: case SdrViewContext::Graphic:
if( !bTextEdit ) if( !bTextEdit )
mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_GRAF_TOOLBOX); mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_GRAF_TOOLBOX);
break; break;
case SDRCONTEXT_MEDIA: case SdrViewContext::Media:
if( !bTextEdit ) if( !bTextEdit )
mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_MEDIA_TOOLBOX); mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_MEDIA_TOOLBOX);
break; break;
case SDRCONTEXT_TABLE: case SdrViewContext::Table:
mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_TABLE_TOOLBOX); mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_TABLE_TOOLBOX);
bTextEdit = true; bTextEdit = true;
break; break;
case SDRCONTEXT_STANDARD: case SdrViewContext::Standard:
default: default:
if( !bTextEdit ) if( !bTextEdit )
{ {
...@@ -1135,7 +1135,7 @@ void ToolBarRules::SelectionHasChanged ( ...@@ -1135,7 +1135,7 @@ void ToolBarRules::SelectionHasChanged (
mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_SVX_FONTWORK_BAR); mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_SVX_FONTWORK_BAR);
// Switch on additional context-sensitive tool bars. // 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); mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_BEZIER_TOOLBOX);
} }
......
...@@ -1137,7 +1137,7 @@ void View::updateHandles() ...@@ -1137,7 +1137,7 @@ void View::updateHandles()
SdrViewContext View::GetContext() const SdrViewContext View::GetContext() const
{ {
SdrViewContext eContext = SDRCONTEXT_STANDARD; SdrViewContext eContext = SdrViewContext::Standard;
if( maSmartTags.getContext( eContext ) ) if( maSmartTags.getContext( eContext ) )
return eContext; return eContext;
else else
......
...@@ -1296,7 +1296,7 @@ OUString SdrView::GetStatusText() ...@@ -1296,7 +1296,7 @@ OUString SdrView::GetStatusText()
SdrViewContext SdrView::GetContext() const SdrViewContext SdrView::GetContext() const
{ {
if( IsGluePointEditMode() ) if( IsGluePointEditMode() )
return SDRCONTEXT_GLUEPOINTEDIT; return SdrViewContext::GluePointEdit;
const size_t nMarkCount = GetMarkedObjectCount(); const size_t nMarkCount = GetMarkedObjectCount();
...@@ -1308,7 +1308,7 @@ SdrViewContext SdrView::GetContext() const ...@@ -1308,7 +1308,7 @@ SdrViewContext SdrView::GetContext() const
bPath=false; bPath=false;
if( bPath ) if( bPath )
return SDRCONTEXT_POINTEDIT; return SdrViewContext::PointEdit;
} }
if( GetMarkedObjectCount() ) if( GetMarkedObjectCount() )
...@@ -1334,14 +1334,14 @@ SdrViewContext SdrView::GetContext() const ...@@ -1334,14 +1334,14 @@ SdrViewContext SdrView::GetContext() const
} }
if( bGraf ) if( bGraf )
return SDRCONTEXT_GRAPHIC; return SdrViewContext::Graphic;
else if( bMedia ) else if( bMedia )
return SDRCONTEXT_MEDIA; return SdrViewContext::Media;
else if( bTable ) else if( bTable )
return SDRCONTEXT_TABLE; return SdrViewContext::Table;
} }
return SDRCONTEXT_STANDARD; return SdrViewContext::Standard;
} }
void SdrView::MarkAll() void SdrView::MarkAll()
...@@ -1398,7 +1398,7 @@ void SdrView::DeleteMarked() ...@@ -1398,7 +1398,7 @@ void SdrView::DeleteMarked()
{ {
DeleteMarkedGluePoints(); DeleteMarkedGluePoints();
} }
else if (GetContext()==SDRCONTEXT_POINTEDIT && HasMarkedPoints()) else if (GetContext()==SdrViewContext::PointEdit && HasMarkedPoints())
{ {
DeleteMarkedPoints(); DeleteMarkedPoints();
} }
......
...@@ -1381,7 +1381,7 @@ SelectionType SwWrtShell::GetSelectionType() const ...@@ -1381,7 +1381,7 @@ SelectionType SwWrtShell::GetSelectionType() const
if (_rView.IsBezierEditMode()) if (_rView.IsBezierEditMode())
nCnt |= nsSelectionType::SEL_BEZ; nCnt |= nsSelectionType::SEL_BEZ;
else if( GetDrawView()->GetContext() == SDRCONTEXT_MEDIA ) else if( GetDrawView()->GetContext() == SdrViewContext::Media )
nCnt |= nsSelectionType::SEL_MEDIA; nCnt |= nsSelectionType::SEL_MEDIA;
if (svx::checkForSelectedCustomShapes( 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