Skip to content

Commit 041245c

Browse files
committed
LT-22265: Hide Invalid Columns in Bulk Edit Phoneme Features
and update .gitignore (unrelated) Change-Id: Id650c14534e898426dd0fc805315bd4ce09974ee
1 parent 8e508da commit 041245c

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

.gitignore

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,16 @@ Bin/_setLatestBuildConfig.bat
3030
Bin/_setroot.bat
3131
Lib/debug/DebugProcs.lib
3232
Lib/debug/Generic.lib
33+
Lib/debug/graphite2.lib
3334
Lib/debug/System.Buffers.dll
3435
Lib/debug/System.ValueTuple.dll
3536
Lib/debug/unit++.*
3637
Lib/release/DebugProcs.lib
3738
Lib/release/Generic.lib
38-
Lib/release/unit++.lib
39+
Lib/release/graphite2.lib
40+
Lib/release/System.Buffers.dll
41+
Lib/release/System.ValueTuple.dll
42+
Lib/release/unit++.*
3943
DistFiles/Parts/Generated.fwlayout
4044
Lib/src/Ethnologue/GeneratedEthnologue.cs
4145
Src/FwParatextLexiconPlugin/GeneratedParatextLexiconPluginRegistryHelper.cs
@@ -94,6 +98,8 @@ Lib/src/unit++/autom4te.cache/
9498
Lib/src/unit++/configure
9599
Lib/src/unit++/VS/*/
96100
Lib/src/Enchant/fieldworks-enchant-1.6.1/
101+
Src/Kernel/FwKernelTlb.idl
102+
Src/Kernel/*.idh
97103
Src/Kernel/libFwKernel
98104
Src/views/libViews
99105
Src/views/libVwGraphics
@@ -125,9 +131,6 @@ DistFiles/ReleaseData/
125131
!Lib/Windows/Debug
126132
!Lib/Windows/Release
127133

128-
Lib/debug/graphite2.lib
129-
Lib/release/graphite2.lib
130-
131134
Lib/icu*.lib
132135
DistFiles/Icu*/data
133136
DistFiles/Icu*/icudt*l
@@ -139,6 +142,3 @@ DistFiles/Templates/GOLDEtic.xml
139142
DistFiles/Templates/NewLangProj.fwdata
140143
DistFiles/Templates/POS.xml
141144
DistFiles/Templates/SemDom.xml
142-
143-
Src/Kernel/FwKernelTlb.idl
144-
Src/Kernel/*.idh

Src/Common/Controls/XMLViews/XmlBrowseViewBaseVc.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ internal int ListItemsClass
594594
/// check to see if column spec is still valid and useable.
595595
/// </summary>
596596
/// <param name="node"></param>
597-
/// <returns></returns>
597+
/// <returns>True if we can't prove the column is invalid</returns>
598598
internal bool IsValidColumnSpec(XmlNode node)
599599
{
600600
List<XmlNode> possibleColumns = this.PossibleColumnSpecs;
@@ -656,8 +656,6 @@ private bool CheckForBadCustomField(List<XmlNode> possibleColumns, XmlNode node)
656656
return false;
657657
}
658658

659-
660-
661659
private string GetNewLabelFromMatchingCustomField(List<XmlNode> possibleColumns, int flid)
662660
{
663661
foreach (XmlNode possibleColumn in possibleColumns)

0 commit comments

Comments
 (0)