From 7aad443f48dbc27e36726df691871b690c545c77 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 27 Jul 2009 23:55:17 +0000 Subject: [PATCH] Delete some code in SubsEditBox::SetOverride that did nothing. Originally committed to SVN as r3301. --- aegisub/src/subs_edit_box.cpp | 36 +---------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp index eab7350b2..c724c2146 100644 --- a/aegisub/src/subs_edit_box.cpp +++ b/aegisub/src/subs_edit_box.cpp @@ -1035,14 +1035,10 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos,b // Default value wxColour startcolor; wxFont startfont; - float startangle; - float startScale; bool isColor = false; bool isFont = false; bool isGeneric = false; bool isFlag = false; - bool isAngle = false; - bool isScale = false; bool state = false; AssStyle *style = grid->ass->GetStyle(grid->GetDialogue(linen)->Style); AssStyle defStyle; @@ -1087,22 +1083,6 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos,b startcolor = style->shadow.GetWXColor(); isColor = true; } - else if (tagname == _T("\\frz")) { - startangle = style->angle; - isAngle = true; - } - else if (tagname == _T("\\frx") || tagname == _T("\\fry")) { - startangle = 0.0; - isAngle = true; - } - else if (tagname == _T("\\fscx")) { - startScale = style->scalex; - isScale = true; - } - else if (tagname == _T("\\fscy")) { - startScale = style->scaley; - isScale = true; - } else isGeneric = true; bool hasEnd = isFlag; @@ -1110,7 +1090,7 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos,b // Find current value of style AssDialogueBlockOverride *override; AssOverrideTag *tag; - if (isFont || isColor || isFlag || isAngle) { + if (isFont || isColor || isFlag) { for (size_t i=0;i<=blockn;i++) { override = AssDialogueBlock::GetAsOverride(line->Blocks.at(i)); if (override) { @@ -1126,8 +1106,6 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos,b if (tag->Name == _T("\\i")) startfont.SetStyle(tag->Params.at(0)->AsBool() ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL); if (tag->Name == _T("\\u")) startfont.SetUnderlined(tag->Params.at(0)->AsBool()); } - if (isAngle) startangle = tag->Params.at(0)->AsFloat(); - if (isScale) startScale = tag->Params.at(0)->AsFloat(); } } } @@ -1213,18 +1191,6 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos,b insertTags.Add(tagname); } - // Angle - if (isAngle) { - insert = tagname + preValue; - insertTags.Add(tagname); - } - - // Scale - if (isScale) { - insert = tagname + preValue; - insertTags.Add(tagname); - } - // Get current block as plain or override AssDialogueBlockPlain *plain = AssDialogueBlock::GetAsPlain(block); override = AssDialogueBlock::GetAsOverride(block);