From f5eb6679739ab0559a17edd0585ee4b78e962921 Mon Sep 17 00:00:00 2001 From: melekhin Date: Mon, 8 Jun 2026 14:31:31 +0700 Subject: [PATCH] 0.9.1 --- .../Editors/CellAddressHelper.cs | 2 +- QWERTYkez.ExcelProcessor/Editors/CellAlign.cs | 2 +- .../Editors/CellBorder.cs | 2 +- QWERTYkez.ExcelProcessor/Editors/CellFill.cs | 2 +- QWERTYkez.ExcelProcessor/Editors/CellFont.cs | 2 +- .../Editors/ColumnWidth.cs | 2 +- QWERTYkez.ExcelProcessor/Editors/ExColor.cs | 22 ++++++- QWERTYkez.ExcelProcessor/Editors/ExcelBook.cs | 2 +- QWERTYkez.ExcelProcessor/Editors/ExcelCell.cs | 37 ++++++++++- .../Editors/ExcelCellText.cs | 2 +- .../Editors/ExcelColumn.cs | 2 +- .../Editors/ExcelRange.cs | 2 +- QWERTYkez.ExcelProcessor/Editors/ExcelRow.cs | 2 +- QWERTYkez.ExcelProcessor/Editors/ExcelRun.cs | 2 +- .../Editors/ExcelSheet.cs | 2 +- .../Editors/Interfaces.cs | 10 ++- .../Editors/NumberFormatPattern.cs | 2 +- QWERTYkez.ExcelProcessor/Editors/RowHeight.cs | 2 +- QWERTYkez.ExcelProcessor/Editors/RunFormat.cs | 62 ++++++++++++++++++- QWERTYkez.ExcelProcessor/ExcelWriter.cs | 3 +- QWERTYkez.ExcelProcessor/IExcelWriter.cs | 4 +- QWERTYkez.ExcelProcessor/NormalizedSet.cs | 2 +- .../QWERTYkez.ExcelProcessor.csproj | 3 +- QWERTYkez.WordProcessor/Builders/CellProps.cs | 2 +- QWERTYkez.WordProcessor/Builders/FontProps.cs | 2 +- .../Builders/FormulaHelper.cs | 2 +- .../Builders/Interfaces.cs | 2 +- .../Builders/ParagraphBuilderBase.cs | 2 +- .../Builders/TableBuilder.cs | 2 +- .../Builders/TextBuilder.cs | 2 +- QWERTYkez.WordProcessor/IWordWriter.cs | 2 +- QWERTYkez.WordProcessor/NormalizedSet.cs | 2 +- .../QWERTYkez.WordProcessor.csproj | 3 +- QWERTYkez.WordProcessor/ReplaceToTableExt.cs | 2 +- QWERTYkez.WordProcessor/ReplaceToTextExt.cs | 2 +- QWERTYkez.WordProcessor/WordWriter.cs | 2 +- 36 files changed, 159 insertions(+), 41 deletions(-) diff --git a/QWERTYkez.ExcelProcessor/Editors/CellAddressHelper.cs b/QWERTYkez.ExcelProcessor/Editors/CellAddressHelper.cs index 924c65d..04dc58f 100644 --- a/QWERTYkez.ExcelProcessor/Editors/CellAddressHelper.cs +++ b/QWERTYkez.ExcelProcessor/Editors/CellAddressHelper.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; internal static class CellAddressHelper { diff --git a/QWERTYkez.ExcelProcessor/Editors/CellAlign.cs b/QWERTYkez.ExcelProcessor/Editors/CellAlign.cs index 0d2d7ba..48dc826 100644 --- a/QWERTYkez.ExcelProcessor/Editors/CellAlign.cs +++ b/QWERTYkez.ExcelProcessor/Editors/CellAlign.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Определяет выравнивание содержимого ячейки: горизонтальное, вертикальное, перенос текста и уменьшение по размеру. diff --git a/QWERTYkez.ExcelProcessor/Editors/CellBorder.cs b/QWERTYkez.ExcelProcessor/Editors/CellBorder.cs index 857ba67..c1139da 100644 --- a/QWERTYkez.ExcelProcessor/Editors/CellBorder.cs +++ b/QWERTYkez.ExcelProcessor/Editors/CellBorder.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Определяет границы ячейки: верхнюю, нижнюю, левую, правую и диагональные. diff --git a/QWERTYkez.ExcelProcessor/Editors/CellFill.cs b/QWERTYkez.ExcelProcessor/Editors/CellFill.cs index c2a978f..8978408 100644 --- a/QWERTYkez.ExcelProcessor/Editors/CellFill.cs +++ b/QWERTYkez.ExcelProcessor/Editors/CellFill.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Определяет заливку (фон) ячейки. diff --git a/QWERTYkez.ExcelProcessor/Editors/CellFont.cs b/QWERTYkez.ExcelProcessor/Editors/CellFont.cs index 48dab60..37cdddf 100644 --- a/QWERTYkez.ExcelProcessor/Editors/CellFont.cs +++ b/QWERTYkez.ExcelProcessor/Editors/CellFont.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Определяет шрифтовое оформление всей ячейки: размер, семейство, цвет, начертание. diff --git a/QWERTYkez.ExcelProcessor/Editors/ColumnWidth.cs b/QWERTYkez.ExcelProcessor/Editors/ColumnWidth.cs index a0a7fc8..9883821 100644 --- a/QWERTYkez.ExcelProcessor/Editors/ColumnWidth.cs +++ b/QWERTYkez.ExcelProcessor/Editors/ColumnWidth.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors +namespace QWERTYkez.ExcelProcessor { /// /// Представляет ширину столбца в Excel. Поддерживает задание в символах, пунктах, сантиметрах и миллиметрах. diff --git a/QWERTYkez.ExcelProcessor/Editors/ExColor.cs b/QWERTYkez.ExcelProcessor/Editors/ExColor.cs index 0835a65..f67e910 100644 --- a/QWERTYkez.ExcelProcessor/Editors/ExColor.cs +++ b/QWERTYkez.ExcelProcessor/Editors/ExColor.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; public readonly struct ExColor(System.Drawing.Color? Color) { @@ -59,4 +59,24 @@ public readonly struct ExColor(System.Drawing.Color? Color) } return excelColor; } + + public static ExColor FromRgb(string rgb) + { + if (string.IsNullOrEmpty(rgb)) return new ExColor(null); + if (rgb.Length == 6) + { + byte r = Convert.ToByte(rgb.Substring(0, 2), 16); + byte g = Convert.ToByte(rgb.Substring(2, 2), 16); + byte b = Convert.ToByte(rgb.Substring(4, 2), 16); + return new ExColor(System.Drawing.Color.FromArgb(r, g, b)); + } + else if (rgb.Length == 8) + { + byte r = Convert.ToByte(rgb.Substring(2, 2), 16); + byte g = Convert.ToByte(rgb.Substring(4, 2), 16); + byte b = Convert.ToByte(rgb.Substring(6, 2), 16); + return new ExColor(System.Drawing.Color.FromArgb(r, g, b)); + } + return new ExColor(null); + } } \ No newline at end of file diff --git a/QWERTYkez.ExcelProcessor/Editors/ExcelBook.cs b/QWERTYkez.ExcelProcessor/Editors/ExcelBook.cs index 4d032e1..040a6d8 100644 --- a/QWERTYkez.ExcelProcessor/Editors/ExcelBook.cs +++ b/QWERTYkez.ExcelProcessor/Editors/ExcelBook.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Внутренняя реализация , которая делегирует вызовы к . diff --git a/QWERTYkez.ExcelProcessor/Editors/ExcelCell.cs b/QWERTYkez.ExcelProcessor/Editors/ExcelCell.cs index a474389..1ac3ee3 100644 --- a/QWERTYkez.ExcelProcessor/Editors/ExcelCell.cs +++ b/QWERTYkez.ExcelProcessor/Editors/ExcelCell.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Внутренняя реализация . @@ -390,7 +390,7 @@ internal sealed class ExcelCell : ICell } } - public ICell Set(Action value) + public ICell Text(Action value) { if (value == null) return this; _writer.ThrowIfDisposed(); @@ -425,6 +425,39 @@ internal sealed class ExcelCell : ICell return this; } + /// + public ICellText? Text() + { + _writer.ThrowIfDisposed(); + lock (_writer._syncLock) + { + var cell = GetCellElement(); + if (cell == null || cell.DataType?.Value != CellValues.InlineString || cell.InlineString == null) + return null; + + var textObj = new ExcelCellText(); + foreach (var run in cell.InlineString.Elements()) + { + string text = run.GetFirstChild()?.Text ?? string.Empty; + RunFormat? format = null; + if (run.RunProperties != null) + { + // Преобразуем RunProperties в RunFormat (можно вынести в отдельный метод) + format = RunFormat.FromRunProperties(run.RunProperties); + } + textObj.AddRun(text, format); + } + return textObj; + } + } + + /// + public bool TryText(out ICellText cellText) + { + cellText = Text()!; + return cellText is not null; + } + public ICell Set(string value) { if (value == null) return this; diff --git a/QWERTYkez.ExcelProcessor/Editors/ExcelCellText.cs b/QWERTYkez.ExcelProcessor/Editors/ExcelCellText.cs index a80f2b3..d5add4c 100644 --- a/QWERTYkez.ExcelProcessor/Editors/ExcelCellText.cs +++ b/QWERTYkez.ExcelProcessor/Editors/ExcelCellText.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Внутренняя реализация для работы с богатым текстом ячейки. diff --git a/QWERTYkez.ExcelProcessor/Editors/ExcelColumn.cs b/QWERTYkez.ExcelProcessor/Editors/ExcelColumn.cs index 5ccbfc2..03a7541 100644 --- a/QWERTYkez.ExcelProcessor/Editors/ExcelColumn.cs +++ b/QWERTYkez.ExcelProcessor/Editors/ExcelColumn.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Внутренняя реализация . diff --git a/QWERTYkez.ExcelProcessor/Editors/ExcelRange.cs b/QWERTYkez.ExcelProcessor/Editors/ExcelRange.cs index e78e922..d1c0d21 100644 --- a/QWERTYkez.ExcelProcessor/Editors/ExcelRange.cs +++ b/QWERTYkez.ExcelProcessor/Editors/ExcelRange.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Внутренняя реализация . diff --git a/QWERTYkez.ExcelProcessor/Editors/ExcelRow.cs b/QWERTYkez.ExcelProcessor/Editors/ExcelRow.cs index 6dea9b5..edc54ec 100644 --- a/QWERTYkez.ExcelProcessor/Editors/ExcelRow.cs +++ b/QWERTYkez.ExcelProcessor/Editors/ExcelRow.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Внутренняя реализация . diff --git a/QWERTYkez.ExcelProcessor/Editors/ExcelRun.cs b/QWERTYkez.ExcelProcessor/Editors/ExcelRun.cs index 2bfbc8c..97a60a1 100644 --- a/QWERTYkez.ExcelProcessor/Editors/ExcelRun.cs +++ b/QWERTYkez.ExcelProcessor/Editors/ExcelRun.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Внутренняя реализация для хранения форматированного фрагмента текста. diff --git a/QWERTYkez.ExcelProcessor/Editors/ExcelSheet.cs b/QWERTYkez.ExcelProcessor/Editors/ExcelSheet.cs index 4d4810d..d4cdcad 100644 --- a/QWERTYkez.ExcelProcessor/Editors/ExcelSheet.cs +++ b/QWERTYkez.ExcelProcessor/Editors/ExcelSheet.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Внутренняя реализация . diff --git a/QWERTYkez.ExcelProcessor/Editors/Interfaces.cs b/QWERTYkez.ExcelProcessor/Editors/Interfaces.cs index e61bbcc..cd417b4 100644 --- a/QWERTYkez.ExcelProcessor/Editors/Interfaces.cs +++ b/QWERTYkez.ExcelProcessor/Editors/Interfaces.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// Представляет книгу Excel public interface IBook @@ -700,7 +700,13 @@ public interface ICell ICell Set(CellFont format); /// Устанавливает богатый текст (форматированный) с помощью делегата. - ICell Set(Action value); + ICell Text(Action value); + + /// Возвращает объект для редактирования богатого текста ячейки (если ячейка содержит InlineString). + bool TryText(out ICellText cellText); + + /// Возвращает объект для редактирования богатого текста ячейки (если ячейка содержит InlineString). + ICellText? Text(); /// Устанавливает простое текстовое значение (без форматирования). ICell Set(string value); diff --git a/QWERTYkez.ExcelProcessor/Editors/NumberFormatPattern.cs b/QWERTYkez.ExcelProcessor/Editors/NumberFormatPattern.cs index 7c54fd8..a5dacb3 100644 --- a/QWERTYkez.ExcelProcessor/Editors/NumberFormatPattern.cs +++ b/QWERTYkez.ExcelProcessor/Editors/NumberFormatPattern.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; public class NumberFormatPattern { diff --git a/QWERTYkez.ExcelProcessor/Editors/RowHeight.cs b/QWERTYkez.ExcelProcessor/Editors/RowHeight.cs index a7453c0..64d77bc 100644 --- a/QWERTYkez.ExcelProcessor/Editors/RowHeight.cs +++ b/QWERTYkez.ExcelProcessor/Editors/RowHeight.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Предоставляет типобезопасное представление высоты строки в Excel с поддержкой различных единиц измерения. diff --git a/QWERTYkez.ExcelProcessor/Editors/RunFormat.cs b/QWERTYkez.ExcelProcessor/Editors/RunFormat.cs index e941fa9..2f09927 100644 --- a/QWERTYkez.ExcelProcessor/Editors/RunFormat.cs +++ b/QWERTYkez.ExcelProcessor/Editors/RunFormat.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.ExcelProcessor.Editors; +namespace QWERTYkez.ExcelProcessor; /// /// Определяет форматирование отдельного фрагмента (Run) внутри ячейки с богатым текстом. @@ -30,6 +30,66 @@ public readonly struct RunFormat /// Вертикальное смещение (надстрочный или подстрочный). public VerticalTextRunAlignment? Vertical { get; init; } + public static RunFormat? FromRunProperties(RunProperties rPr) + { + UnderlineStyle? underline; + if (rPr.GetFirstChild()?.Val?.Value is { } underlineVal) + { + if (underlineVal == UnderlineValues.Single) + { + underline = UnderlineStyle.Single; + } + else if (underlineVal == UnderlineValues.Double) + { + underline = UnderlineStyle.Double; + } + else if (underlineVal == UnderlineValues.SingleAccounting) + { + underline = UnderlineStyle.SingleAccounting; + } + else if (underlineVal == UnderlineValues.DoubleAccounting) + { + underline = UnderlineStyle.DoubleAccounting; + } + else underline = null!; + } + else underline = null!; + + VerticalTextRunAlignment? vertical; + if (rPr.GetFirstChild()?.Val?.Value is { } verticalVal) + { + if (verticalVal == VerticalAlignmentRunValues.Superscript) + { + vertical = VerticalTextRunAlignment.Superscript; + } + else if (verticalVal == VerticalAlignmentRunValues.Subscript) + { + vertical = VerticalTextRunAlignment.Subscript; + } + else vertical = null!; + } + else vertical = null!; + + + if (rPr == null) return null; + var fmt = new RunFormat + { + IsBold = rPr.GetFirstChild() != null, + IsItalic = rPr.GetFirstChild() != null, + IsStrike = rPr.GetFirstChild() != null, + // DoubleStrike в Excel не поддерживается, опускаем + + Underline = underline, + Color = rPr.GetFirstChild()?.Rgb is not null + ? ExColor.FromRgb(rPr.GetFirstChild()!.Rgb!.Value!) + : null!, + FontSize = rPr.GetFirstChild()?.Val?.Value, + FontFamily = rPr.GetFirstChild()?.Val, + Vertical = vertical + }; + return fmt; + } + /* методы для извлечения OpenXmlElement или других более удобных типов diff --git a/QWERTYkez.ExcelProcessor/ExcelWriter.cs b/QWERTYkez.ExcelProcessor/ExcelWriter.cs index 1a1d767..240688a 100644 --- a/QWERTYkez.ExcelProcessor/ExcelWriter.cs +++ b/QWERTYkez.ExcelProcessor/ExcelWriter.cs @@ -1,5 +1,4 @@ -using QWERTYkez.ExcelProcessor.Editors; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; namespace QWERTYkez.ExcelProcessor; diff --git a/QWERTYkez.ExcelProcessor/IExcelWriter.cs b/QWERTYkez.ExcelProcessor/IExcelWriter.cs index d599411..fa3e037 100644 --- a/QWERTYkez.ExcelProcessor/IExcelWriter.cs +++ b/QWERTYkez.ExcelProcessor/IExcelWriter.cs @@ -1,6 +1,4 @@ -using QWERTYkez.ExcelProcessor.Editors; - -namespace QWERTYkez.ExcelProcessor; +namespace QWERTYkez.ExcelProcessor; public interface IExcelWriter : IBook { diff --git a/QWERTYkez.ExcelProcessor/NormalizedSet.cs b/QWERTYkez.ExcelProcessor/NormalizedSet.cs index d96e8f0..badaeb7 100644 --- a/QWERTYkez.ExcelProcessor/NormalizedSet.cs +++ b/QWERTYkez.ExcelProcessor/NormalizedSet.cs @@ -8,7 +8,7 @@ namespace QWERTYkez.ExcelProcessor; /// к верхнему регистру и удаляет диакритические знаки (например, 'ё' -> 'Е'). /// Реализует ISet<string>, поэтому может использоваться там, где ожидается этот интерфейс. /// -public class NormalizedSet : ISet +internal class NormalizedSet : ISet { private readonly HashSet _inner; diff --git a/QWERTYkez.ExcelProcessor/QWERTYkez.ExcelProcessor.csproj b/QWERTYkez.ExcelProcessor/QWERTYkez.ExcelProcessor.csproj index 9ab6e8a..8600fcd 100644 --- a/QWERTYkez.ExcelProcessor/QWERTYkez.ExcelProcessor.csproj +++ b/QWERTYkez.ExcelProcessor/QWERTYkez.ExcelProcessor.csproj @@ -5,10 +5,11 @@ latest enable true + 1701;1702;IDE0130 true - 0.9.0 + 0.9.1 QWERTYkez QWERTYkez OpenXml Processor library for Excel diff --git a/QWERTYkez.WordProcessor/Builders/CellProps.cs b/QWERTYkez.WordProcessor/Builders/CellProps.cs index c529730..adf788b 100644 --- a/QWERTYkez.WordProcessor/Builders/CellProps.cs +++ b/QWERTYkez.WordProcessor/Builders/CellProps.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.WordProcessor.Builders; +namespace QWERTYkez.WordProcessor; public readonly struct CellProps(double? width = null!) { diff --git a/QWERTYkez.WordProcessor/Builders/FontProps.cs b/QWERTYkez.WordProcessor/Builders/FontProps.cs index d881f61..1d463ca 100644 --- a/QWERTYkez.WordProcessor/Builders/FontProps.cs +++ b/QWERTYkez.WordProcessor/Builders/FontProps.cs @@ -1,7 +1,7 @@ using MathStyle = DocumentFormat.OpenXml.Math.Style; using MathStyleValues = DocumentFormat.OpenXml.Math.StyleValues; -namespace QWERTYkez.WordProcessor.Builders; +namespace QWERTYkez.WordProcessor; public record FontProps { diff --git a/QWERTYkez.WordProcessor/Builders/FormulaHelper.cs b/QWERTYkez.WordProcessor/Builders/FormulaHelper.cs index b689e93..494ec3f 100644 --- a/QWERTYkez.WordProcessor/Builders/FormulaHelper.cs +++ b/QWERTYkez.WordProcessor/Builders/FormulaHelper.cs @@ -17,7 +17,7 @@ using SubSuperscript = DocumentFormat.OpenXml.Math.SubSuperscript; using SuperArgument = DocumentFormat.OpenXml.Math.SuperArgument; using Superscript = DocumentFormat.OpenXml.Math.Superscript; -namespace QWERTYkez.WordProcessor.Builders; +namespace QWERTYkez.WordProcessor; internal static class FormulaHelper { diff --git a/QWERTYkez.WordProcessor/Builders/Interfaces.cs b/QWERTYkez.WordProcessor/Builders/Interfaces.cs index d8069c6..6b1cb72 100644 --- a/QWERTYkez.WordProcessor/Builders/Interfaces.cs +++ b/QWERTYkez.WordProcessor/Builders/Interfaces.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.WordProcessor.Builders; +namespace QWERTYkez.WordProcessor; public interface ITable { diff --git a/QWERTYkez.WordProcessor/Builders/ParagraphBuilderBase.cs b/QWERTYkez.WordProcessor/Builders/ParagraphBuilderBase.cs index 11246e6..c002def 100644 --- a/QWERTYkez.WordProcessor/Builders/ParagraphBuilderBase.cs +++ b/QWERTYkez.WordProcessor/Builders/ParagraphBuilderBase.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.WordProcessor.Builders; +namespace QWERTYkez.WordProcessor; abstract class ParagraphBuilderBase : IParagraph, IFormula { diff --git a/QWERTYkez.WordProcessor/Builders/TableBuilder.cs b/QWERTYkez.WordProcessor/Builders/TableBuilder.cs index 087a760..91155be 100644 --- a/QWERTYkez.WordProcessor/Builders/TableBuilder.cs +++ b/QWERTYkez.WordProcessor/Builders/TableBuilder.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.WordProcessor.Builders; +namespace QWERTYkez.WordProcessor; internal sealed class TableBuilder : ParagraphBuilderBase, ITable, IRow, ICell { diff --git a/QWERTYkez.WordProcessor/Builders/TextBuilder.cs b/QWERTYkez.WordProcessor/Builders/TextBuilder.cs index 9da8caf..16995af 100644 --- a/QWERTYkez.WordProcessor/Builders/TextBuilder.cs +++ b/QWERTYkez.WordProcessor/Builders/TextBuilder.cs @@ -1,4 +1,4 @@ -namespace QWERTYkez.WordProcessor.Builders; +namespace QWERTYkez.WordProcessor; internal sealed class TextBuilder : ParagraphBuilderBase, IText { diff --git a/QWERTYkez.WordProcessor/IWordWriter.cs b/QWERTYkez.WordProcessor/IWordWriter.cs index f584f31..6e45720 100644 --- a/QWERTYkez.WordProcessor/IWordWriter.cs +++ b/QWERTYkez.WordProcessor/IWordWriter.cs @@ -1,4 +1,4 @@ -using QWERTYkez.WordProcessor.Builders; +using QWERTYkez.WordProcessor; namespace QWERTYkez.WordProcessor; diff --git a/QWERTYkez.WordProcessor/NormalizedSet.cs b/QWERTYkez.WordProcessor/NormalizedSet.cs index 012e768..763d1fc 100644 --- a/QWERTYkez.WordProcessor/NormalizedSet.cs +++ b/QWERTYkez.WordProcessor/NormalizedSet.cs @@ -8,7 +8,7 @@ namespace QWERTYkez.WordProcessor; /// к верхнему регистру и удаляет диакритические знаки (например, 'ё' -> 'Е'). /// Реализует ISet<string>, поэтому может использоваться там, где ожидается этот интерфейс. /// -public class NormalizedSet : ISet +internal class NormalizedSet : ISet { private readonly HashSet _inner; diff --git a/QWERTYkez.WordProcessor/QWERTYkez.WordProcessor.csproj b/QWERTYkez.WordProcessor/QWERTYkez.WordProcessor.csproj index b2d0363..dedd462 100644 --- a/QWERTYkez.WordProcessor/QWERTYkez.WordProcessor.csproj +++ b/QWERTYkez.WordProcessor/QWERTYkez.WordProcessor.csproj @@ -5,10 +5,11 @@ latest enable true + 1701;1702;IDE0130 true - 0.9.0 + 0.9.1 QWERTYkez QWERTYkez OpenXml Processor library for Word diff --git a/QWERTYkez.WordProcessor/ReplaceToTableExt.cs b/QWERTYkez.WordProcessor/ReplaceToTableExt.cs index 062e776..b1f54f8 100644 --- a/QWERTYkez.WordProcessor/ReplaceToTableExt.cs +++ b/QWERTYkez.WordProcessor/ReplaceToTableExt.cs @@ -1,4 +1,4 @@ -using QWERTYkez.WordProcessor.Builders; +using QWERTYkez.WordProcessor; namespace QWERTYkez.WordProcessor; diff --git a/QWERTYkez.WordProcessor/ReplaceToTextExt.cs b/QWERTYkez.WordProcessor/ReplaceToTextExt.cs index e6dfcc0..8d85b9f 100644 --- a/QWERTYkez.WordProcessor/ReplaceToTextExt.cs +++ b/QWERTYkez.WordProcessor/ReplaceToTextExt.cs @@ -1,4 +1,4 @@ -using QWERTYkez.WordProcessor.Builders; +using QWERTYkez.WordProcessor; namespace QWERTYkez.WordProcessor; diff --git a/QWERTYkez.WordProcessor/WordWriter.cs b/QWERTYkez.WordProcessor/WordWriter.cs index 6c17c50..823043b 100644 --- a/QWERTYkez.WordProcessor/WordWriter.cs +++ b/QWERTYkez.WordProcessor/WordWriter.cs @@ -1,4 +1,4 @@ -using QWERTYkez.WordProcessor.Builders; +using QWERTYkez.WordProcessor; namespace QWERTYkez.WordProcessor;