fix: Qualifier is redundant

Clippit.Tests/Excel/Samples/WorksheetAccessorSamples.cs

@@ -19,7 +19,7 @@ public void Formulas1()
  {
  var sourceFile = GetFilePath("Formulas1/Formulas.xlsx");
  // Change sheet name in formulas
- using (var streamDoc = new OpenXmlMemoryStreamDocument( SmlDocument.FromFileName(sourceFile)))
+ using (var streamDoc = new OpenXmlMemoryStreamDocument( OpenXmlPowerToolsDocument.FromFileName(sourceFile)))
  {
  using (var doc = streamDoc.GetSpreadsheetDocument())
  {
@@ -29,7 +29,7 @@ public void Formulas1()
  }
 
  // Change sheet name in formulas
- using (var streamDoc = new OpenXmlMemoryStreamDocument(SmlDocument.FromFileName(sourceFile)))
+ using (var streamDoc = new OpenXmlMemoryStreamDocument(OpenXmlPowerToolsDocument.FromFileName(sourceFile)))
  {
  using (var doc = streamDoc.GetSpreadsheetDocument())
  {
@@ -49,7 +49,7 @@ public void PivotTables1()
 
  var row = 1;
  using (var streamDoc = new OpenXmlMemoryStreamDocument(
- SmlDocument.FromFileName(qs.FullName)))
+ OpenXmlPowerToolsDocument.FromFileName(qs.FullName)))
  {
  using (var doc = streamDoc.GetSpreadsheetDocument())
  {
@@ -523,7 +523,7 @@ public void PivotTables1()
  // Add pivot table to existing spreadsheet
  // Demonstrate multiple data fields
  using (var streamDoc = new OpenXmlMemoryStreamDocument(
- SmlDocument.FromFileName(GetFilePath("PivotTables1/QuarterlyUnitSales.xlsx"))))
+ OpenXmlPowerToolsDocument.FromFileName(GetFilePath("PivotTables1/QuarterlyUnitSales.xlsx"))))
  {
  using (var doc = streamDoc.GetSpreadsheetDocument())
  {

Clippit/Excel/PegBase.cs

@@ -972,7 +972,7 @@ public bool Into(Matcher toMatch,out double into)
  {
  into = 0.0;
  if (!Into(toMatch,out byte[] s)) return false;
- var encoding = System.Text.Encoding.UTF8;
+ var encoding = Encoding.UTF8;
  var sAsString = encoding.GetString(s);
  if (!double.TryParse(sAsString, out into)) return false;
  return true;

Clippit/Excel/SmlCellFormatter.cs

@@ -30,15 +30,15 @@ private class FormatConfig
  "# ?/?",
  new FormatConfig
  {
- CellType = SmlCellFormatter.CellType.Number,
+ CellType = CellType.Number,
  FormatCode = "0.00",
  }
  },
  {
  "# ??/??",
  new FormatConfig
  {
- CellType = SmlCellFormatter.CellType.Number,
+ CellType = CellType.Number,
  FormatCode = "0.00",
  }
  },

Clippit/Excel/SmlToHtmlConverter.cs

@@ -51,14 +51,14 @@ public static XElement ConvertTableToHtml(SmlDocument smlDoc, SmlToHtmlConverter
  ms.Write(smlDoc.DocumentByteArray, 0, smlDoc.DocumentByteArray.Length);
  using var sDoc = SpreadsheetDocument.Open(ms, false);
  var rangeXml = SmlDataRetriever.RetrieveTable(sDoc, tableName);
- var xhtml = SmlToHtmlConverter.ConvertToHtmlInternal(sDoc, settings, rangeXml);
+ var xhtml = ConvertToHtmlInternal(sDoc, settings, rangeXml);
  return xhtml;
  }
 
  public static XElement ConvertTableToHtml(SpreadsheetDocument sDoc, SmlToHtmlConverterSettings settings, string tableName)
  {
  var rangeXml = SmlDataRetriever.RetrieveTable(sDoc, tableName);
- var xhtml = SmlToHtmlConverter.ConvertToHtmlInternal(sDoc, settings, rangeXml);
+ var xhtml = ConvertToHtmlInternal(sDoc, settings, rangeXml);
  return xhtml;
  }
  #endregion

Clippit/Excel/WorksheetAccessor.cs

@@ -229,7 +229,7 @@ public static object GetCellValue(SpreadsheetDocument document, WorksheetPart wo
  case "b":
  return (cellValue.Element(S.v).Value == "1");
  case "s":
- return GetSharedString(document, System.Convert.ToInt32(cellValue.Element(S.v).Value));
+ return GetSharedString(document, Convert.ToInt32(cellValue.Element(S.v).Value));
  case "inlineStr":
  return cellValue.Element(S._is).Element(S.t).Value;
  }
@@ -364,7 +364,7 @@ private static XElement FindRowAfter(XDocument worksheet, int row)
  return worksheet.Root
  .Element(S.sheetData)
  .Elements(S.row)
- .FirstOrDefault(r => System.Convert.ToInt32(r.Attribute(NoNamespace.r).Value) > row);
+ .FirstOrDefault(r => Convert.ToInt32(r.Attribute(NoNamespace.r).Value) > row);
  }
 
  // Finds the cell element (c) in the specified row that is after the specified "column" number
@@ -373,7 +373,7 @@ private static XElement FindColumAfter(XDocument worksheet, int row, int column)
  return worksheet.Root
  .Element(S.sheetData)
  .Elements(S.row)
- .FirstOrDefault(r => System.Convert.ToInt32(r.Attribute(NoNamespace.r).Value) == row)
+ .FirstOrDefault(r => Convert.ToInt32(r.Attribute(NoNamespace.r).Value) == row)
  .Elements(S.c)
  .FirstOrDefault(c => GetColumnNumber(c.Attribute(NoNamespace.r).Value) > GetColumnNumber(GetColumnId(column) + row));
  }
@@ -385,7 +385,7 @@ public static int GetColumnNumber(string cellReference)
  foreach (var c in cellReference)
  {
  if (char.IsLetter(c))
- columnNumber = columnNumber * 26 + System.Convert.ToInt32(c) - System.Convert.ToInt32('A') + 1;
+ columnNumber = columnNumber * 26 + Convert.ToInt32(c) - Convert.ToInt32('A') + 1;
  }
  return columnNumber;
  }
@@ -399,9 +399,9 @@ private static void GetRowColumn(string cellReference, out int row, out int colu
  foreach (var c in cellReference)
  {
  if (char.IsLetter(c))
- column = column * 26 + System.Convert.ToInt32(c) - System.Convert.ToInt32('A') + 1;
+ column = column * 26 + Convert.ToInt32(c) - Convert.ToInt32('A') + 1;
  else
- row = row * 10 + System.Convert.ToInt32(c) - System.Convert.ToInt32('0');
+ row = row * 10 + Convert.ToInt32(c) - Convert.ToInt32('0');
  }
  }
 
@@ -644,7 +644,7 @@ public static void AddPivotAxis(SpreadsheetDocument document, WorksheetPart shee
  foreach (var rec in records.Descendants(S.r))
  {
  var val = rec.Elements().Skip(index).First();
- var x = Array.FindIndex(values.ToArray(), z => XElement.DeepEquals(z, val));
+ var x = Array.FindIndex(values.ToArray(), z => XNode.DeepEquals(z, val));
  if (x == -1)
  {
  values.Add(val);
@@ -844,7 +844,7 @@ public static void CheckNumberFormat(SpreadsheetDocument document, int fmtID, st
  numFmts = styles.Root.Element(S.numFmts);
  }
  var index = Array.FindIndex(numFmts.Elements(S.numFmt).ToArray(),
- z => XElement.DeepEquals(z, numFmt));
+ z => XNode.DeepEquals(z, numFmt));
  if (index == -1)
  {
  numFmts.Add(numFmt);
@@ -965,7 +965,7 @@ public static int GetFontIndex(SpreadsheetDocument document, Font f)
  var styles = document.WorkbookPart.WorkbookStylesPart.GetXDocument();
  var fonts = styles.Root.Element(S.fonts);
  var index = Array.FindIndex(fonts.Elements(S.font).ToArray(),
- z => XElement.DeepEquals(z, font));
+ z => XNode.DeepEquals(z, font));
  if (index != -1)
  return index;
  fonts.Add(font);
@@ -1147,7 +1147,7 @@ private static int GetFillIndex(SpreadsheetDocument document, XElement fill)
  var styles = document.WorkbookPart.WorkbookStylesPart.GetXDocument();
  var fills = styles.Root.Element(S.fills);
  var index = Array.FindIndex(fills.Elements(S.fill).ToArray(),
- z => XElement.DeepEquals(z, fill));
+ z => XNode.DeepEquals(z, fill));
  if (index != -1)
  return index;
  fills.Add(fill);
@@ -1278,7 +1278,7 @@ public static int GetBorderIndex(SpreadsheetDocument document, Border b)
  var styles = document.WorkbookPart.WorkbookStylesPart.GetXDocument();
  var borders = styles.Root.Element(S.borders);
  var index = Array.FindIndex(borders.Elements(S.border).ToArray(),
- z => XElement.DeepEquals(z, border));
+ z => XNode.DeepEquals(z, border));
  if (index != -1)
  return index;
  borders.Add(border);
@@ -1430,7 +1430,7 @@ public static int GetStyleIndex(SpreadsheetDocument document, int numFmt, int fo
  var styles = document.WorkbookPart.WorkbookStylesPart.GetXDocument();
  var cellXfs = styles.Root.Element(S.cellXfs);
  var index = Array.FindIndex(cellXfs.Elements(S.xf).ToArray(),
- z => XElement.DeepEquals(z, xf));
+ z => XNode.DeepEquals(z, xf));
  if (index != -1)
  return index;
  cellXfs.Add(xf);

Clippit/Excel/XlsxTables.cs

@@ -346,13 +346,13 @@ public static void ParseRange(string theRef, out int leftColumn, out int topRow,
  // C5:E7
  var spl = theRef.Split(':');
  var refStart = spl.First();
- var refStartSplit = XlsxTables.SplitAddress(refStart);
- leftColumn = XlsxTables.ColumnAddressToIndex(refStartSplit[0]);
+ var refStartSplit = SplitAddress(refStart);
+ leftColumn = ColumnAddressToIndex(refStartSplit[0]);
  topRow = int.Parse(refStartSplit[1]);
 
  var refEnd = spl.ElementAt(1);
- var refEndSplit = XlsxTables.SplitAddress(refEnd);
- rightColumn = XlsxTables.ColumnAddressToIndex(refEndSplit[0]);
+ var refEndSplit = SplitAddress(refEnd);
+ rightColumn = ColumnAddressToIndex(refEndSplit[0]);
  bottomRow = int.Parse(refEndSplit[1]);
  }
 

Clippit/Html/HtmlToWmlConverterCore.cs

@@ -104,7 +104,6 @@
 using Clippit.Internal;
 using Clippit.Word;
 using DocumentFormat.OpenXml.Packaging;
-using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Bmp;
 using SixLabors.ImageSharp.PixelFormats;
 using Image = SixLabors.ImageSharp.Image;
@@ -2177,13 +2176,13 @@ private static XElement TransformImageToWml(XElement element, HtmlToWmlConverter
  var base64 = srcAttribute.Substring(commaIndex + 1);
  ba = Convert.FromBase64String(base64);
  using var ms = new MemoryStream(ba);
- bmp = Image<Rgba32>.Load(ms);
+ bmp = Image.Load(ms);
  }
  else
  {
  try
  {
- bmp = Image<Rgba32>.Load(settings.BaseUriForImages + "/" + srcAttribute);
+ bmp = Image.Load(settings.BaseUriForImages + "/" + srcAttribute);
  }
  catch (DirectoryNotFoundException)
  {

Clippit/Html/HtmlToWmlCssApplier.cs

@@ -1762,7 +1762,7 @@ private static int CountElementNamesInSelector(CssSelector selector)
  else
  {
  var current = propList[property.Name];
- if (((System.IComparable<Property>)property).CompareTo(current) == 1)
+ if (((IComparable<Property>)property).CompareTo(current) == 1)
  propList[property.Name] = property;
  }
  }
@@ -1776,7 +1776,7 @@ private static int CountElementNamesInSelector(CssSelector selector)
  else
  {
  var current = propList[property.Name];
- if (((System.IComparable<Property>)property).CompareTo(current) == 1)
+ if (((IComparable<Property>)property).CompareTo(current) == 1)
  propList[property.Name] = property;
  }
  }
@@ -2904,7 +2904,7 @@ public enum HighOrderPriority
  UserHigh = 10,
  };
 
