diff options
author | Rob Mensching <rob@firegiant.com> | 2021-03-23 01:24:54 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-03-23 01:30:11 -0700 |
commit | 734be59ad7edaa1444f713338fcdbc0c4b9c273b (patch) | |
tree | 1b9c6aa693f861abddee82e944758b16a5552901 /src/WixToolset.Core | |
parent | 977b748b499e02f7e5226416b1cf5cfcf3842129 (diff) | |
download | wix-734be59ad7edaa1444f713338fcdbc0c4b9c273b.tar.gz wix-734be59ad7edaa1444f713338fcdbc0c4b9c273b.tar.bz2 wix-734be59ad7edaa1444f713338fcdbc0c4b9c273b.zip |
Minor code clean up
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r-- | src/WixToolset.Core/Link/ConnectToFeature.cs | 10 | ||||
-rw-r--r-- | src/WixToolset.Core/Linker.cs | 45 |
2 files changed, 0 insertions, 55 deletions
diff --git a/src/WixToolset.Core/Link/ConnectToFeature.cs b/src/WixToolset.Core/Link/ConnectToFeature.cs index dd95f2db..e9a739a1 100644 --- a/src/WixToolset.Core/Link/ConnectToFeature.cs +++ b/src/WixToolset.Core/Link/ConnectToFeature.cs | |||
@@ -15,16 +15,6 @@ namespace WixToolset.Core.Link | |||
15 | /// </summary> | 15 | /// </summary> |
16 | /// <param name="section">Section this connect belongs to.</param> | 16 | /// <param name="section">Section this connect belongs to.</param> |
17 | /// <param name="childId">Id of the child.</param> | 17 | /// <param name="childId">Id of the child.</param> |
18 | public ConnectToFeature(IntermediateSection section, string childId) : | ||
19 | this(section, childId, null, false) | ||
20 | { | ||
21 | } | ||
22 | |||
23 | /// <summary> | ||
24 | /// Creates a new connect to feature. | ||
25 | /// </summary> | ||
26 | /// <param name="section">Section this connect belongs to.</param> | ||
27 | /// <param name="childId">Id of the child.</param> | ||
28 | /// <param name="primaryFeature">Sets the primary feature for the connection.</param> | 18 | /// <param name="primaryFeature">Sets the primary feature for the connection.</param> |
29 | /// <param name="explicitPrimaryFeature">Sets if this is explicit primary.</param> | 19 | /// <param name="explicitPrimaryFeature">Sets if this is explicit primary.</param> |
30 | public ConnectToFeature(IntermediateSection section, string childId, string primaryFeature, bool explicitPrimaryFeature) | 20 | public ConnectToFeature(IntermediateSection section, string childId, string primaryFeature, bool explicitPrimaryFeature) |
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs index d5c51f96..a6d43715 100644 --- a/src/WixToolset.Core/Linker.cs +++ b/src/WixToolset.Core/Linker.cs | |||
@@ -901,51 +901,6 @@ namespace WixToolset.Core | |||
901 | } | 901 | } |
902 | } | 902 | } |
903 | 903 | ||
904 | #if DEAD_CODE | ||
905 | /// <summary> | ||
906 | /// Copies a table's rows to an output table. | ||
907 | /// </summary> | ||
908 | /// <param name="table">Source table to copy rows from.</param> | ||
909 | /// <param name="outputTable">Destination table in output to copy rows into.</param> | ||
910 | /// <param name="sectionId">Id of the section that the table lives in.</param> | ||
911 | private void CopyTableRowsToOutputTable(Table table, Table outputTable, string sectionId) | ||
912 | { | ||
913 | int[] localizedColumns = new int[table.Definition.Columns.Count]; | ||
914 | int localizedColumnCount = 0; | ||
915 | |||
916 | // if there are localization strings, figure out which columns can be localized in this table | ||
917 | if (null != this.Localizer) | ||
918 | { | ||
919 | for (int i = 0; i < table.Definition.Columns.Count; i++) | ||
920 | { | ||
921 | if (table.Definition.Columns[i].IsLocalizable) | ||
922 | { | ||
923 | localizedColumns[localizedColumnCount++] = i; | ||
924 | } | ||
925 | } | ||
926 | } | ||
927 | |||
928 | // process each row in the table doing the string resource substitutions | ||
929 | // then add the row to the output | ||
930 | foreach (Row row in table.Rows) | ||
931 | { | ||
932 | for (int j = 0; j < localizedColumnCount; j++) | ||
933 | { | ||
934 | Field field = row.Fields[localizedColumns[j]]; | ||
935 | |||
936 | if (null != field.Data) | ||
937 | { | ||
938 | field.Data = this.WixVariableResolver.ResolveVariables(row.SourceLineNumbers, (string)field.Data, true); | ||
939 | } | ||
940 | } | ||
941 | |||
942 | row.SectionId = (this.sectionIdOnRows ? sectionId : null); | ||
943 | outputTable.Rows.Add(row); | ||
944 | } | ||
945 | } | ||
946 | #endif | ||
947 | |||
948 | |||
949 | /// <summary> | 904 | /// <summary> |
950 | /// Resolve features for columns that have null guid placeholders. | 905 | /// Resolve features for columns that have null guid placeholders. |
951 | /// </summary> | 906 | /// </summary> |