Skip to content

Commit b1c98bc

Browse files
Merge remote-tracking branch 'origin/master' into release
2 parents f01da26 + 699ff4c commit b1c98bc

File tree

951 files changed

+153854
-748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

951 files changed

+153854
-748
lines changed

JenkinsfileRelease

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ properties([
22
gitLabConnection('gitlab')
33
])
44

5+
parameters {
6+
string(name: 'SDK_VERSION', defaultValue: 'v2310.0.0', description: 'version of sdk')
7+
}
8+
59
node('win2019') {
6-
try {
7-
env.SDK_VERSION = powershell(returnStdout: true, script:'$re = (ConvertFrom-Json -InputObject (New-Object System.Net.WebClient).DownloadString("https://api.aspose.cloud/v4.0/words/swagger/spec")).info.version -match "^(\\d+)\\.(\\d+)"; $version = $matches[1] + ("{0:d2}" -f [int]$matches[2]); echo ("v" + $version + ".0.0")').trim()
8-
10+
try {
911
gitlabCommitStatus("checkout") {
1012
stage('checkout'){
1113
checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-go.git']]])
@@ -40,20 +42,6 @@ node('win2019') {
4042
}
4143
}
4244
}
43-
44-
gitlabCommitStatus("announce a package") {
45-
stage('announce a package') {
46-
try {
47-
env.SHORT_SDK_VERSION = powershell(returnStdout: true, script:'echo $env:SDK_VERSION.Substring(0,5)').trim()
48-
powershell "Start-Sleep -Seconds 120"
49-
powershell 'echo (New-Object System.Net.WebClient).DownloadString("https://proxy.golang.org/github.com/aspose-words-cloud/aspose-words-cloud-go/$env:SHORT_SDK_VERSION/@v/$env:SDK_VERSION"+".info")'
50-
}
51-
catch(e)
52-
{
53-
echo 'Announcing error: ' + e.toString()
54-
}
55-
}
56-
}
5745
} finally {
5846
deleteDir()
5947
}

dev/api/api_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var (
6565
xmlCheck = regexp.MustCompile("(?i:[application|text]/xml)")
6666
)
6767

68-
// APIClient manages communication with the Aspose.Words for Cloud API Reference API v23.9
68+
// APIClient manages communication with the Aspose.Words for Cloud API Reference API v23.10
6969
// In most cases there should be only one, shared, APIClient.
7070
type APIClient struct {
7171
cfg *models.Configuration

dev/api/models/accept_all_revisions_online_response.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import "io"
3333
// AcceptAllRevisionsOnlineResponse struct
3434
// Accepts all revisions in the document.
3535
type AcceptAllRevisionsOnlineResponse struct {
36-
// The response model.
36+
// The REST response with a result of the modification operations for the revisions collection (now these are acceptAll and rejectAll).
3737
Model IRevisionsModificationResponse
3838

3939

dev/api/models/append_document_online_response.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import "io"
3333
// AppendDocumentOnlineResponse struct
3434
// Appends documents to the original document.
3535
type AppendDocumentOnlineResponse struct {
36-
// The response model.
36+
// The REST response with a document description.
3737
Model IDocumentResponse
3838

3939

dev/api/models/apply_style_to_document_element_online_response.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import "io"
3333
// ApplyStyleToDocumentElementOnlineResponse struct
3434
// Applies a style to the document node.
3535
type ApplyStyleToDocumentElementOnlineResponse struct {
36-
// The response model.
36+
// The base class for all responses.
3737
Model IWordsResponse
3838

3939

dev/api/models/bmp_save_options_data.go

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ type IBmpSaveOptionsData interface {
9494
SetUseHighQualityRendering(value *bool)
9595
GetVerticalResolution() *float64
9696
SetVerticalResolution(value *float64)
97+
GetImageHeight() *int32
98+
SetImageHeight(value *int32)
99+
GetImageWidth() *int32
100+
SetImageWidth(value *int32)
97101
GetUseGdiEmfRenderer() *bool
98102
SetUseGdiEmfRenderer(value *bool)
99103
GetSaveFormat() *string
@@ -191,6 +195,12 @@ type BmpSaveOptionsData struct {
191195
// Container class for bmp save options.
192196
VerticalResolution *float64 `json:"VerticalResolution,omitempty"`
193197

198+
// Container class for bmp save options.
199+
ImageHeight *int32 `json:"ImageHeight,omitempty"`
200+
201+
// Container class for bmp save options.
202+
ImageWidth *int32 `json:"ImageWidth,omitempty"`
203+
194204
// Container class for bmp save options.
195205
UseGdiEmfRenderer *bool `json:"UseGdiEmfRenderer,omitempty"`
196206

@@ -605,6 +615,34 @@ func (obj *BmpSaveOptionsData) Deserialize(json map[string]interface{}) {
605615

606616
}
607617

618+
if jsonValue, exists := json["ImageHeight"]; exists {
619+
if parsedValue, valid := jsonValue.(float64); valid {
620+
obj.ImageHeight = new(int32)
621+
*obj.ImageHeight = int32(parsedValue)
622+
}
623+
624+
} else if jsonValue, exists := json["imageHeight"]; exists {
625+
if parsedValue, valid := jsonValue.(float64); valid {
626+
obj.ImageHeight = new(int32)
627+
*obj.ImageHeight = int32(parsedValue)
628+
}
629+
630+
}
631+
632+
if jsonValue, exists := json["ImageWidth"]; exists {
633+
if parsedValue, valid := jsonValue.(float64); valid {
634+
obj.ImageWidth = new(int32)
635+
*obj.ImageWidth = int32(parsedValue)
636+
}
637+
638+
} else if jsonValue, exists := json["imageWidth"]; exists {
639+
if parsedValue, valid := jsonValue.(float64); valid {
640+
obj.ImageWidth = new(int32)
641+
*obj.ImageWidth = int32(parsedValue)
642+
}
643+
644+
}
645+
608646
if jsonValue, exists := json["UseGdiEmfRenderer"]; exists {
609647
if parsedValue, valid := jsonValue.(bool); valid {
610648
obj.UseGdiEmfRenderer = &parsedValue
@@ -862,6 +900,22 @@ func (obj *BmpSaveOptionsData) SetVerticalResolution(value *float64) {
862900
obj.VerticalResolution = value
863901
}
864902

903+
func (obj *BmpSaveOptionsData) GetImageHeight() *int32 {
904+
return obj.ImageHeight
905+
}
906+
907+
func (obj *BmpSaveOptionsData) SetImageHeight(value *int32) {
908+
obj.ImageHeight = value
909+
}
910+
911+
func (obj *BmpSaveOptionsData) GetImageWidth() *int32 {
912+
return obj.ImageWidth
913+
}
914+
915+
func (obj *BmpSaveOptionsData) SetImageWidth(value *int32) {
916+
obj.ImageWidth = value
917+
}
918+
865919
func (obj *BmpSaveOptionsData) GetUseGdiEmfRenderer() *bool {
866920
return obj.UseGdiEmfRenderer
867921
}

dev/api/models/bookmark_insert.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ type IBookmarkInsert interface {
3838
SetName(value *string)
3939
GetText() *string
4040
SetText(value *string)
41-
GetEndRange() INewDocumentPosition
42-
SetEndRange(value INewDocumentPosition)
4341
GetStartRange() INewDocumentPosition
4442
SetStartRange(value INewDocumentPosition)
43+
GetEndRange() INewDocumentPosition
44+
SetEndRange(value INewDocumentPosition)
4545
}
4646

4747
type BookmarkInsert struct {
@@ -52,10 +52,10 @@ type BookmarkInsert struct {
5252
Text *string `json:"Text,omitempty"`
5353

5454
// Represents a bookmark to insert.
55-
EndRange INewDocumentPosition `json:"EndRange,omitempty"`
55+
StartRange INewDocumentPosition `json:"StartRange,omitempty"`
5656

5757
// Represents a bookmark to insert.
58-
StartRange INewDocumentPosition `json:"StartRange,omitempty"`
58+
EndRange INewDocumentPosition `json:"EndRange,omitempty"`
5959
}
6060

6161
func (BookmarkInsert) IsBookmarkInsert() bool {
@@ -67,14 +67,14 @@ func (BookmarkInsert) IsBookmarkData() bool {
6767
}
6868

6969
func (obj *BookmarkInsert) Initialize() {
70-
if (obj.EndRange != nil) {
71-
obj.EndRange.Initialize()
72-
}
73-
7470
if (obj.StartRange != nil) {
7571
obj.StartRange.Initialize()
7672
}
7773

74+
if (obj.EndRange != nil) {
75+
obj.EndRange.Initialize()
76+
}
77+
7878

7979
}
8080

@@ -103,34 +103,34 @@ func (obj *BookmarkInsert) Deserialize(json map[string]interface{}) {
103103

104104
}
105105

106-
if jsonValue, exists := json["EndRange"]; exists {
106+
if jsonValue, exists := json["StartRange"]; exists {
107107
if parsedValue, valid := jsonValue.(map[string]interface{}); valid {
108108
var modelInstance INewDocumentPosition = new(NewDocumentPosition)
109109
modelInstance.Deserialize(parsedValue)
110-
obj.EndRange = modelInstance
110+
obj.StartRange = modelInstance
111111
}
112112

113-
} else if jsonValue, exists := json["endRange"]; exists {
113+
} else if jsonValue, exists := json["startRange"]; exists {
114114
if parsedValue, valid := jsonValue.(map[string]interface{}); valid {
115115
var modelInstance INewDocumentPosition = new(NewDocumentPosition)
116116
modelInstance.Deserialize(parsedValue)
117-
obj.EndRange = modelInstance
117+
obj.StartRange = modelInstance
118118
}
119119

120120
}
121121

122-
if jsonValue, exists := json["StartRange"]; exists {
122+
if jsonValue, exists := json["EndRange"]; exists {
123123
if parsedValue, valid := jsonValue.(map[string]interface{}); valid {
124124
var modelInstance INewDocumentPosition = new(NewDocumentPosition)
125125
modelInstance.Deserialize(parsedValue)
126-
obj.StartRange = modelInstance
126+
obj.EndRange = modelInstance
127127
}
128128

129-
} else if jsonValue, exists := json["startRange"]; exists {
129+
} else if jsonValue, exists := json["endRange"]; exists {
130130
if parsedValue, valid := jsonValue.(map[string]interface{}); valid {
131131
var modelInstance INewDocumentPosition = new(NewDocumentPosition)
132132
modelInstance.Deserialize(parsedValue)
133-
obj.StartRange = modelInstance
133+
obj.EndRange = modelInstance
134134
}
135135

136136
}
@@ -156,14 +156,6 @@ func (obj *BookmarkInsert) SetText(value *string) {
156156
obj.Text = value
157157
}
158158

159-
func (obj *BookmarkInsert) GetEndRange() INewDocumentPosition {
160-
return obj.EndRange
161-
}
162-
163-
func (obj *BookmarkInsert) SetEndRange(value INewDocumentPosition) {
164-
obj.EndRange = value
165-
}
166-
167159
func (obj *BookmarkInsert) GetStartRange() INewDocumentPosition {
168160
return obj.StartRange
169161
}
@@ -172,3 +164,11 @@ func (obj *BookmarkInsert) SetStartRange(value INewDocumentPosition) {
172164
obj.StartRange = value
173165
}
174166

167+
func (obj *BookmarkInsert) GetEndRange() INewDocumentPosition {
168+
return obj.EndRange
169+
}
170+
171+
func (obj *BookmarkInsert) SetEndRange(value INewDocumentPosition) {
172+
obj.EndRange = value
173+
}
174+

dev/api/models/bookmark_response.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
package models
2929

3030
// The REST response with a bookmark.
31+
// This response should be returned by the service when handling: GET bookmarks/{bookmarkName}.
3132

3233
type IBookmarkResponse interface {
3334
IsBookmarkResponse() bool
@@ -42,9 +43,11 @@ type IBookmarkResponse interface {
4243

4344
type BookmarkResponse struct {
4445
// The REST response with a bookmark.
46+
// This response should be returned by the service when handling: GET bookmarks/{bookmarkName}.
4547
RequestId *string `json:"RequestId,omitempty"`
4648

4749
// The REST response with a bookmark.
50+
// This response should be returned by the service when handling: GET bookmarks/{bookmarkName}.
4851
Bookmark IBookmark `json:"Bookmark,omitempty"`
4952
}
5053

dev/api/models/bookmarks_response.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
package models
2929

3030
// The REST response with a collection of bookmarks.
31+
// This response should be returned by the service when handling: GET bookmarks.
3132

3233
type IBookmarksResponse interface {
3334
IsBookmarksResponse() bool
@@ -42,9 +43,11 @@ type IBookmarksResponse interface {
4243

4344
type BookmarksResponse struct {
4445
// The REST response with a collection of bookmarks.
46+
// This response should be returned by the service when handling: GET bookmarks.
4547
RequestId *string `json:"RequestId,omitempty"`
4648

4749
// The REST response with a collection of bookmarks.
50+
// This response should be returned by the service when handling: GET bookmarks.
4851
Bookmarks IBookmarks `json:"Bookmarks,omitempty"`
4952
}
5053

dev/api/models/border.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
package models
2929

3030
// Represents a border of an object.
31+
// Borders can be applied to various document elements including paragraph, run of text inside a paragraph or a table cell.
3132

3233
type IBorder interface {
3334
IsBorder() bool
@@ -52,24 +53,31 @@ type IBorder interface {
5253

5354
type Border struct {
5455
// Represents a border of an object.
56+
// Borders can be applied to various document elements including paragraph, run of text inside a paragraph or a table cell.
5557
Link IWordsApiLink `json:"Link,omitempty"`
5658

5759
// Represents a border of an object.
60+
// Borders can be applied to various document elements including paragraph, run of text inside a paragraph or a table cell.
5861
BorderType *string `json:"BorderType,omitempty"`
5962

6063
// Represents a border of an object.
64+
// Borders can be applied to various document elements including paragraph, run of text inside a paragraph or a table cell.
6165
Color IXmlColor `json:"Color,omitempty"`
6266

6367
// Represents a border of an object.
68+
// Borders can be applied to various document elements including paragraph, run of text inside a paragraph or a table cell.
6469
DistanceFromText *float64 `json:"DistanceFromText,omitempty"`
6570

6671
// Represents a border of an object.
72+
// Borders can be applied to various document elements including paragraph, run of text inside a paragraph or a table cell.
6773
LineStyle *string `json:"LineStyle,omitempty"`
6874

6975
// Represents a border of an object.
76+
// Borders can be applied to various document elements including paragraph, run of text inside a paragraph or a table cell.
7077
LineWidth *float64 `json:"LineWidth,omitempty"`
7178

7279
// Represents a border of an object.
80+
// Borders can be applied to various document elements including paragraph, run of text inside a paragraph or a table cell.
7381
Shadow *bool `json:"Shadow,omitempty"`
7482
}
7583

0 commit comments

Comments
 (0)