Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

README.md

@@ -17,6 +17,12 @@ Feel free to explore the [Developer's Guide](https://docs.aspose.cloud/display/w
 - Read & write access to Document Object Model.
 - Thread safe
 
+## Enhancements in Version 25.6
+
+- Added support for SVG images format in Watermark API.
+- Added 'RemoveJavaScriptFromLinks' property for HtmlSaveOptionsData class.
+
+
 ## Enhancements in Version 25.5
 
 - Added data models support for classes 'CommentRangeStart', 'CommentRangeEnd'.

include/aspose_words_cloud/models/html_save_options_data.h

@@ -520,6 +520,23 @@ namespace aspose::words::cloud::models {
         ASPOSE_WORDS_CLOUD_EXPORT virtual void setPrettyFormat(std::shared_ptr< bool > value);
 
 
+        /// <summary>
+        /// Gets or sets the flag that indicates whether JavaScript will be removed from links.
+        /// Default is false.
+        /// If this option is enabled, all links containing JavaScript (e.g., links with "javascript:" in the href attribute)
+        /// will be replaced with "javascript:void(0)". This can help prevent potential security risks, such as XSS attacks.
+        /// </summary>
+        ASPOSE_WORDS_CLOUD_EXPORT virtual std::shared_ptr< bool > getRemoveJavaScriptFromLinks() const;
+
+        /// <summary>
+        /// Gets or sets the flag that indicates whether JavaScript will be removed from links.
+        /// Default is false.
+        /// If this option is enabled, all links containing JavaScript (e.g., links with "javascript:" in the href attribute)
+        /// will be replaced with "javascript:void(0)". This can help prevent potential security risks, such as XSS attacks.
+        /// </summary>
+        ASPOSE_WORDS_CLOUD_EXPORT virtual void setRemoveJavaScriptFromLinks(std::shared_ptr< bool > value);
+
+
         /// <summary>
         /// Gets or sets the flag that indicates whether backslash characters should be replaced with yen signs.
         /// Default value is false.
@@ -637,6 +654,7 @@ namespace aspose::words::cloud::models {
         std::shared_ptr< aspose::words::cloud::models::HtmlSaveOptionsData::MetafileFormat > m_MetafileFormat;
         std::shared_ptr< aspose::words::cloud::models::HtmlSaveOptionsData::OfficeMathOutputMode > m_OfficeMathOutputMode;
         std::shared_ptr< bool > m_PrettyFormat;
+        std::shared_ptr< bool > m_RemoveJavaScriptFromLinks;
         std::shared_ptr< bool > m_ReplaceBackslashWithYenSign;
         std::shared_ptr< bool > m_ResolveFontNames;
         std::shared_ptr< std::wstring > m_ResourceFolder;

src/api_client.cpp

@@ -168,7 +168,7 @@ namespace aspose::words::cloud {
 
         ::httplib::Headers headers;
         headers.emplace("Authorization", m_AccessToken);
-        headers.emplace("x-aspose-client-version", "25.5");
+        headers.emplace("x-aspose-client-version", "25.6");
         headers.emplace("x-aspose-client", "C++ SDK");
 
         for (auto& pair : httpRequest->getHeaders()) {

src/models.cpp

@@ -11834,6 +11834,9 @@ namespace aspose::words::cloud::models {
         if (this->m_PrettyFormat) {
             json["PrettyFormat"] = *(this->m_PrettyFormat);
         }
+        if (this->m_RemoveJavaScriptFromLinks) {
+            json["RemoveJavaScriptFromLinks"] = *(this->m_RemoveJavaScriptFromLinks);
+        }
         if (this->m_ReplaceBackslashWithYenSign) {
             json["ReplaceBackslashWithYenSign"] = *(this->m_ReplaceBackslashWithYenSign);
         }
@@ -12026,6 +12029,11 @@ namespace aspose::words::cloud::models {
                 json["PrettyFormat"].get< bool >()
             );
         }
+        if (json.contains("RemoveJavaScriptFromLinks") && !json["RemoveJavaScriptFromLinks"].is_null()) {
+            this->m_RemoveJavaScriptFromLinks = std::make_shared< bool >(
+                json["RemoveJavaScriptFromLinks"].get< bool >()
+            );
+        }
         if (json.contains("ReplaceBackslashWithYenSign") && !json["ReplaceBackslashWithYenSign"].is_null()) {
             this->m_ReplaceBackslashWithYenSign = std::make_shared< bool >(
                 json["ReplaceBackslashWithYenSign"].get< bool >()
@@ -12435,6 +12443,17 @@ namespace aspose::words::cloud::models {
     }
 
 
+    std::shared_ptr< bool > HtmlSaveOptionsData::getRemoveJavaScriptFromLinks() const
+    {
+        return this->m_RemoveJavaScriptFromLinks;
+    }
+
+    void HtmlSaveOptionsData::setRemoveJavaScriptFromLinks(std::shared_ptr< bool > value)
+    {
+        this->m_RemoveJavaScriptFromLinks = value;
+    }
+
+
     std::shared_ptr< bool > HtmlSaveOptionsData::getReplaceBackslashWithYenSign() const
     {
         return this->m_ReplaceBackslashWithYenSign;