Skip to content

Commit 394169d

Browse files
Merge remote-tracking branch 'remotes/origin/master' into release
2 parents 36afb2e + 1632e00 commit 394169d

File tree

12 files changed

+184
-92
lines changed

12 files changed

+184
-92
lines changed

AsposeWordsCloud.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'AsposeWordsCloud'
3-
s.version = '23.3'
3+
s.version = '23.4'
44
s.summary = 'Aspose Words for Cloud.'
55
s.homepage = 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git'
66
s.license = { :type => 'MIT', :file => 'LICENSE' }

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ This repository contains Aspose.Words Cloud SDK for Swift source code. This SDK
1313
* Watermarks and protection
1414
* Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
1515

16+
## Enhancements in Version 23.4
17+
18+
- Added new type of RangeEndIdentifier for RangeApi: document:end
19+
20+
1621
## Enhancements in Version 23.3
1722

1823
- Fix compatibility between CreateDocument API and Dropbox storage.
@@ -268,7 +273,7 @@ Add link to this repository as dependency to your Package.swift:
268273

269274
dependencies: [
270275
// Dependencies declare other packages that this package depends on.
271-
.package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "23.3"),
276+
.package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "23.4"),
272277
],
273278
targets: [
274279
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -286,7 +291,7 @@ targets: [
286291
Add link to git repository as dependency to your Podfile:
287292

288293
```ruby
289-
pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '23.3'
294+
pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '23.4'
290295
```
291296

292297
## Getting Started

Sources/AsposeWordsCloud/Api/Configuration.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,6 @@ public class Configuration : Codable {
188188

189189
// Returns SDK version for using in statistics headers
190190
public func getSdkVersion() -> String {
191-
return "23.3";
191+
return "23.4";
192192
}
193193
}

Sources/AsposeWordsCloud/Model/BookmarkInsert.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import Foundation
3131
@available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
3232
public class BookmarkInsert : BookmarkData {
3333
// Field of endRange. Represents a bookmark to insert.
34-
private var _endRange : DocumentPosition? = nil;
34+
private var _endRange : NewDocumentPosition? = nil;
3535

36-
public var endRange : DocumentPosition? {
36+
public var endRange : NewDocumentPosition? {
3737
get {
3838
return self._endRange;
3939
}
@@ -43,9 +43,9 @@ public class BookmarkInsert : BookmarkData {
4343
}
4444

4545
// Field of startRange. Represents a bookmark to insert.
46-
private var _startRange : DocumentPosition? = nil;
46+
private var _startRange : NewDocumentPosition? = nil;
4747

48-
public var startRange : DocumentPosition? {
48+
public var startRange : NewDocumentPosition? {
4949
get {
5050
return self._startRange;
5151
}
@@ -67,8 +67,8 @@ public class BookmarkInsert : BookmarkData {
6767
public required init(from decoder: Decoder) throws {
6868
try super.init(from: decoder);
6969
let container = try decoder.container(keyedBy: CodingKeys.self);
70-
self.endRange = try container.decodeIfPresent(DocumentPosition.self, forKey: .endRange);
71-
self.startRange = try container.decodeIfPresent(DocumentPosition.self, forKey: .startRange);
70+
self.endRange = try container.decodeIfPresent(NewDocumentPosition.self, forKey: .endRange);
71+
self.startRange = try container.decodeIfPresent(NewDocumentPosition.self, forKey: .startRange);
7272
}
7373

7474
public override func encode(to encoder: Encoder) throws {
@@ -86,25 +86,25 @@ public class BookmarkInsert : BookmarkData {
8686
}
8787

8888
// Sets endRange. Gets or sets the link to end bookmark node.
89-
public func setEndRange(endRange : DocumentPosition?) -> BookmarkInsert {
89+
public func setEndRange(endRange : NewDocumentPosition?) -> BookmarkInsert {
9090
self.endRange = endRange;
9191
return self;
9292
}
9393

9494
// Gets endRange. Gets or sets the link to end bookmark node.
95-
public func getEndRange() -> DocumentPosition? {
95+
public func getEndRange() -> NewDocumentPosition? {
9696
return self.endRange;
9797
}
9898

9999

100100
// Sets startRange. Gets or sets the link to start bookmark node.
101-
public func setStartRange(startRange : DocumentPosition?) -> BookmarkInsert {
101+
public func setStartRange(startRange : NewDocumentPosition?) -> BookmarkInsert {
102102
self.startRange = startRange;
103103
return self;
104104
}
105105

106106
// Gets startRange. Gets or sets the link to start bookmark node.
107-
public func getStartRange() -> DocumentPosition? {
107+
public func getStartRange() -> NewDocumentPosition? {
108108
return self.startRange;
109109
}
110110
}

Sources/AsposeWordsCloud/Model/CommentBase.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public class CommentBase : Codable, WordsApiModel {
6767
}
6868

6969
// Field of rangeEnd. Comment.
70-
private var _rangeEnd : DocumentPosition? = nil;
70+
private var _rangeEnd : NewDocumentPosition? = nil;
7171

72-
public var rangeEnd : DocumentPosition? {
72+
public var rangeEnd : NewDocumentPosition? {
7373
get {
7474
return self._rangeEnd;
7575
}
@@ -79,9 +79,9 @@ public class CommentBase : Codable, WordsApiModel {
7979
}
8080

8181
// Field of rangeStart. Comment.
82-
private var _rangeStart : DocumentPosition? = nil;
82+
private var _rangeStart : NewDocumentPosition? = nil;
8383

84-
public var rangeStart : DocumentPosition? {
84+
public var rangeStart : NewDocumentPosition? {
8585
get {
8686
return self._rangeStart;
8787
}
@@ -125,8 +125,8 @@ public class CommentBase : Codable, WordsApiModel {
125125
}
126126

127127
self.initial = try container.decodeIfPresent(String.self, forKey: .initial);
128-
self.rangeEnd = try container.decodeIfPresent(DocumentPosition.self, forKey: .rangeEnd);
129-
self.rangeStart = try container.decodeIfPresent(DocumentPosition.self, forKey: .rangeStart);
128+
self.rangeEnd = try container.decodeIfPresent(NewDocumentPosition.self, forKey: .rangeEnd);
129+
self.rangeStart = try container.decodeIfPresent(NewDocumentPosition.self, forKey: .rangeStart);
130130
self.text = try container.decodeIfPresent(String.self, forKey: .text);
131131
}
132132

@@ -192,25 +192,25 @@ public class CommentBase : Codable, WordsApiModel {
192192

193193

194194
// Sets rangeEnd. Gets or sets the link to comment range end node.
195-
public func setRangeEnd(rangeEnd : DocumentPosition?) -> CommentBase {
195+
public func setRangeEnd(rangeEnd : NewDocumentPosition?) -> CommentBase {
196196
self.rangeEnd = rangeEnd;
197197
return self;
198198
}
199199

200200
// Gets rangeEnd. Gets or sets the link to comment range end node.
201-
public func getRangeEnd() -> DocumentPosition? {
201+
public func getRangeEnd() -> NewDocumentPosition? {
202202
return self.rangeEnd;
203203
}
204204

205205

206206
// Sets rangeStart. Gets or sets the link to comment range start node.
207-
public func setRangeStart(rangeStart : DocumentPosition?) -> CommentBase {
207+
public func setRangeStart(rangeStart : NewDocumentPosition?) -> CommentBase {
208208
self.rangeStart = rangeStart;
209209
return self;
210210
}
211211

212212
// Gets rangeStart. Gets or sets the link to comment range start node.
213-
public func getRangeStart() -> DocumentPosition? {
213+
public func getRangeStart() -> NewDocumentPosition? {
214214
return self.rangeStart;
215215
}
216216

Sources/AsposeWordsCloud/Model/DrawingObjectInsert.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ public class DrawingObjectInsert : Codable, WordsApiModel {
142142
}
143143

144144
// Field of position. Drawing object element for insert.
145-
private var _position : DocumentPosition? = nil;
145+
private var _position : NewDocumentPosition? = nil;
146146

147-
public var position : DocumentPosition? {
147+
public var position : NewDocumentPosition? {
148148
get {
149149
return self._position;
150150
}
@@ -232,7 +232,7 @@ public class DrawingObjectInsert : Codable, WordsApiModel {
232232
let container = try decoder.container(keyedBy: CodingKeys.self);
233233
self.height = try container.decodeIfPresent(Double.self, forKey: .height);
234234
self._left = try container.decodeIfPresent(Double.self, forKey: ._left);
235-
self.position = try container.decodeIfPresent(DocumentPosition.self, forKey: .position);
235+
self.position = try container.decodeIfPresent(NewDocumentPosition.self, forKey: .position);
236236
self.relativeHorizontalPosition = try container.decodeIfPresent(RelativeHorizontalPosition.self, forKey: .relativeHorizontalPosition);
237237
self.relativeVerticalPosition = try container.decodeIfPresent(RelativeVerticalPosition.self, forKey: .relativeVerticalPosition);
238238
self.top = try container.decodeIfPresent(Double.self, forKey: .top);
@@ -296,13 +296,13 @@ public class DrawingObjectInsert : Codable, WordsApiModel {
296296

297297

298298
// Sets position. Gets or sets the position, before which the DrawingObject will be inserted.
299-
public func setPosition(position : DocumentPosition?) -> DrawingObjectInsert {
299+
public func setPosition(position : NewDocumentPosition?) -> DrawingObjectInsert {
300300
self.position = position;
301301
return self;
302302
}
303303

304304
// Gets position. Gets or sets the position, before which the DrawingObject will be inserted.
305-
public func getPosition() -> DocumentPosition? {
305+
public func getPosition() -> NewDocumentPosition? {
306306
return self.position;
307307
}
308308

Sources/AsposeWordsCloud/Model/FootnoteBase.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public class FootnoteBase : Codable, WordsApiModel {
5353
}
5454

5555
// Field of position. Footnote base class.
56-
private var _position : DocumentPosition? = nil;
56+
private var _position : NewDocumentPosition? = nil;
5757

58-
public var position : DocumentPosition? {
58+
public var position : NewDocumentPosition? {
5959
get {
6060
return self._position;
6161
}
@@ -102,7 +102,7 @@ public class FootnoteBase : Codable, WordsApiModel {
102102
public required init(from decoder: Decoder) throws {
103103
let container = try decoder.container(keyedBy: CodingKeys.self);
104104
self.footnoteType = try container.decodeIfPresent(FootnoteType.self, forKey: .footnoteType);
105-
self.position = try container.decodeIfPresent(DocumentPosition.self, forKey: .position);
105+
self.position = try container.decodeIfPresent(NewDocumentPosition.self, forKey: .position);
106106
self.referenceMark = try container.decodeIfPresent(String.self, forKey: .referenceMark);
107107
self.text = try container.decodeIfPresent(String.self, forKey: .text);
108108
}
@@ -139,13 +139,13 @@ public class FootnoteBase : Codable, WordsApiModel {
139139

140140

141141
// Sets position. Gets or sets the link to comment range start node.
142-
public func setPosition(position : DocumentPosition?) -> FootnoteBase {
142+
public func setPosition(position : NewDocumentPosition?) -> FootnoteBase {
143143
self.position = position;
144144
return self;
145145
}
146146

147147
// Gets position. Gets or sets the link to comment range start node.
148-
public func getPosition() -> DocumentPosition? {
148+
public func getPosition() -> NewDocumentPosition? {
149149
return self.position;
150150
}
151151

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
/*
2+
* --------------------------------------------------------------------------------
3+
* <copyright company="Aspose" file="NewDocumentPosition.swift">
4+
* Copyright (c) 2023 Aspose.Words for Cloud
5+
* </copyright>
6+
* <summary>
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in all
15+
* copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
* SOFTWARE.
24+
* </summary>
25+
* --------------------------------------------------------------------------------
26+
*/
27+
28+
import Foundation
29+
30+
// DTO container with a new position in the document tree.
31+
@available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
32+
public class NewDocumentPosition : Codable, WordsApiModel {
33+
// Field of nodeId. DTO container with a new position in the document tree.
34+
private var _nodeId : String? = nil;
35+
36+
public var nodeId : String? {
37+
get {
38+
return self._nodeId;
39+
}
40+
set {
41+
self._nodeId = newValue;
42+
}
43+
}
44+
45+
// Field of offset. DTO container with a new position in the document tree.
46+
private var _offset : Int? = nil;
47+
48+
public var offset : Int? {
49+
get {
50+
return self._offset;
51+
}
52+
set {
53+
self._offset = newValue;
54+
}
55+
}
56+
57+
private enum CodingKeys: String, CodingKey {
58+
case nodeId = "NodeId";
59+
case offset = "Offset";
60+
case invalidCodingKey;
61+
}
62+
63+
public init() {
64+
}
65+
66+
public required init(from decoder: Decoder) throws {
67+
let container = try decoder.container(keyedBy: CodingKeys.self);
68+
self.nodeId = try container.decodeIfPresent(String.self, forKey: .nodeId);
69+
self.offset = try container.decodeIfPresent(Int.self, forKey: .offset);
70+
}
71+
72+
public func encode(to encoder: Encoder) throws {
73+
var container = encoder.container(keyedBy: CodingKeys.self);
74+
if (self.nodeId != nil) {
75+
try container.encode(self.nodeId, forKey: .nodeId);
76+
}
77+
if (self.offset != nil) {
78+
try container.encode(self.offset, forKey: .offset);
79+
}
80+
}
81+
82+
public func collectFilesContent(_ resultFilesContent : inout [FileReference]) {
83+
}
84+
85+
// Sets nodeId. Gets or sets the node id.
86+
public func setNodeId(nodeId : String?) -> NewDocumentPosition {
87+
self.nodeId = nodeId;
88+
return self;
89+
}
90+
91+
// Gets nodeId. Gets or sets the node id.
92+
public func getNodeId() -> String? {
93+
return self.nodeId;
94+
}
95+
96+
97+
// Sets offset. Gets or sets the offset in the node.
98+
public func setOffset(offset : Int?) -> NewDocumentPosition {
99+
self.offset = offset;
100+
return self;
101+
}
102+
103+
// Gets offset. Gets or sets the offset in the node.
104+
public func getOffset() -> Int? {
105+
return self.offset;
106+
}
107+
}

Sources/AsposeWordsCloud/Model/TableInsert.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public class TableInsert : Codable, WordsApiModel {
4343
}
4444

4545
// Field of position. DTO container with a table element.
46-
private var _position : DocumentPosition? = nil;
46+
private var _position : NewDocumentPosition? = nil;
4747

48-
public var position : DocumentPosition? {
48+
public var position : NewDocumentPosition? {
4949
get {
5050
return self._position;
5151
}
@@ -79,7 +79,7 @@ public class TableInsert : Codable, WordsApiModel {
7979
public required init(from decoder: Decoder) throws {
8080
let container = try decoder.container(keyedBy: CodingKeys.self);
8181
self.columnsCount = try container.decodeIfPresent(Int.self, forKey: .columnsCount);
82-
self.position = try container.decodeIfPresent(DocumentPosition.self, forKey: .position);
82+
self.position = try container.decodeIfPresent(NewDocumentPosition.self, forKey: .position);
8383
self.rowsCount = try container.decodeIfPresent(Int.self, forKey: .rowsCount);
8484
}
8585

@@ -112,13 +112,13 @@ public class TableInsert : Codable, WordsApiModel {
112112

113113

114114
// Sets position. Gets or sets the position to insert the table. The table will be inserted before the specified position.
115-
public func setPosition(position : DocumentPosition?) -> TableInsert {
115+
public func setPosition(position : NewDocumentPosition?) -> TableInsert {
116116
self.position = position;
117117
return self;
118118
}
119119

120120
// Gets position. Gets or sets the position to insert the table. The table will be inserted before the specified position.
121-
public func getPosition() -> DocumentPosition? {
121+
public func getPosition() -> NewDocumentPosition? {
122122
return self.position;
123123
}
124124

0 commit comments

Comments
 (0)