Skip to content

Commit 0ac10b1

Browse files
committed
Break Tests
Change-Id: I2c36f8e602bc3f6e029c0b5e940df8d5893635ac
1 parent 041245c commit 0ac10b1

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

Src/Common/Controls/XMLViews/XmlBrowseViewBaseVc.cs

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -597,19 +597,19 @@ internal int ListItemsClass
597597
/// <returns>True if we can't prove the column is invalid</returns>
598598
internal bool IsValidColumnSpec(XmlNode node)
599599
{
600-
List<XmlNode> possibleColumns = this.PossibleColumnSpecs;
601-
// first, check to see if we can find some part or child node information
602-
// to process. Eg. Custom field column nodes that refer to parts that no longer exist
603-
// because the custom field has been removed so the parts cannot be generated
604-
XmlNode partNode = this.GetPartFromParentNode(node, this.ListItemsClass);
605-
if (partNode == null)
606-
return false; // invalid node, don't add.
607-
bool badCustomField = CheckForBadCustomField(possibleColumns, node);
608-
if (badCustomField)
609-
return false; // invalid custom field, don't add.
610-
bool badReversalIndex = CheckForBadReversalIndex(possibleColumns, node);
611-
if (badReversalIndex)
612-
return false;
600+
List<XmlNode> possibleColumns = ComputePossibleColumns();
601+
//// first, check to see if we can find some part or child node information
602+
//// to process. Eg. Custom field column nodes that refer to parts that no longer exist
603+
//// because the custom field has been removed so the parts cannot be generated
604+
//XmlNode partNode = this.GetPartFromParentNode(node, this.ListItemsClass);
605+
//if (partNode == null)
606+
// return false; // invalid node, don't add.
607+
//bool badCustomField = CheckForBadCustomField(possibleColumns, node);
608+
//if (badCustomField)
609+
// return false; // invalid custom field, don't add.
610+
//bool badReversalIndex = CheckForBadReversalIndex(possibleColumns, node);
611+
//if (badReversalIndex)
612+
// return false;
613613
return true; // valid as far as we can tell.
614614
}
615615

@@ -1906,15 +1906,16 @@ public override void AddObjProp(int tag, IVwViewConstructor vc, int frag)
19061906
/// </summary>
19071907
internal bool RemoveInvalidColumns()
19081908
{
1909-
List<XmlNode> invalidColumns = new List<XmlNode>();
1910-
for (int i = 0; i < m_columns.Count; ++i)
1911-
{
1912-
if (!IsValidColumnSpec(m_columns[i]))
1913-
invalidColumns.Add(m_columns[i]);
1914-
}
1915-
for (int i = 0; i < invalidColumns.Count; ++i)
1916-
m_columns.Remove(invalidColumns[i]);
1917-
return invalidColumns.Count > 0;
1909+
return false;
1910+
//List<XmlNode> invalidColumns = new List<XmlNode>();
1911+
//for (int i = 0; i < m_columns.Count; ++i)
1912+
//{
1913+
// if (!IsValidColumnSpec(m_columns[i]))
1914+
// invalidColumns.Add(m_columns[i]);
1915+
//}
1916+
//for (int i = 0; i < invalidColumns.Count; ++i)
1917+
// m_columns.Remove(invalidColumns[i]);
1918+
//return invalidColumns.Count > 0;
19181919
}
19191920
}
19201921
}

0 commit comments

Comments
 (0)