Skip to content

Commit c118a98

Browse files
dynabic-billing-teamdynabic-billing-team
committed
Merge remote-tracking branch 'origin/master' into release
2 parents ee71481 + 0cbd17d commit c118a98

19 files changed

+961
-3
lines changed

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ Feel free to explore the [Developer's Guide](https://docs.aspose.cloud/display/w
1717
- Read & write access to Document Object Model.
1818
- Thread safe
1919

20+
## Enhancements in Version 24.11
21+
22+
- Added GetAllRevisions method to obtain all available revisions in document.
23+
- Added AppendAllEntriesToOneSection parameter to AppendDocument method to append entries to the same section.
24+
25+
2026
## Enhancements in Version 24.9
2127

2228
- Added digital signature methds for DOC, DOCX, XPS, or ODT documents.

‎include/aspose_words_cloud.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,10 @@
224224
#include "./aspose_words_cloud/models/replace_text_response.h"
225225
#include "./aspose_words_cloud/models/report_build_options.h"
226226
#include "./aspose_words_cloud/models/report_engine_settings.h"
227+
#include "./aspose_words_cloud/models/revision.h"
228+
#include "./aspose_words_cloud/models/revision_collection.h"
227229
#include "./aspose_words_cloud/models/revisions_modification_response.h"
230+
#include "./aspose_words_cloud/models/revisions_response.h"
228231
#include "./aspose_words_cloud/models/rtf_save_options_data.h"
229232
#include "./aspose_words_cloud/models/run.h"
230233
#include "./aspose_words_cloud/models/run_base.h"
@@ -404,6 +407,8 @@
404407
#include "./aspose_words_cloud/requests/download_file_request.h"
405408
#include "./aspose_words_cloud/requests/execute_mail_merge_request.h"
406409
#include "./aspose_words_cloud/requests/execute_mail_merge_online_request.h"
410+
#include "./aspose_words_cloud/requests/get_all_revisions_request.h"
411+
#include "./aspose_words_cloud/requests/get_all_revisions_online_request.h"
407412
#include "./aspose_words_cloud/requests/get_available_fonts_request.h"
408413
#include "./aspose_words_cloud/requests/get_bookmark_by_name_request.h"
409414
#include "./aspose_words_cloud/requests/get_bookmark_by_name_online_request.h"
@@ -749,6 +754,8 @@
749754
#include "./aspose_words_cloud/responses/download_file_response.h"
750755
#include "./aspose_words_cloud/responses/execute_mail_merge_response.h"
751756
#include "./aspose_words_cloud/responses/execute_mail_merge_online_response.h"
757+
#include "./aspose_words_cloud/responses/get_all_revisions_response.h"
758+
#include "./aspose_words_cloud/responses/get_all_revisions_online_response.h"
752759
#include "./aspose_words_cloud/responses/get_available_fonts_response.h"
753760
#include "./aspose_words_cloud/responses/get_bookmark_by_name_response.h"
754761
#include "./aspose_words_cloud/responses/get_bookmark_by_name_online_response.h"

‎include/aspose_words_cloud/api/words_api.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@
209209
#include "aspose_words_cloud/responses/execute_mail_merge_response.h"
210210
#include "aspose_words_cloud/requests/execute_mail_merge_online_request.h"
211211
#include "aspose_words_cloud/responses/execute_mail_merge_online_response.h"
212+
#include "aspose_words_cloud/requests/get_all_revisions_request.h"
213+
#include "aspose_words_cloud/responses/get_all_revisions_response.h"
214+
#include "aspose_words_cloud/requests/get_all_revisions_online_request.h"
215+
#include "aspose_words_cloud/responses/get_all_revisions_online_response.h"
212216
#include "aspose_words_cloud/requests/get_available_fonts_request.h"
213217
#include "aspose_words_cloud/responses/get_available_fonts_response.h"
214218
#include "aspose_words_cloud/requests/get_bookmark_by_name_request.h"
@@ -2023,6 +2027,28 @@ namespace aspose::words::cloud::api {
20232027
/// <param name="documentFileName">The filename of the output document, that will be used when the resulting document has a dynamic field {filename}. If it is not set, the "template" will be used instead.</param>
20242028
ASPOSE_WORDS_CLOUD_EXPORT std::shared_ptr< std::istream > executeMailMergeOnline(std::shared_ptr<aspose::words::cloud::requests::ExecuteMailMergeOnlineRequest> request);
20252029

2030+
/// <summary>
2031+
/// Get all information about revisions.
2032+
/// </summary>
2033+
/// <param name="name">The filename of the input document.</param>
2034+
/// <param name="folder">Original document folder.</param>
2035+
/// <param name="storage">Original document storage.</param>
2036+
/// <param name="loadEncoding">Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.</param>
2037+
/// <param name="password">Password of protected Word document. Use the parameter to pass a password via SDK. SDK encrypts it automatically. We don't recommend to use the parameter to pass a plain password for direct call of API.</param>
2038+
/// <param name="encryptedPassword">Password of protected Word document. Use the parameter to pass an encrypted password for direct calls of API. See SDK code for encyption details.</param>
2039+
/// <param name="openTypeSupport">The value indicates whether OpenType support is on.</param>
2040+
ASPOSE_WORDS_CLOUD_EXPORT std::shared_ptr< aspose::words::cloud::models::RevisionsResponse > getAllRevisions(std::shared_ptr<aspose::words::cloud::requests::GetAllRevisionsRequest> request);
2041+
2042+
/// <summary>
2043+
/// Get all information about revisions.
2044+
/// </summary>
2045+
/// <param name="document">The document.</param>
2046+
/// <param name="loadEncoding">Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.</param>
2047+
/// <param name="password">Password of protected Word document. Use the parameter to pass a password via SDK. SDK encrypts it automatically. We don't recommend to use the parameter to pass a plain password for direct call of API.</param>
2048+
/// <param name="encryptedPassword">Password of protected Word document. Use the parameter to pass an encrypted password for direct calls of API. See SDK code for encyption details.</param>
2049+
/// <param name="openTypeSupport">The value indicates whether OpenType support is on.</param>
2050+
ASPOSE_WORDS_CLOUD_EXPORT std::shared_ptr< aspose::words::cloud::models::RevisionsResponse > getAllRevisionsOnline(std::shared_ptr<aspose::words::cloud::requests::GetAllRevisionsOnlineRequest> request);
2051+
20262052
/// <summary>
20272053
/// Reads available fonts from the document.
20282054
/// </summary>

‎include/aspose_words_cloud/models/document_entry_list.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,17 @@ namespace aspose::words::cloud::models {
4444

4545
void abstractBaseEntryList() override {}
4646

47+
/// <summary>
48+
/// Gets or sets a value indicating whether to append all documents to the same section.
49+
/// </summary>
50+
ASPOSE_WORDS_CLOUD_EXPORT virtual std::shared_ptr< bool > getAppendAllEntriesToOneSection() const;
51+
52+
/// <summary>
53+
/// Gets or sets a value indicating whether to append all documents to the same section.
54+
/// </summary>
55+
ASPOSE_WORDS_CLOUD_EXPORT virtual void setAppendAllEntriesToOneSection(std::shared_ptr< bool > value);
56+
57+
4758
/// <summary>
4859
/// Gets or sets a value indicating whether to apply headers and footers from base document to appending documents. The default value is true.
4960
/// </summary>
@@ -67,6 +78,7 @@ namespace aspose::words::cloud::models {
6778

6879

6980
protected:
81+
std::shared_ptr< bool > m_AppendAllEntriesToOneSection;
7082
std::shared_ptr< bool > m_ApplyBaseDocumentHeadersAndFootersToAppendingDocuments;
7183
std::shared_ptr< std::vector<std::shared_ptr<aspose::words::cloud::models::DocumentEntry>> > m_DocumentEntries;
7284
};

‎include/aspose_words_cloud/models/revision.h‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
/** --------------------------------------------------------------------------------------------------------------------
2+
* <copyright company="Aspose" file="revision.h">
3+
* Copyright (c) 2024 Aspose.Words for Cloud
4+
* </copyright>
5+
* <summary>
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in all
14+
* copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
* SOFTWARE.
23+
* </summary>
24+
-------------------------------------------------------------------------------------------------------------------- **/
25+
26+
#pragma once
27+
#include "model_base.h"
28+
29+
namespace aspose::words::cloud::models {
30+
/// <summary>
31+
/// Revision Dto.
32+
/// </summary>
33+
class Revision : public ModelBase
34+
{
35+
public:
36+
37+
ASPOSE_WORDS_CLOUD_EXPORT virtual ~Revision() = default;
38+
ASPOSE_WORDS_CLOUD_EXPORT virtual void toJson(void* jsonIfc) const override;
39+
ASPOSE_WORDS_CLOUD_EXPORT virtual void fromJson(const void* jsonIfc) override;
40+
ASPOSE_WORDS_CLOUD_EXPORT virtual void getFileReferences(std::vector< FileReference* >& result) override;
41+
ASPOSE_WORDS_CLOUD_EXPORT virtual void validate() override;
42+
43+
44+
/// <summary>
45+
/// Gets or sets the revision author.
46+
/// </summary>
47+
ASPOSE_WORDS_CLOUD_EXPORT virtual std::shared_ptr< std::wstring > getRevisionAuthor() const;
48+
49+
/// <summary>
50+
/// Gets or sets the revision author.
51+
/// </summary>
52+
ASPOSE_WORDS_CLOUD_EXPORT virtual void setRevisionAuthor(std::shared_ptr< std::wstring > value);
53+
54+
55+
/// <summary>
56+
/// Gets or sets the revision date time.
57+
/// </summary>
58+
ASPOSE_WORDS_CLOUD_EXPORT virtual std::shared_ptr< std::wstring > getRevisionDateTime() const;
59+
60+
/// <summary>
61+
/// Gets or sets the revision date time.
62+
/// </summary>
63+
ASPOSE_WORDS_CLOUD_EXPORT virtual void setRevisionDateTime(std::shared_ptr< std::wstring > value);
64+
65+
66+
/// <summary>
67+
/// Gets or sets the revision text.
68+
/// </summary>
69+
ASPOSE_WORDS_CLOUD_EXPORT virtual std::shared_ptr< std::wstring > getRevisionText() const;
70+
71+
/// <summary>
72+
/// Gets or sets the revision text.
73+
/// </summary>
74+
ASPOSE_WORDS_CLOUD_EXPORT virtual void setRevisionText(std::shared_ptr< std::wstring > value);
75+
76+
77+
/// <summary>
78+
/// Gets or sets the revision type.
79+
/// </summary>
80+
ASPOSE_WORDS_CLOUD_EXPORT virtual std::shared_ptr< std::wstring > getRevisionType() const;
81+
82+
/// <summary>
83+
/// Gets or sets the revision type.
84+
/// </summary>
85+
ASPOSE_WORDS_CLOUD_EXPORT virtual void setRevisionType(std::shared_ptr< std::wstring > value);
86+
87+
88+
protected:
89+
std::shared_ptr< std::wstring > m_RevisionAuthor;
90+
std::shared_ptr< std::wstring > m_RevisionDateTime;
91+
std::shared_ptr< std::wstring > m_RevisionText;
92+
std::shared_ptr< std::wstring > m_RevisionType;
93+
};
94+
}
95+

‎include/aspose_words_cloud/models/revision_collection.h‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/** --------------------------------------------------------------------------------------------------------------------
2+
* <copyright company="Aspose" file="revision_collection.h">
3+
* Copyright (c) 2024 Aspose.Words for Cloud
4+
* </copyright>
5+
* <summary>
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in all
14+
* copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
* SOFTWARE.
23+
* </summary>
24+
-------------------------------------------------------------------------------------------------------------------- **/
25+
26+
#pragma once
27+
#include "model_base.h"
28+
#include "revision.h"
29+
30+
namespace aspose::words::cloud::models {
31+
/// <summary>
32+
/// RevisionCollection DTO.
33+
/// </summary>
34+
class RevisionCollection : public ModelBase
35+
{
36+
public:
37+
38+
ASPOSE_WORDS_CLOUD_EXPORT virtual ~RevisionCollection() = default;
39+
ASPOSE_WORDS_CLOUD_EXPORT virtual void toJson(void* jsonIfc) const override;
40+
ASPOSE_WORDS_CLOUD_EXPORT virtual void fromJson(const void* jsonIfc) override;
41+
ASPOSE_WORDS_CLOUD_EXPORT virtual void getFileReferences(std::vector< FileReference* >& result) override;
42+
ASPOSE_WORDS_CLOUD_EXPORT virtual void validate() override;
43+
44+
45+
/// <summary>
46+
/// Gets or sets the revisions.
47+
/// </summary>
48+
ASPOSE_WORDS_CLOUD_EXPORT virtual std::shared_ptr< std::vector<std::shared_ptr<aspose::words::cloud::models::Revision>> > getRevisions() const;
49+
50+
/// <summary>
51+
/// Gets or sets the revisions.
52+
/// </summary>
53+
ASPOSE_WORDS_CLOUD_EXPORT virtual void setRevisions(std::shared_ptr< std::vector<std::shared_ptr<aspose::words::cloud::models::Revision>> > value);
54+
55+
56+
protected:
57+
std::shared_ptr< std::vector<std::shared_ptr<aspose::words::cloud::models::Revision>> > m_Revisions;
58+
};
59+
}
60+

‎include/aspose_words_cloud/models/revisions_response.h‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/** --------------------------------------------------------------------------------------------------------------------
2+
* <copyright company="Aspose" file="revisions_response.h">
3+
* Copyright (c) 2024 Aspose.Words for Cloud
4+
* </copyright>
5+
* <summary>
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in all
14+
* copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
* SOFTWARE.
23+
* </summary>
24+
-------------------------------------------------------------------------------------------------------------------- **/
25+
26+
#pragma once
27+
#include "model_base.h"
28+
#include "revision_collection.h"
29+
#include "words_response.h"
30+
31+
namespace aspose::words::cloud::models {
32+
/// <summary>
33+
/// The revision response.
34+
/// </summary>
35+
class RevisionsResponse : public WordsResponse
36+
{
37+
public:
38+
39+
ASPOSE_WORDS_CLOUD_EXPORT virtual ~RevisionsResponse() = default;
40+
ASPOSE_WORDS_CLOUD_EXPORT virtual void toJson(void* jsonIfc) const override;
41+
ASPOSE_WORDS_CLOUD_EXPORT virtual void fromJson(const void* jsonIfc) override;
42+
ASPOSE_WORDS_CLOUD_EXPORT virtual void getFileReferences(std::vector< FileReference* >& result) override;
43+
ASPOSE_WORDS_CLOUD_EXPORT virtual void validate() override;
44+
45+
46+
/// <summary>
47+
/// Gets or sets Revisions.
48+
/// </summary>
49+
ASPOSE_WORDS_CLOUD_EXPORT virtual std::shared_ptr< aspose::words::cloud::models::RevisionCollection > getRevisions() const;
50+
51+
/// <summary>
52+
/// Gets or sets Revisions.
53+
/// </summary>
54+
ASPOSE_WORDS_CLOUD_EXPORT virtual void setRevisions(std::shared_ptr< aspose::words::cloud::models::RevisionCollection > value);
55+
56+
57+
protected:
58+
std::shared_ptr< aspose::words::cloud::models::RevisionCollection > m_Revisions;
59+
};
60+
}
61+

‎include/aspose_words_cloud/requests/get_all_revisions_online_request.h‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/** --------------------------------------------------------------------------------------------------------------------
2+
* <copyright company="Aspose" file="get_all_revisions_online_request.h">
3+
* Copyright (c) 2024 Aspose.Words for Cloud
4+
* </copyright>
5+
* <summary>
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in all
14+
* copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
* SOFTWARE.
23+
* </summary>
24+
-------------------------------------------------------------------------------------------------------------------- **/
25+
26+
#pragma once
27+
#include "./request_model_base.h"
28+
29+
namespace aspose::words::cloud::requests {
30+
class GetAllRevisionsOnlineRequest : public RequestModelBase {
31+
public:
32+
ASPOSE_WORDS_CLOUD_EXPORT GetAllRevisionsOnlineRequest(
33+
const std::shared_ptr< std::istream > document,
34+
const std::shared_ptr< std::wstring > loadEncoding = nullptr,
35+
const std::shared_ptr< std::wstring > password = nullptr,
36+
const std::shared_ptr< std::wstring > encryptedPassword = nullptr,
37+
const std::shared_ptr< bool > openTypeSupport = nullptr
38+
);
39+
40+
ASPOSE_WORDS_CLOUD_EXPORT const std::shared_ptr< std::istream > getDocument() const;
41+
ASPOSE_WORDS_CLOUD_EXPORT const std::shared_ptr< std::wstring > getLoadEncoding() const;
42+
ASPOSE_WORDS_CLOUD_EXPORT const std::shared_ptr< std::wstring > getPassword() const;
43+
ASPOSE_WORDS_CLOUD_EXPORT const std::shared_ptr< std::wstring > getEncryptedPassword() const;
44+
ASPOSE_WORDS_CLOUD_EXPORT const std::shared_ptr< bool > getOpenTypeSupport() const;
45+
46+
ASPOSE_WORDS_CLOUD_EXPORT virtual std::shared_ptr< aspose::words::cloud::HttpRequestData > createHttpRequest(ApiClient* apiClient) const override;
47+
ASPOSE_WORDS_CLOUD_EXPORT virtual std::shared_ptr< aspose::words::cloud::responses::ResponseModelBase > createResponse() const override;
48+
49+
private:
50+
const std::shared_ptr< std::istream > m_Document;
51+
const std::shared_ptr< std::wstring > m_LoadEncoding;
52+
const std::shared_ptr< std::wstring > m_Password;
53+
const std::shared_ptr< std::wstring > m_EncryptedPassword;
54+
const std::shared_ptr< bool > m_OpenTypeSupport;
55+
};
56+
}

0 commit comments

Comments
 (0)