groupdocs_conversion_cloud 22.10 → 23.4

data/lib/groupdocs_conversion_cloud/models/{html_load_options.rb → web_load_options.rb}

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
- # <copyright company="Aspose Pty Ltd" file="html_load_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ # <copyright company="Aspose Pty Ltd" file="web_load_options.rb">
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -29,7 +29,7 @@ require 'date'
 
 module GroupDocsConversionCloud
   # Html document load options
-  class HtmlLoadOptions
+  class WebLoadOptions
 
     # The format of input file, (\"docx\", for example). This field must be filled with correct input file format when using ConvertDirect method, which accept input file as binary stream, and, because of that, API can correctly handle LoadOptions. In regular conversion, the input file format taken from the input file name and this field ignored.
     attr_accessor :format

data/lib/groupdocs_conversion_cloud/models/webp_convert_options.rb

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
  # <copyright company="Aspose Pty Ltd" file="webp_convert_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired image width after conversion
     attr_accessor :width
 
@@ -61,9 +64,6 @@ module GroupDocsConversionCloud
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Adjust image brightness
     attr_accessor :brightness
 
@@ -106,6 +106,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'horizontal_resolution' => :'HorizontalResolution',
@@ -113,7 +114,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'Grayscale',
         :'rotate_angle' => :'RotateAngle',
         :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Brightness',
         :'contrast' => :'Contrast',
         :'gamma' => :'Gamma',
@@ -128,6 +128,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'horizontal_resolution' => :'Integer',
@@ -135,7 +136,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'BOOLEAN',
         :'rotate_angle' => :'Integer',
         :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Integer',
         :'contrast' => :'Integer',
         :'gamma' => :'Float',
@@ -166,6 +166,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -194,10 +198,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'Brightness')
         self.brightness = attributes[:'Brightness']
       end
@@ -327,6 +327,7 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           horizontal_resolution == other.horizontal_resolution &&
@@ -334,7 +335,6 @@ module GroupDocsConversionCloud
           grayscale == other.grayscale &&
           rotate_angle == other.rotate_angle &&
           use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options &&
           brightness == other.brightness &&
           contrast == other.contrast &&
           gamma == other.gamma &&
@@ -351,7 +351,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, watermark_options, brightness, contrast, gamma, flip_mode, lossless].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode, lossless].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/webp_load_options.rb

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
  # <copyright company="Aspose Pty Ltd" file="webp_load_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/groupdocs_conversion_cloud/models/wmf_convert_options.rb

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
  # <copyright company="Aspose Pty Ltd" file="wmf_convert_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired image width after conversion
     attr_accessor :width
 
@@ -61,9 +64,6 @@ module GroupDocsConversionCloud
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Adjust image brightness
     attr_accessor :brightness
 
@@ -103,6 +103,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'horizontal_resolution' => :'HorizontalResolution',
@@ -110,7 +111,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'Grayscale',
         :'rotate_angle' => :'RotateAngle',
         :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Brightness',
         :'contrast' => :'Contrast',
         :'gamma' => :'Gamma',
@@ -124,6 +124,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'horizontal_resolution' => :'Integer',
@@ -131,7 +132,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'BOOLEAN',
         :'rotate_angle' => :'Integer',
         :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Integer',
         :'contrast' => :'Integer',
         :'gamma' => :'Float',
@@ -161,6 +161,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -189,10 +193,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'Brightness')
         self.brightness = attributes[:'Brightness']
       end
@@ -313,6 +313,7 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           horizontal_resolution == other.horizontal_resolution &&
@@ -320,7 +321,6 @@ module GroupDocsConversionCloud
           grayscale == other.grayscale &&
           rotate_angle == other.rotate_angle &&
           use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options &&
           brightness == other.brightness &&
           contrast == other.contrast &&
           gamma == other.gamma &&
@@ -336,7 +336,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, watermark_options, brightness, contrast, gamma, flip_mode].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/wmf_load_options.rb

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
  # <copyright company="Aspose Pty Ltd" file="wmf_load_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/groupdocs_conversion_cloud/models/word_processing_convert_options.rb

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
  # <copyright company="Aspose Pty Ltd" file="word_processing_convert_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired page width after conversion
     attr_accessor :width
 
