Skip to content

Replace casts with pattern variable #1509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tonyqus merged 1 commit into from
Mar 18, 2025
Merged

Replace casts with pattern variable #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions OpenXmlFormats/DocumentPropertiesCustom.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,16 +388,15 @@ public string linkTarget
}
public override bool Equals(object obj)
{
if (!(obj is CT_Property))
if (obj is not CT_Property property)
return false;

CT_Property a = (CT_Property)obj;
if (a.fmtidField != this.fmtidField
||a.itemElementNameField!=this.itemElementNameField
||a.itemField!=this.itemField
||a.linkTargetField!=this.linkTargetField
||a.nameField!=this.nameField
||a.pidField!=this.pidField)
if (property.fmtidField != this.fmtidField
||property.itemElementNameField!=this.itemElementNameField
||property.itemField!=this.itemField
||property.linkTargetField!=this.linkTargetField
||property.nameField!=this.nameField
||property.pidField!=this.pidField)
return false;

return true;
Expand Down
64 changes: 32 additions & 32 deletions OpenXmlFormats/Spreadsheet/PivotTable/CT_PivotCacheDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1879,18 +1879,18 @@ internal void Write(StreamWriter sw, string nodeName)
{
foreach (object o in this.Items)
{
if (o is CT_Number)
((CT_Number)o).Write(sw, "n");
else if (o is CT_Boolean)
((CT_Boolean)o).Write(sw, "b");
else if (o is CT_DateTime)
((CT_DateTime)o).Write(sw, "d");
else if (o is CT_Error)
((CT_Error)o).Write(sw, "e");
else if (o is CT_Missing)
((CT_Missing)o).Write(sw, "m");
else if (o is CT_String)
((CT_String)o).Write(sw, "s");
if (o is CT_Number number)
number.Write(sw, "n");
else if (o is CT_Boolean b)
b.Write(sw, "b");
else if (o is CT_DateTime time)
time.Write(sw, "d");
else if (o is CT_Error error)
error.Write(sw, "e");
else if (o is CT_Missing missing)
missing.Write(sw, "m");
else if (o is CT_String ctString)
ctString.Write(sw, "s");
}
}

Expand Down Expand Up @@ -5461,18 +5461,18 @@ internal void Write(StreamWriter sw, string nodeName)
sw.Write(">");
foreach (object o in this.Items)
{
if (o is CT_Error)
((CT_Error)o).Write(sw, "e");
else if (o is CT_Boolean)
((CT_Boolean)o).Write(sw, "b");
else if (o is CT_DateTime)
((CT_DateTime)o).Write(sw, "d");
else if (o is CT_Number)
((CT_Number)o).Write(sw, "n");
else if (o is CT_Missing)
((CT_Missing)o).Write(sw, "m");
else if (o is CT_String)
((CT_String)o).Write(sw, "s");
if (o is CT_Error error)
error.Write(sw, "e");
else if (o is CT_Boolean b)
b.Write(sw, "b");
else if (o is CT_DateTime time)
time.Write(sw, "d");
else if (o is CT_Number number)
number.Write(sw, "n");
else if (o is CT_Missing missing)
missing.Write(sw, "m");
else if (o is CT_String ctString)
ctString.Write(sw, "s");
}
sw.Write(string.Format("</{0}>", nodeName));
}
Expand Down Expand Up @@ -7421,14 +7421,14 @@ internal void Write(StreamWriter sw, string nodeName)
sw.Write(">");
foreach (object o in this.Items)
{
if (o is CT_Missing)
((CT_Missing)o).Write(sw, "m");
else if (o is CT_Number)
((CT_Number)o).Write(sw, "n");
else if (o is CT_Error)
((CT_Error)o).Write(sw, "e");
else if (o is CT_String)
((CT_String)o).Write(sw, "s");
if (o is CT_Missing missing)
missing.Write(sw, "m");
else if (o is CT_Number number)
number.Write(sw, "n");
else if (o is CT_Error error)
error.Write(sw, "e");
else if (o is CT_String ctString)
ctString.Write(sw, "s");
}
sw.Write(string.Format("</{0}>", nodeName));
}
Expand Down
28 changes: 14 additions & 14 deletions OpenXmlFormats/Spreadsheet/PivotTable/CT_PivotCacheRecords.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,20 +200,20 @@ internal void Write(StreamWriter sw)

foreach (object o in this.fields)
{
if (o is CT_Number)
((CT_Number)o).Write(sw, "n");
else if (o is CT_Boolean)
((CT_Boolean)o).Write(sw, "b");
else if (o is CT_DateTime)
((CT_DateTime)o).Write(sw, "d");
else if (o is CT_Error)
((CT_Error)o).Write(sw, "e");
else if (o is CT_Missing)
((CT_Missing)o).Write(sw, "m");
else if (o is CT_String)
((CT_String)o).Write(sw, "s");
else if (o is CT_Index)
((CT_Index)o).Write(sw, "x");
if (o is CT_Number number)
number.Write(sw, "n");
else if (o is CT_Boolean b)
b.Write(sw, "b");
else if (o is CT_DateTime time)
time.Write(sw, "d");
else if (o is CT_Error error)
error.Write(sw, "e");
else if (o is CT_Missing missing)
missing.Write(sw, "m");
else if (o is CT_String ctString)
ctString.Write(sw, "s");
else if (o is CT_Index index)
index.Write(sw, "x");
}

sw.Write("</r>");
Expand Down
Loading