diff options
-rw-r--r-- | src/wix/WixToolset.Core/Compiler.cs | 2 | ||||
-rw-r--r-- | src/wix/WixToolset.Core/Compiler_UI.cs | 8 | ||||
-rw-r--r-- | src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/wix/WixToolset.Core/Compiler.cs b/src/wix/WixToolset.Core/Compiler.cs index c39bec70..301a4f6a 100644 --- a/src/wix/WixToolset.Core/Compiler.cs +++ b/src/wix/WixToolset.Core/Compiler.cs | |||
@@ -2094,7 +2094,7 @@ namespace WixToolset.Core | |||
2094 | /// Parses a component element. | 2094 | /// Parses a component element. |
2095 | /// </summary> | 2095 | /// </summary> |
2096 | /// <param name="node">Element to parse.</param> | 2096 | /// <param name="node">Element to parse.</param> |
2097 | /// <param name="parentType">Type of component's complex reference parent. Will be Uknown if there is no parent.</param> | 2097 | /// <param name="parentType">Type of component's complex reference parent. Will be Unknown if there is no parent.</param> |
2098 | /// <param name="parentId">Optional identifier for component's primary parent.</param> | 2098 | /// <param name="parentId">Optional identifier for component's primary parent.</param> |
2099 | /// <param name="parentLanguage">Optional string for component's parent's language.</param> | 2099 | /// <param name="parentLanguage">Optional string for component's parent's language.</param> |
2100 | /// <param name="diskId">Optional disk id inherited from parent directory.</param> | 2100 | /// <param name="diskId">Optional disk id inherited from parent directory.</param> |
diff --git a/src/wix/WixToolset.Core/Compiler_UI.cs b/src/wix/WixToolset.Core/Compiler_UI.cs index d712ec91..5661d101 100644 --- a/src/wix/WixToolset.Core/Compiler_UI.cs +++ b/src/wix/WixToolset.Core/Compiler_UI.cs | |||
@@ -1534,10 +1534,10 @@ namespace WixToolset.Core | |||
1534 | SourceFile = String.IsNullOrEmpty(sourceFile) ? null : new IntermediateFieldPathValue { Path = sourceFile } | 1534 | SourceFile = String.IsNullOrEmpty(sourceFile) ? null : new IntermediateFieldPathValue { Path = sourceFile } |
1535 | }); | 1535 | }); |
1536 | 1536 | ||
1537 | controlSymbol.Set((int)BBControlSymbolFields.X, x); | 1537 | controlSymbol.Set((int)ControlSymbolFields.X, x); |
1538 | controlSymbol.Set((int)BBControlSymbolFields.Y, y); | 1538 | controlSymbol.Set((int)ControlSymbolFields.Y, y); |
1539 | controlSymbol.Set((int)BBControlSymbolFields.Width, width); | 1539 | controlSymbol.Set((int)ControlSymbolFields.Width, width); |
1540 | controlSymbol.Set((int)BBControlSymbolFields.Height, height); | 1540 | controlSymbol.Set((int)ControlSymbolFields.Height, height); |
1541 | 1541 | ||
1542 | symbol = controlSymbol; | 1542 | symbol = controlSymbol; |
1543 | } | 1543 | } |
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs index c1368190..1a678b0d 100644 --- a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs +++ b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | |||
@@ -38,7 +38,6 @@ namespace WixToolset.Core.ExtensibilityServices | |||
38 | 38 | ||
39 | public void CreateComplexReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, string parentLanguage, ComplexReferenceChildType childType, string childId, bool isPrimary) | 39 | public void CreateComplexReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, string parentLanguage, ComplexReferenceChildType childType, string childId, bool isPrimary) |
40 | { | 40 | { |
41 | |||
42 | section.AddSymbol(new WixComplexReferenceSymbol(sourceLineNumbers) | 41 | section.AddSymbol(new WixComplexReferenceSymbol(sourceLineNumbers) |
43 | { | 42 | { |
44 | Parent = parentId, | 43 | Parent = parentId, |