Skip to content

Commit 96920cc

Browse files
authored
Merge branch 'next' into translation
2 parents d73894d + 5f9b32e commit 96920cc

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

RetailCoder.VBE/UnitTesting/FakeBase.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,15 @@ public virtual void ReturnsWhen(string parameter, object argument, object value,
8686
}
8787

8888
#endregion
89+
90+
#region StubBase
91+
92+
public override void Dispose()
93+
{
94+
base.Dispose();
95+
ReturnValues.Clear();
96+
}
97+
98+
#endregion
8999
}
90100
}

Rubberduck.VBEEditor/SafeComWrappers/VBA/VBComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private void ExportUserFormModule(string path)
114114

115115
var tempFile = ExportToTempFile();
116116
var tempFilePath = Directory.GetParent(tempFile).FullName;
117-
var contents = File.ReadAllLines(tempFile);
117+
var contents = File.ReadAllLines(tempFile, System.Text.Encoding.UTF7);
118118
var nonAttributeLines = contents.TakeWhile(line => !line.StartsWith("Attribute")).Count();
119119
var attributeLines = contents.Skip(nonAttributeLines).TakeWhile(line => line.StartsWith("Attribute")).Count();
120120
var declarationsStartLine = nonAttributeLines + attributeLines + 1;

0 commit comments

Comments
 (0)