@@ -55,11 +58,14 @@ module GroupDocsConversionCloud
     # Specifies the zoom level in percentage. Default is 100. Default zoom is supported till Microsoft Word 2010. Starting from Microsoft Word 2013 default zoom is no longer set to document, instead it appears to use the zoom factor of the last document that was opened.
     attr_accessor :zoom
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Recognition mode when converting from pdf
     attr_accessor :pdf_recognition_mode
+
+    # Page size
+    attr_accessor :page_size
+
+    # Specifies page orientation
+    attr_accessor :page_orientation
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -88,13 +94,15 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'dpi' => :'Dpi',
         :'password' => :'Password',
         :'zoom' => :'Zoom',
-        :'watermark_options' => :'WatermarkOptions',
-        :'pdf_recognition_mode' => :'PdfRecognitionMode'
+        :'pdf_recognition_mode' => :'PdfRecognitionMode',
+        :'page_size' => :'PageSize',
+        :'page_orientation' => :'PageOrientation'
       }
     end
 
@@ -104,13 +112,15 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'dpi' => :'Float',
         :'password' => :'String',
         :'zoom' => :'Integer',
-        :'watermark_options' => :'WatermarkOptions',
-        :'pdf_recognition_mode' => :'String'
+        :'pdf_recognition_mode' => :'String',
+        :'page_size' => :'String',
+        :'page_orientation' => :'String'
       }
     end
 
@@ -136,6 +146,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -156,14 +170,18 @@ module GroupDocsConversionCloud
         self.zoom = attributes[:'Zoom']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'PdfRecognitionMode')
         self.pdf_recognition_mode = attributes[:'PdfRecognitionMode']
       end
 
+      if attributes.key?(:'PageSize')
+        self.page_size = attributes[:'PageSize']
+      end
+
+      if attributes.key?(:'PageOrientation')
+        self.page_orientation = attributes[:'PageOrientation']
+      end
+
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -198,6 +216,14 @@ module GroupDocsConversionCloud
         invalid_properties.push("invalid value for 'pdf_recognition_mode', pdf_recognition_mode cannot be nil.")
       end
 
+      if @page_size.nil?
+        invalid_properties.push("invalid value for 'page_size', page_size cannot be nil.")
+      end
+
+      if @page_orientation.nil?
+        invalid_properties.push("invalid value for 'page_orientation', page_orientation cannot be nil.")
+      end
+
       return invalid_properties
     end
 
@@ -213,6 +239,12 @@ module GroupDocsConversionCloud
       return false if @pdf_recognition_mode.nil?
       pdf_recognition_mode_validator = EnumAttributeValidator.new('String', ["Textbox", "Flow"])
       return false unless pdf_recognition_mode_validator.valid?(@pdf_recognition_mode)
+      return false if @page_size.nil?
+      page_size_validator = EnumAttributeValidator.new('String', ["Default", "A3", "Statement", "Quarto", "Paper11x17", "Paper10x14", "Letter", "Legal", "Ledger", "Folio", "Executive", "EnvelopeDL", "Custom", "B5", "B4", "A5", "A4", "Tabloid"])
+      return false unless page_size_validator.valid?(@page_size)
+      return false if @page_orientation.nil?
+      page_orientation_validator = EnumAttributeValidator.new('String', ["Default", "Landscape", "Portrait"])
+      return false unless page_orientation_validator.valid?(@page_orientation)
       return true
     end
 
