Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update names and types of properties on Worksheet (#18)
A worksheet provided in #12 has a `Column` value without `customWidth` attribute. This attribute is now optional, also types of properties on `Column` were updated according to [documentation from Microsoft](https://docs.microsoft.com/en-us/dotnet/api/documentformat.openxml.spreadsheet.column?view=openxml-2.8.1). A few other types and names were updated accordingly with deprecation warnings added where possible. Worksheet XML that couldn't be parsed previously has been added to `WorksheetTests`. * Update names and types of properties on Worksheet * Update types on Column model and related tests * Increase test coverage for new/deprecated props
- Loading branch information
1 parent
91a3b39
commit 37fc33c
Showing
11 changed files
with
429 additions
and
220 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| // | ||
| // Relationships.swift | ||
| // XLSXReader | ||
| // CoreXLSX | ||
| // | ||
| // Created by Max Desiatov on 27/10/2018. | ||
| // | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| // | ||
| // Workbook.swift | ||
| // CoreXLSXmacOS | ||
| // CoreXLSX | ||
| // | ||
| // Created by Max Desiatov on 23/11/2018. | ||
| // | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| // | ||
| // Cell.swift | ||
| // CoreXLSX | ||
| // | ||
| // Created by Max Desiatov on 24/11/2018. | ||
| // | ||
|
|
||
| public struct Cell: Codable, Equatable { | ||
| public let reference: CellReference | ||
| public let type: String? | ||
|
|
||
| /// FIXME: Attribute "s" in a cell is an index into the styles table, | ||
| /// while the cell type "s" corresponds to the shared string table. | ||
| /// Can XMLCoder distinguish between an attribute and a | ||
| /// node having the same name? | ||
| public let s: String? | ||
| public let inlineString: InlineString? | ||
| public let formula: String? | ||
| public let value: String? | ||
|
|
||
| enum CodingKeys: String, CodingKey { | ||
| case formula = "f" | ||
| case value = "v" | ||
| case inlineString = "is" | ||
| case reference = "r" | ||
| case type = "t" | ||
| case s | ||
| } | ||
| } |
Oops, something went wrong.