- int System.IComparable<Property>.CompareTo(Property other)
+ int IComparable<Property>.CompareTo(Property other)
  {
  // if this is less than other, return -1
  // if this is greater than other, return 1

Clippit/Html/HtmlToWmlCssParser.cs

@@ -1548,7 +1548,7 @@ private bool IsUnitOfLength()
  {
  return false;
  }
- var units = new System.Collections.Generic.List<string>(
+ var units = new List<string>(
  new string[]
  {
  "em", "ex", "px", "gd", "rem", "vw", "vh", "vm", "ch", "mm", "cm", "in", "pt", "pc", "deg", "grad", "rad", "turn", "ms", "s", "hz", "khz"

Clippit/MetricsGetter.cs

@@ -365,7 +365,7 @@ private static bool ValidateWordprocessingDocument(WordprocessingDocument wDoc,
  return valid;
  }
 
- private static bool ValidateAgainstSpecificVersion(WordprocessingDocument wDoc, List<XElement> metrics, DocumentFormat.OpenXml.FileFormatVersions versionToValidateAgainst, XName versionSpecificMetricName)
+ private static bool ValidateAgainstSpecificVersion(WordprocessingDocument wDoc, List<XElement> metrics, FileFormatVersions versionToValidateAgainst, XName versionSpecificMetricName)
  {
  var validator = new OpenXmlValidator(versionToValidateAgainst);
  var errors = validator.Validate(wDoc);
@@ -390,7 +390,7 @@ private static bool ValidateAgainstSpecificVersion(WordprocessingDocument wDoc,
  return valid;
  }
 
- private static bool ValidateAgainstSpecificVersion(SpreadsheetDocument sDoc, List<XElement> metrics, DocumentFormat.OpenXml.FileFormatVersions versionToValidateAgainst, XName versionSpecificMetricName)
+ private static bool ValidateAgainstSpecificVersion(SpreadsheetDocument sDoc, List<XElement> metrics, FileFormatVersions versionToValidateAgainst, XName versionSpecificMetricName)
  {
  var validator = new OpenXmlValidator(versionToValidateAgainst);
  var errors = validator.Validate(sDoc);
@@ -415,7 +415,7 @@ private static bool ValidateAgainstSpecificVersion(SpreadsheetDocument sDoc, Lis
  return valid;
  }
 
- private static bool ValidateAgainstSpecificVersion(PresentationDocument pDoc, List<XElement> metrics, DocumentFormat.OpenXml.FileFormatVersions versionToValidateAgainst, XName versionSpecificMetricName)
+ private static bool ValidateAgainstSpecificVersion(PresentationDocument pDoc, List<XElement> metrics, FileFormatVersions versionToValidateAgainst, XName versionSpecificMetricName)
  {
  var validator = new OpenXmlValidator(versionToValidateAgainst);
  var errors = validator.Validate(pDoc);

Clippit/OxPtHelpers.cs

@@ -64,7 +64,7 @@ public static class AddDocxTextHelper
  $"Add-DocxText: The specified color {foreColor} is unsupported, Please specify the valid color. Ex, Red, Green");
 
  var ColorHex = $"{colorValue:x6}";
- runProperties.AppendChild(new DocumentFormat.OpenXml.Wordprocessing.Color() { Val = ColorHex.Substring(2) });
+ runProperties.AppendChild(new Color() { Val = ColorHex.Substring(2) });
  }
 
  if (isUnderline)
@@ -307,7 +307,7 @@ public static class AddDocxTextHelper
  #endregion
 
  var base64CharArray = base64.Where(c => c != '\r' && c != '\n').ToArray();
- var byteArray = System.Convert.FromBase64CharArray(base64CharArray, 0, base64CharArray.Length);
+ var byteArray = Convert.FromBase64CharArray(base64CharArray, 0, base64CharArray.Length);
  memoryStream.Write(byteArray, 0, byteArray.Length);
 
  using var defaultDotx = WordprocessingDocument.Open(memoryStream, true);