diff --git a/Clippit.Tests/Excel/Samples/WorksheetAccessorSamples.cs b/Clippit.Tests/Excel/Samples/WorksheetAccessorSamples.cs index 1cbe2a3..c21567a 100644 --- a/Clippit.Tests/Excel/Samples/WorksheetAccessorSamples.cs +++ b/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()) { diff --git a/Clippit/Excel/PegBase.cs b/Clippit/Excel/PegBase.cs index bd1b60f..b7b2a68 100644 --- a/Clippit/Excel/PegBase.cs +++ b/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; diff --git a/Clippit/Excel/SmlCellFormatter.cs b/Clippit/Excel/SmlCellFormatter.cs index 54001e9..25208a3 100644 --- a/Clippit/Excel/SmlCellFormatter.cs +++ b/Clippit/Excel/SmlCellFormatter.cs @@ -30,7 +30,7 @@ private class FormatConfig "# ?/?", new FormatConfig { - CellType = SmlCellFormatter.CellType.Number, + CellType = CellType.Number, FormatCode = "0.00", } }, @@ -38,7 +38,7 @@ private class FormatConfig "# ??/??", new FormatConfig { - CellType = SmlCellFormatter.CellType.Number, + CellType = CellType.Number, FormatCode = "0.00", } }, diff --git a/Clippit/Excel/SmlToHtmlConverter.cs b/Clippit/Excel/SmlToHtmlConverter.cs index 51f4b94..06b6145 100644 --- a/Clippit/Excel/SmlToHtmlConverter.cs +++ b/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 diff --git a/Clippit/Excel/WorksheetAccessor.cs b/Clippit/Excel/WorksheetAccessor.cs index 9071be5..e96f6e3 100644 --- a/Clippit/Excel/WorksheetAccessor.cs +++ b/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); diff --git a/Clippit/Excel/XlsxTables.cs b/Clippit/Excel/XlsxTables.cs index 672c573..4e90526 100644 --- a/Clippit/Excel/XlsxTables.cs +++ b/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]); } diff --git a/Clippit/Html/HtmlToWmlConverterCore.cs b/Clippit/Html/HtmlToWmlConverterCore.cs index 43d30f6..51afa1e 100644 --- a/Clippit/Html/HtmlToWmlConverterCore.cs +++ b/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.Load(ms); + bmp = Image.Load(ms); } else { try { - bmp = Image.Load(settings.BaseUriForImages + "/" + srcAttribute); + bmp = Image.Load(settings.BaseUriForImages + "/" + srcAttribute); } catch (DirectoryNotFoundException) { diff --git a/Clippit/Html/HtmlToWmlCssApplier.cs b/Clippit/Html/HtmlToWmlCssApplier.cs index 910e565..2b0b605 100644 --- a/Clippit/Html/HtmlToWmlCssApplier.cs +++ b/Clippit/Html/HtmlToWmlCssApplier.cs @@ -1762,7 +1762,7 @@ private static void AddPropertyToElement( else { var current = propList[property.Name]; - if (((System.IComparable)property).CompareTo(current) == 1) + if (((IComparable)property).CompareTo(current) == 1) propList[property.Name] = property; } } @@ -1776,7 +1776,7 @@ private static void AddPropertyToDictionary( else { var current = propList[property.Name]; - if (((System.IComparable)property).CompareTo(current) == 1) + if (((IComparable)property).CompareTo(current) == 1) propList[property.Name] = property; } } @@ -2904,7 +2904,7 @@ public enum HighOrderPriority UserHigh = 10, }; - int System.IComparable.CompareTo(Property other) + int IComparable.CompareTo(Property other) { // if this is less than other, return -1 // if this is greater than other, return 1 diff --git a/Clippit/Html/HtmlToWmlCssParser.cs b/Clippit/Html/HtmlToWmlCssParser.cs index 7d8370f..94a1d21 100644 --- a/Clippit/Html/HtmlToWmlCssParser.cs +++ b/Clippit/Html/HtmlToWmlCssParser.cs @@ -1548,7 +1548,7 @@ private bool IsUnitOfLength() { return false; } - var units = new System.Collections.Generic.List( + var units = new List( new string[] { "em", "ex", "px", "gd", "rem", "vw", "vh", "vm", "ch", "mm", "cm", "in", "pt", "pc", "deg", "grad", "rad", "turn", "ms", "s", "hz", "khz" diff --git a/Clippit/MetricsGetter.cs b/Clippit/MetricsGetter.cs index 0aec515..e91ec8f 100644 --- a/Clippit/MetricsGetter.cs +++ b/Clippit/MetricsGetter.cs @@ -365,7 +365,7 @@ private static bool ValidateWordprocessingDocument(WordprocessingDocument wDoc, return valid; } - private static bool ValidateAgainstSpecificVersion(WordprocessingDocument wDoc, List metrics, DocumentFormat.OpenXml.FileFormatVersions versionToValidateAgainst, XName versionSpecificMetricName) + private static bool ValidateAgainstSpecificVersion(WordprocessingDocument wDoc, List 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 metrics, DocumentFormat.OpenXml.FileFormatVersions versionToValidateAgainst, XName versionSpecificMetricName) + private static bool ValidateAgainstSpecificVersion(SpreadsheetDocument sDoc, List 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 metrics, DocumentFormat.OpenXml.FileFormatVersions versionToValidateAgainst, XName versionSpecificMetricName) + private static bool ValidateAgainstSpecificVersion(PresentationDocument pDoc, List metrics, FileFormatVersions versionToValidateAgainst, XName versionSpecificMetricName) { var validator = new OpenXmlValidator(versionToValidateAgainst); var errors = validator.Validate(pDoc); diff --git a/Clippit/OxPtHelpers.cs b/Clippit/OxPtHelpers.cs index 0e98ca4..dbadecc 100644 --- a/Clippit/OxPtHelpers.cs +++ b/Clippit/OxPtHelpers.cs @@ -64,7 +64,7 @@ public static WmlDocument AppendParagraphToDocument( $"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 WmlDocument AppendParagraphToDocument( #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); diff --git a/Clippit/PtOpenXmlUtil.cs b/Clippit/PtOpenXmlUtil.cs index 6e997de..79194d4 100644 --- a/Clippit/PtOpenXmlUtil.cs +++ b/Clippit/PtOpenXmlUtil.cs @@ -324,7 +324,7 @@ private static XElement GetContentsAsXml(PackagePart part) var byteArray = binaryReader.ReadBytes(len); // the following expression creates the base64String, then chunks // it to lines of 76 characters long - var base64String = (System.Convert.ToBase64String(byteArray)) + var base64String = (Convert.ToBase64String(byteArray)) .Select ( (c, i) => new FlatOpcTupple() @@ -502,7 +502,7 @@ public static void FlatToOpc(XDocument doc, string outputPath) var base64CharArray = base64StringInChunks .Where(c => c != '\r' && c != '\n').ToArray(); var byteArray = - System.Convert.FromBase64CharArray(base64CharArray, + Convert.FromBase64CharArray(base64CharArray, 0, base64CharArray.Length); binaryWriter.Write(byteArray); } @@ -572,8 +572,8 @@ public class Base64 { public static string ConvertToBase64(string fileName) { - var ba = System.IO.File.ReadAllBytes(fileName); - var base64String = (System.Convert.ToBase64String(ba)) + var ba = File.ReadAllBytes(fileName); + var base64String = (Convert.ToBase64String(ba)) .Select ( (c, i) => new @@ -607,7 +607,7 @@ public static string ConvertToBase64(string fileName) public static byte[] ConvertFromBase64(string fileName, string b64) { var b64b = b64.Replace("\r\n", ""); - var ba = System.Convert.FromBase64String(b64b); + var ba = Convert.FromBase64String(b64b); return ba; } } @@ -5392,35 +5392,35 @@ public static class W public static readonly XName[] BlockLevelContentContainers = { - W.body, - W.tc, - W.txbxContent, - W.hdr, - W.ftr, - W.endnote, - W.footnote + body, + tc, + txbxContent, + hdr, + ftr, + endnote, + footnote }; public static readonly XName[] SubRunLevelContent = { - W.br, - W.cr, - W.dayLong, - W.dayShort, - W.drawing, - W.drawing, - W.monthLong, - W.monthShort, - W.noBreakHyphen, - W.ptab, - W.pgNum, - W.pict, - W.softHyphen, - W.sym, - W.t, - W.tab, - W.yearLong, - W.yearShort, + br, + cr, + dayLong, + dayShort, + drawing, + drawing, + monthLong, + monthShort, + noBreakHyphen, + ptab, + pgNum, + pict, + softHyphen, + sym, + t, + tab, + yearLong, + yearShort, MC.AlternateContent, }; } diff --git a/Clippit/Word/DocumentAssembler.cs b/Clippit/Word/DocumentAssembler.cs index a9f04e6..3932416 100644 --- a/Clippit/Word/DocumentAssembler.cs +++ b/Clippit/Word/DocumentAssembler.cs @@ -995,7 +995,7 @@ private static object ProcessImageContent(XElement element, XElement data, Templ // access the saved image and get the dimensions using var savedStream = ip.GetStream(FileMode.Open); - using var image = Image.Load(savedStream); + using var image = Image.Load(savedStream); // one inch is 914400 EMUs // 96dpi where dot is pixel var pixelInEMU = 914400 / 96; diff --git a/Clippit/Word/DocumentBuilder.cs b/Clippit/Word/DocumentBuilder.cs index 91b1c4b..191354c 100644 --- a/Clippit/Word/DocumentBuilder.cs +++ b/Clippit/Word/DocumentBuilder.cs @@ -18,7 +18,7 @@ public partial class WmlDocument : OpenXmlPowerToolsDocument { public IEnumerable SplitOnSections() { - return Word.DocumentBuilder.SplitOnSections(this); + return DocumentBuilder.SplitOnSections(this); } } @@ -1082,7 +1082,7 @@ private static void WriteGlossaryDocumentPart(WmlDocument wmlGlossaryDocument, W private static WmlDocument CoalesceGlossaryDocumentParts(IEnumerable sources, DocumentBuilderSettings settings) { var allGlossaryDocuments = sources - .Select(s => DocumentBuilder.ExtractGlossaryDocument(s.WmlDocument)) + .Select(s => ExtractGlossaryDocument(s.WmlDocument)) .Where(s => s != null) .Select(s => new Source(s) as ISource) .ToList(); @@ -1090,7 +1090,7 @@ private static WmlDocument CoalesceGlossaryDocumentParts(IEnumerable so if (!allGlossaryDocuments.Any()) return null; - var coalescedRaw = DocumentBuilder.BuildDocument(allGlossaryDocuments); + var coalescedRaw = BuildDocument(allGlossaryDocuments); // now need to do some fix up using var ms = new MemoryStream(); diff --git a/Clippit/Word/FormattingAssembler.cs b/Clippit/Word/FormattingAssembler.cs index 4470fe0..a204c36 100644 --- a/Clippit/Word/FormattingAssembler.cs +++ b/Clippit/Word/FormattingAssembler.cs @@ -86,7 +86,7 @@ public static void AssembleFormatting(WordprocessingDocument wDoc, FormattingAss { var pxd = part.GetXDocument(); pxd.Root.Descendants().Attributes().Where(a => a.IsNamespaceDeclaration).Remove(); - FormattingAssembler.NormalizePropsForPart(pxd, settings); + NormalizePropsForPart(pxd, settings); var newRoot = (XElement)CleanupTransform(pxd.Root); pxd.Root.ReplaceWith(newRoot); part.PutXDocument(); diff --git a/Clippit/Word/WmlToHtmlConverter.cs b/Clippit/Word/WmlToHtmlConverter.cs index d59bf6f..82af07a 100644 --- a/Clippit/Word/WmlToHtmlConverter.cs +++ b/Clippit/Word/WmlToHtmlConverter.cs @@ -9,7 +9,6 @@ using System.Text; using System.Xml.Linq; using DocumentFormat.OpenXml.Packaging; -using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; using Image = SixLabors.ImageSharp.Image; @@ -2954,7 +2953,7 @@ private static XElement ProcessDrawing(WordprocessingDocument wordDoc, return null; using var partStream = imagePart.GetStream(); - using var image = Image.Load(partStream); + using var image = Image.Load(partStream); if (extentCx != null && extentCy != null) { var imageInfo = new ImageInfo() @@ -3017,7 +3016,7 @@ private static XElement ProcessPictureOrObject(WordprocessingDocument wordDoc, using var partStream = imagePart.GetStream(); try { - using var bitmap = Image.Load(partStream); + using var bitmap = Image.Load(partStream); var imageInfo = new ImageInfo { Image = bitmap,