This commit is contained in:
Kathy Ruffing 2012-02-15 12:38:35 +00:00
parent dfa4855cd2
commit f87bf4d09a
2 changed files with 12 additions and 12 deletions

View File

@ -1559,7 +1559,7 @@ namespace fmtxml
fmtName = alias;
//if (fmtName.ToUpper() != "CPLS" && fmtName.ToUpper() != "BASE") return;
//if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE" && fmtName.ToUpper() != "WCN2") return;
//if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE") return;
//if (fmtName.ToUpper() != "WCN1" && fmtName.ToUpper() != "BASE") return;
try
{
LoadFormatFile(nm + ".fmt", ref SubXtraFlags);
@ -3202,18 +3202,18 @@ namespace fmtxml
if (fmtdata.TransData.TransTypeData[i].TransFormat != null && fmtdata.TransData.TransTypeData[i].TransMenu != null) fmtdata.TransData.TransTypeData[i].TransUI = GetTransUIEnum(fmtdata.TransData.TransTypeData[i].TransFormat, fmtdata.TransData.TransTypeData[i].TransMenu);
}
// if in dosectiontransitions, put the format/menu strings back to original
if (XtraFlags.DoSectionTrans == "True")
{
for (int i = 0; i < MAXTRANS; i++)
{
if (i < 6 && fmtdata.TransData.TransTypeData[i].TransMenu != null)
{
fmtdata.TransData.TransTypeData[i].TransFormat = DefaultSectionTransFormatStr[i];
fmtdata.TransData.TransTypeData[i].TransMenu = DefaultSectionTransFormatStr[i];
//if (XtraFlags.DoSectionTrans == "True")
//{
// for (int i = 0; i < MAXTRANS; i++)
// {
// if (i < 6 && fmtdata.TransData.TransTypeData[i].TransMenu != null)
// {
// fmtdata.TransData.TransTypeData[i].TransFormat = DefaultSectionTransFormatStr[i];
// fmtdata.TransData.TransTypeData[i].TransMenu = DefaultSectionTransFormatStr[i];
}
}
}
// }
// }
//}
//arcnt = arcnt + MAXTRANS;
// not used OutsideTransFmt & OutsideTransMenu

Binary file not shown.