@@ -230,6 +262,34 @@ module GroupDocsConversionCloud
       end
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] page_size Object to be assigned
+    def page_size=(page_size)
+      validator = EnumAttributeValidator.new('String', ["Default", "A3", "Statement", "Quarto", "Paper11x17", "Paper10x14", "Letter", "Legal", "Ledger", "Folio", "Executive", "EnvelopeDL", "Custom", "B5", "B4", "A5", "A4", "Tabloid"])
+      if page_size.to_i == 0
+        unless validator.valid?(page_size)
+          raise ArgumentError, "invalid value for 'page_size', must be one of #{validator.allowable_values}."
+        end
+        @page_size = page_size
+      else
+        @page_size = validator.allowable_values[page_size.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] page_orientation Object to be assigned
+    def page_orientation=(page_orientation)
+      validator = EnumAttributeValidator.new('String', ["Default", "Landscape", "Portrait"])
+      if page_orientation.to_i == 0
+        unless validator.valid?(page_orientation)
+          raise ArgumentError, "invalid value for 'page_orientation', must be one of #{validator.allowable_values}."
+        end
+        @page_orientation = page_orientation
+      else
+        @page_orientation = validator.allowable_values[page_orientation.to_i]
+      end
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(other)
@@ -238,13 +298,15 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           dpi == other.dpi &&
           password == other.password &&
           zoom == other.zoom &&
-          watermark_options == other.watermark_options &&
-          pdf_recognition_mode == other.pdf_recognition_mode
+          pdf_recognition_mode == other.pdf_recognition_mode &&
+          page_size == other.page_size &&
+          page_orientation == other.page_orientation
     end
 
     # @see the `==` method
@@ -256,7 +318,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, dpi, password, zoom, watermark_options, pdf_recognition_mode].hash
+      [from_page, pages_count, pages, watermark_options, width, height, dpi, password, zoom, pdf_recognition_mode, page_size, page_orientation].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/word_processing_load_options.rb

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
  # <copyright company="Aspose Pty Ltd" file="word_processing_load_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/groupdocs_conversion_cloud/models/xls2003_convert_options.rb

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
  # <copyright company="Aspose Pty Ltd" file="xls2003_convert_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Set this property if you want to protect the converted document with a password
     attr_accessor :password
 
@@ -49,19 +52,16 @@ module GroupDocsConversionCloud
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'password' => :'Password',
         :'zoom' => :'Zoom',
-        :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions'
+        :'use_pdf' => :'UsePdf'
       }
     end
 
@@ -71,10 +71,10 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'password' => :'String',
         :'zoom' => :'Integer',
-        :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions'
+        :'use_pdf' => :'BOOLEAN'
       }
     end
 
@@ -100,6 +100,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Password')
         self.password = attributes[:'Password']
       end
@@ -112,10 +116,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -159,10 +159,10 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           password == other.password &&
           zoom == other.zoom &&
-          use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options
+          use_pdf == other.use_pdf
     end
 
     # @see the `==` method
@@ -174,7 +174,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, password, zoom, use_pdf, watermark_options].hash
+      [from_page, pages_count, pages, watermark_options, password, zoom, use_pdf].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/xls2003_load_options.rb

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
  # <copyright company="Aspose Pty Ltd" file="xls2003_load_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/groupdocs_conversion_cloud/models/xls_convert_options.rb

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
  # <copyright company="Aspose Pty Ltd" file="xls_convert_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Set this property if you want to protect the converted document with a password
     attr_accessor :password
 
@@ -49,19 +52,16 @@ module GroupDocsConversionCloud
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'password' => :'Password',
         :'zoom' => :'Zoom',
-        :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions'
+        :'use_pdf' => :'UsePdf'
       }
     end
 
@@ -71,10 +71,10 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'password' => :'String',
         :'zoom' => :'Integer',
-        :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions'
+        :'use_pdf' => :'BOOLEAN'
       }
     end
 
@@ -100,6 +100,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Password')
         self.password = attributes[:'Password']
       end
@@ -112,10 +116,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -159,10 +159,10 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           password == other.password &&
           zoom == other.zoom &&
-          use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options
+          use_pdf == other.use_pdf
     end
 
     # @see the `==` method
@@ -174,7 +174,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, password, zoom, use_pdf, watermark_options].hash
+      [from_page, pages_count, pages, watermark_options, password, zoom, use_pdf].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/xls_load_options.rb

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
  # <copyright company="Aspose Pty Ltd" file="xls_load_options.rb">
- #   Copyright (c) 2003-2022 Aspose Pty Ltd
+ #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy