Skip to content

Commit f6160ed

Browse files
steseestesee
authored
Merge pull request OpenXmlDev#39 from Codeuctivity/WarningsFixed
Fixed some CS8604 warnings
2 parents d17d62c + dd73d51 commit f6160ed

File tree

54 files changed

+1246
-1523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1246
-1523
lines changed

‎OpenXmlPowerTools.Tests/HtmlToWmlReadAsXElement.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ public static XElement ReadAsXElement(FileInfo sourceHtmlFi)
7171

7272
private static object ConvertToNoNamespace(XNode node)
7373
{
74-
var element = node as XElement;
75-
if (element != null)
74+
if (node is XElement element)
7675
{
7776
return new XElement(element.Name.LocalName,
7877
element.Attributes().Where(a => !a.IsNamespaceDeclaration),

‎OpenXmlPowerTools.Tests/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverterHandlerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void ShouldTranslateWithWordprocessingTextDummyHandler()
3232
[InlineData("png", minimalPng)]
3333
[InlineData("bmp", minimalBmp)]
3434
[InlineData("jpeg", minimalJpg)]
35-
public async void ShouldTranslateWithDefaultImageHandler(string imageType, string minimalImage)
35+
public void ShouldTranslateWithDefaultImageHandler(string imageType, string minimalImage)
3636
{
3737
var expectedStart = $"<img src=\"data:image/{imageType};base64,";
3838
var expectedEnd = "\" xmlns=\"http://www.w3.org/1999/xhtml\" />";

‎OpenXmlPowerTools/Chart/ChartUpdater.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private static void UpdateSeries(ChartPart chartPart, ChartData chartData)
110110
var root = cpXDoc.Root;
111111
var firstSeries = root.Descendants(C.ser).FirstOrDefault();
112112
var numRef = firstSeries.Elements(C.val).Elements(C.numRef).FirstOrDefault();
113-
string sheetName = null;
113+
string? sheetName = null;
114114
var f = (string)firstSeries.Descendants(C.f).FirstOrDefault();
115115
if (f != null)
116116
{
@@ -124,7 +124,7 @@ private static void UpdateSeries(ChartPart chartPart, ChartData chartData)
124124
var newSetOfSeries = chartData.SeriesNames
125125
.Select((sn, si) =>
126126
{
127-
XElement cat = null;
127+
XElement? cat = null;
128128

129129
var oldCat = firstSeries.Elements(C.cat).FirstOrDefault();
130130
if (oldCat == null)
@@ -135,7 +135,7 @@ private static void UpdateSeries(ChartPart chartPart, ChartData chartData)
135135
var catHasFormula = oldCat.Descendants(C.f).Any();
136136
if (catHasFormula)
137137
{
138-
XElement newFormula = null;
138+
XElement? newFormula = null;
139139
if (sheetName != null)
140140
{
141141
newFormula = new XElement(C.f, string.Format("{0}!$A$2:$A${1}", sheetName, chartData.CategoryNames.Length + 1));
@@ -203,7 +203,7 @@ private static void UpdateSeries(ChartPart chartPart, ChartData chartData)
203203
}
204204
}
205205

206-
XElement newCval = null;
206+
XElement? newCval = null;
207207

208208
if (sheetName == null)
209209
{
@@ -237,10 +237,10 @@ private static void UpdateSeries(ChartPart chartPart, ChartData chartData)
237237
}
238238

239239
var serHasFormula = firstSeries.Descendants(C.f).Any();
240-
XElement tx = null;
240+
XElement? tx = null;
241241
if (serHasFormula)
242242
{
243-
XElement newFormula = null;
243+
XElement? newFormula = null;
244244
if (sheetName != null)
245245
{
246246
newFormula = new XElement(C.f, string.Format("{0}!${1}$1", sheetName, SpreadsheetMLUtil.IntToColumnId(si + 1)));
@@ -261,7 +261,7 @@ private static void UpdateSeries(ChartPart chartPart, ChartData chartData)
261261
new XElement(C.v, chartData.SeriesNames[si]));
262262
}
263263

264-
XElement newSer = null;
264+
XElement? newSer = null;
265265

266266
if (chartType == C.area3DChart || chartType == C.areaChart)
267267
{
@@ -564,8 +564,7 @@ private static string RowColToString(int row, int col)
564564

565565
private static object UpdateAccentTransform(XNode node, int accentNumber)
566566
{
567-
var element = node as XElement;
568-
if (element != null)
567+
if (node is XElement element)
569568
{
570569
if (element.Name == A.schemeClr && (string)element.Attribute("val") == "accent1")
571570
{

‎OpenXmlPowerTools/DocumentAssembler/DocumentAssembler.cs‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private static void ProcessTemplatePart(XElement data, TemplateError te, OpenXml
6666
ProcessOrphanEndRepeatEndConditional(xDocRoot, te);
6767

6868
// do the actual content replacement
69-
xDocRoot = (XElement)ContentReplacementTransform(xDocRoot, data, te);
69+
xDocRoot = ContentReplacementTransform(xDocRoot, data, te) as XElement;
7070

7171
xDoc.Elements().First().ReplaceWith(xDocRoot);
7272
part.PutXDocument();
@@ -254,7 +254,7 @@ private static void NormalizeTablesRepeatAndConditional(XElement xDoc, TemplateE
254254
foreach (var metadata in xDoc.Descendants().Where(d => (d.Name == PA.Repeat || d.Name == PA.Conditional) && d.Attribute(PA.Depth) != null).ToList())
255255
{
256256
var depth = (int)metadata.Attribute(PA.Depth);
257-
XName matchingEndName = null;
257+
XName? matchingEndName = null;
258258
if (metadata.Name == PA.Repeat)
259259
{
260260
matchingEndName = PA.EndRepeat;
@@ -308,8 +308,7 @@ private static void NormalizeTablesRepeatAndConditional(XElement xDoc, TemplateE
308308

309309
private static object TransformToMetadata(XNode node, XElement data, TemplateError te)
310310
{
311-
var element = node as XElement;
312-
if (element != null)
311+
if (node is XElement element)
313312
{
314313
if (element.Name == W.sdt)
315314
{
@@ -384,7 +383,7 @@ private static object TransformToMetadata(XNode node, XElement data, TemplateErr
384383
var runReplacementInfo = new List<RunReplacementInfo>();
385384
var thisGuid = Guid.NewGuid().ToString();
386385
var r = new Regex("<#.*?#>");
387-
XElement xml = null;
386+
XElement? xml = null;
388387
OpenXmlRegex.Replace(new[] { element }, r, thisGuid, (para, match) =>
389388
{
390389
var matchString = match.Value.Trim();
@@ -484,12 +483,12 @@ private static XElement TransformXmlTextToMetadata(TemplateError te, string xmlT
484483

485484
private class RunReplacementInfo
486485
{
487-
public XElement Xml;
488-
public string XmlExceptionMessage;
489-
public string SchemaValidationMessage;
486+
public XElement? Xml;
487+
public string? XmlExceptionMessage;
488+
public string? SchemaValidationMessage;
490489
}
491490

492-
private static string ValidatePerSchema(XElement element)
491+
private static string? ValidatePerSchema(XElement element)
493492
{
494493
if (s_PASchemaSets == null)
495494
{
@@ -584,7 +583,7 @@ private static string ValidatePerSchema(XElement element)
584583
}
585584
var paSchemaSet = s_PASchemaSets[element.Name];
586585
var d = new XDocument(element);
587-
string message = null;
586+
string? message = null;
588587
d.Validate(paSchemaSet.SchemaSet, (sender, e) =>
589588
{
590589
if (message == null)
@@ -602,10 +601,9 @@ private static string ValidatePerSchema(XElement element)
602601

603602
private static Dictionary<XName, PASchemaSet> s_PASchemaSets;
604603

605-
private static object ContentReplacementTransform(XNode node, XElement data, TemplateError templateError)
604+
private static object? ContentReplacementTransform(XNode node, XElement data, TemplateError templateError)
606605
{
607-
var element = node as XElement;
608-
if (element != null)
606+
if (node is XElement element)
609607
{
610608
if (element.Name == PA.Content)
611609
{
@@ -729,7 +727,7 @@ private static object ContentReplacementTransform(XNode node, XElement data, Tem
729727
var paragraph = tc.Elements(W.p).FirstOrDefault();
730728
var cellRun = paragraph.Elements(W.r).FirstOrDefault();
731729
var xPath = paragraph.Value;
732-
string newValue = null;
730+
string? newValue = null;
733731
try
734732
{
735733
newValue = EvaluateXPathToString(d, xPath, false);
@@ -773,7 +771,7 @@ private static object ContentReplacementTransform(XNode node, XElement data, Tem
773771
return CreateContextErrorMessage(element, "Conditional: Cannot specify both Match and NotMatch", templateError);
774772
}
775773

776-
string testValue = null;
774+
string? testValue = null;
777775

778776
try
779777
{

0 commit comments

Comments
 (0)