Merge pull request #2152 from OfficeDev/main

[Admin] Publish
OfficeDev · Dec 5, 2024 · dac0303 · dac0303
2 parents 5a71564 + 2f61cf2
commit dac0303
Show file tree

Hide file tree

Showing 20 changed files with 78 additions and 43 deletions.
diff --git a/docs/docs-ref-autogen/word_1_6/word/word.document.yml b/docs/docs-ref-autogen/word_1_6/word/word.document.yml
@@ -661,10 +661,10 @@ methods:
       return:
         type: '<xref uid="word!Word.StyleCollection:class" />'
         description: ''
-  - name: importStylesFromJson(stylesJson)
+  - name: 'importStylesFromJson(stylesJson, importedStylesConflictBehavior)'
     uid: 'word!Word.Document#importStylesFromJson:member(1)'
     package: word!
-    fullName: importStylesFromJson(stylesJson)
+    fullName: 'importStylesFromJson(stylesJson, importedStylesConflictBehavior)'
     summary: Import styles from a JSON-formatted string.
     remarks: >-
       \[ [API set: WordApi 1.6](/javascript/api/requirement-sets/word/word-api-requirement-sets) \]
@@ -696,11 +696,18 @@ methods:
     isPreview: false
     isDeprecated: false
     syntax:
-      content: 'importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;'
+      content: >-
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior):
+        OfficeExtension.ClientResult<string[]>;
       parameters:
         - id: stylesJson
           description: Required. A JSON-formatted string representing the styles.
           type: string
+        - id: importedStylesConflictBehavior
+          description: >-
+            Optional. Specifies how to handle any imported styles with the same name as existing styles in the current
+            document.
+          type: Word.ImportedStylesConflictBehavior
       return:
         type: '<xref uid="office!OfficeExtension.ClientResult:class" />&lt;string[]&gt;'
         description: ''

diff --git a/docs/docs-ref-autogen/word_1_7/word/word.document.yml b/docs/docs-ref-autogen/word_1_7/word/word.document.yml
@@ -678,10 +678,10 @@ methods:
       return:
         type: '<xref uid="word!Word.StyleCollection:class" />'
         description: ''
-  - name: importStylesFromJson(stylesJson)
+  - name: 'importStylesFromJson(stylesJson, importedStylesConflictBehavior)'
     uid: 'word!Word.Document#importStylesFromJson:member(1)'
     package: word!
-    fullName: importStylesFromJson(stylesJson)
+    fullName: 'importStylesFromJson(stylesJson, importedStylesConflictBehavior)'
     summary: Import styles from a JSON-formatted string.
     remarks: >-
       \[ [API set: WordApi 1.6](/javascript/api/requirement-sets/word/word-api-requirement-sets) \]
@@ -713,11 +713,18 @@ methods:
     isPreview: false
     isDeprecated: false
     syntax:
-      content: 'importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;'
+      content: >-
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior):
+        OfficeExtension.ClientResult<string[]>;
       parameters:
         - id: stylesJson
           description: Required. A JSON-formatted string representing the styles.
           type: string
+        - id: importedStylesConflictBehavior
+          description: >-
+            Optional. Specifies how to handle any imported styles with the same name as existing styles in the current
+            document.
+          type: Word.ImportedStylesConflictBehavior
       return:
         type: '<xref uid="office!OfficeExtension.ClientResult:class" />&lt;string[]&gt;'
         description: ''

diff --git a/docs/docs-ref-autogen/word_1_8/word/word.document.yml b/docs/docs-ref-autogen/word_1_8/word/word.document.yml
@@ -678,10 +678,10 @@ methods:
       return:
         type: '<xref uid="word!Word.StyleCollection:class" />'
         description: ''
-  - name: importStylesFromJson(stylesJson)
+  - name: 'importStylesFromJson(stylesJson, importedStylesConflictBehavior)'
     uid: 'word!Word.Document#importStylesFromJson:member(1)'
     package: word!
-    fullName: importStylesFromJson(stylesJson)
+    fullName: 'importStylesFromJson(stylesJson, importedStylesConflictBehavior)'
     summary: Import styles from a JSON-formatted string.
     remarks: >-
       \[ [API set: WordApi 1.6](/javascript/api/requirement-sets/word/word-api-requirement-sets) \]
@@ -713,11 +713,18 @@ methods:
     isPreview: false
     isDeprecated: false
     syntax:
-      content: 'importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;'
+      content: >-
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior):
+        OfficeExtension.ClientResult<string[]>;
       parameters:
         - id: stylesJson
           description: Required. A JSON-formatted string representing the styles.
           type: string
+        - id: importedStylesConflictBehavior
+          description: >-
+            Optional. Specifies how to handle any imported styles with the same name as existing styles in the current
+            document.
+          type: Word.ImportedStylesConflictBehavior
       return:
         type: '<xref uid="office!OfficeExtension.ClientResult:class" />&lt;string[]&gt;'
         description: ''

diff --git a/docs/docs-ref-autogen/word_1_9/word/word.document.yml b/docs/docs-ref-autogen/word_1_9/word/word.document.yml
@@ -678,10 +678,10 @@ methods:
       return:
         type: '<xref uid="word!Word.StyleCollection:class" />'
         description: ''
-  - name: importStylesFromJson(stylesJson)
+  - name: 'importStylesFromJson(stylesJson, importedStylesConflictBehavior)'
     uid: 'word!Word.Document#importStylesFromJson:member(1)'
     package: word!
-    fullName: importStylesFromJson(stylesJson)
+    fullName: 'importStylesFromJson(stylesJson, importedStylesConflictBehavior)'
     summary: Import styles from a JSON-formatted string.
     remarks: >-
       \[ [API set: WordApi 1.6](/javascript/api/requirement-sets/word/word-api-requirement-sets) \]
@@ -713,11 +713,18 @@ methods:
     isPreview: false
     isDeprecated: false
     syntax:
-      content: 'importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;'
+      content: >-
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior):
+        OfficeExtension.ClientResult<string[]>;
       parameters:
         - id: stylesJson
           description: Required. A JSON-formatted string representing the styles.
           type: string
+        - id: importedStylesConflictBehavior
+          description: >-
+            Optional. Specifies how to handle any imported styles with the same name as existing styles in the current
+            document.
+          type: Word.ImportedStylesConflictBehavior
       return:
         type: '<xref uid="office!OfficeExtension.ClientResult:class" />&lt;string[]&gt;'
         description: ''

diff --git a/docs/docs-ref-autogen/word_online/word/word.document.yml b/docs/docs-ref-autogen/word_online/word/word.document.yml
@@ -678,10 +678,10 @@ methods:
       return:
         type: '<xref uid="word!Word.StyleCollection:class" />'
         description: ''
-  - name: importStylesFromJson(stylesJson)
+  - name: 'importStylesFromJson(stylesJson, importedStylesConflictBehavior)'
     uid: 'word!Word.Document#importStylesFromJson:member(1)'
     package: word!
-    fullName: importStylesFromJson(stylesJson)
+    fullName: 'importStylesFromJson(stylesJson, importedStylesConflictBehavior)'
     summary: Import styles from a JSON-formatted string.
     remarks: >-
       \[ [API set: WordApi 1.6](/javascript/api/requirement-sets/word/word-api-requirement-sets) \]
@@ -713,11 +713,18 @@ methods:
     isPreview: false
     isDeprecated: false
     syntax:
-      content: 'importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;'
+      content: >-
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior):
+        OfficeExtension.ClientResult<string[]>;
       parameters:
         - id: stylesJson
           description: Required. A JSON-formatted string representing the styles.
           type: string
+        - id: importedStylesConflictBehavior
+          description: >-
+            Optional. Specifies how to handle any imported styles with the same name as existing styles in the current
+            document.
+          type: Word.ImportedStylesConflictBehavior
       return:
         type: '<xref uid="office!OfficeExtension.ClientResult:class" />&lt;string[]&gt;'
         description: ''

diff --git a/docs/includes/word-1_6.md b/docs/includes/word-1_6.md
@@ -4,7 +4,7 @@
 |[Body](/javascript/api/word/word.body)|[getTrackedChanges()](/javascript/api/word/word.body#word-word-body-gettrackedchanges-member(1))|Gets the collection of the TrackedChange objects in the body.|
 |[ContentControl](/javascript/api/word/word.contentcontrol)|[getTrackedChanges()](/javascript/api/word/word.contentcontrol#word-word-contentcontrol-gettrackedchanges-member(1))|Gets the collection of the TrackedChange objects in the content control.|
 |[Document](/javascript/api/word/word.document)|[getParagraphByUniqueLocalId(id: string)](/javascript/api/word/word.document#word-word-document-getparagraphbyuniquelocalid-member(1))|Gets the paragraph by its unique local ID.|
-||[importStylesFromJson(stylesJson: string)](/javascript/api/word/word.document#word-word-document-importstylesfromjson-member(1))|Import styles from a JSON-formatted string.|
+||[importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior)](/javascript/api/word/word.document#word-word-document-importstylesfromjson-member(1))|Import styles from a JSON-formatted string.|
 ||[onParagraphAdded](/javascript/api/word/word.document#word-word-document-onparagraphadded-member)|Occurs when the user adds new paragraphs.|
 ||[onParagraphChanged](/javascript/api/word/word.document#word-word-document-onparagraphchanged-member)|Occurs when the user changes paragraphs.|
 ||[onParagraphDeleted](/javascript/api/word/word.document#word-word-document-onparagraphdeleted-member)|Occurs when the user deletes paragraphs.|

diff --git a/docs/includes/word-desktop-1.1.md b/docs/includes/word-desktop-1.1.md
@@ -17,7 +17,6 @@
 ||[outsideBorderType](/javascript/api/word/word.bordercollection#word-word-bordercollection-outsidebordertype-member)|Specifies the border type of the outside borders.|
 ||[outsideBorderWidth](/javascript/api/word/word.bordercollection#word-word-bordercollection-outsideborderwidth-member)|Specifies the width of the outside borders.|
 |[Document](/javascript/api/word/word.document)|[compare(filePath: string, documentCompareOptions?: Word.DocumentCompareOptions)](/javascript/api/word/word.document#word-word-document-compare-member(1))|Displays revision marks that indicate where the specified document differs from another document.|
-||[importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior)](/javascript/api/word/word.document#word-word-document-importstylesfromjson-member(1))|Import styles from a JSON-formatted string.|
 |[DocumentCompareOptions](/javascript/api/word/word.documentcompareoptions)|[addToRecentFiles](/javascript/api/word/word.documentcompareoptions#word-word-documentcompareoptions-addtorecentfiles-member)|True adds the document to the list of recently used files on the File menu.|
 ||[authorName](/javascript/api/word/word.documentcompareoptions#word-word-documentcompareoptions-authorname-member)|The reviewer name associated with the differences generated by the comparison.|
 ||[compareTarget](/javascript/api/word/word.documentcompareoptions#word-word-documentcompareoptions-comparetarget-member)|The target document for the comparison.|

diff --git a/docs/requirement-sets/common/keyboard-shortcuts-requirement-sets.md b/docs/requirement-sets/common/keyboard-shortcuts-requirement-sets.md
@@ -1,7 +1,7 @@
 ---
 title: Keyboard Shortcuts requirement sets
 description: Keyboard Shortcuts requirement set information for Office Add-ins.
-ms.date: 10/22/2024
+ms.date: 12/05/2024
 ms.topic: overview
 ms.localizationpriority: medium
 ---
@@ -14,10 +14,12 @@ Office Add-ins run across multiple versions of Office. The following table lists
 
 | Requirement set | Office on the web | Office on Windows<ul><li>Microsoft 365 subscription</li><li>retail perpetual</li></ul> | Office on Windows<ul><li>volume-licensed perpetual</li></ul> | Office on Mac | Office on iOS | Outlook on Android |
 |:-----|:-----|:-----|:-----|:-----|:-----|:-----|
-| KeyboardShortcuts 1.1 | Supported | <ul><li>Excel: Version 2111 (Build 14701.10000)</li><li>Word: Version 2408 (Build 17928.20114)</li></ul> | Not available | <ul><li>Excel: Version 16.55 (21111400)</li><li>Word: Version 16.88 (24081116)</li></ul>| Not supported | Not supported |
+| KeyboardShortcuts 1.1 | <ul><li>Excel: Supported</li><li>Word: Rollout in progress*</li></ul> | <ul><li>Excel: Version 2111 (Build 14701.10000)</li><li>Word: Version 2408 (Build 17928.20114)</li></ul> | Not available | <ul><li>Excel: Version 16.55 (21111400)</li><li>Word: Version 16.88 (24081116)</li></ul>| Not supported | Not supported |
 
 > [!NOTE]
 > The **KeyboardShortcuts 1.1** requirement set is supported only in **Excel** and **Word**.
+>
+> \* The keyboard shortcut feature is currently being rolled out to Word on the web. If you test the feature in Word on the web at this time, the shortcuts may not work if they're activated from within the add-in's task pane. We recommend to periodically check this page to find out when the feature is fully supported.
 
 ## Office versions and build numbers
 

diff --git a/generate-docs/api-extractor-inputs-word-release/word_1_5_hidden_document/word-desktop1.d.ts b/generate-docs/api-extractor-inputs-word-release/word_1_5_hidden_document/word-desktop1.d.ts
@@ -2927,9 +2927,9 @@ export declare namespace Word {
          * Note: The `importedStylesConflictBehavior` parameter was introduced in WordApiDesktop 1.1.
          *
          * @param stylesJson - Required. A JSON-formatted string representing the styles.
-         * 
+         * @param importedStylesConflictBehavior - Optional. Specifies how to handle any imported styles with the same name as existing styles in the current document.
          */
-        importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior): OfficeExtension.ClientResult<string[]>;
         /**
          * Import styles from a JSON-formatted string.
          *

diff --git a/generate-docs/api-extractor-inputs-word-release/word_1_5_hidden_document/word-desktop2.d.ts b/generate-docs/api-extractor-inputs-word-release/word_1_5_hidden_document/word-desktop2.d.ts
@@ -2858,9 +2858,9 @@ export declare namespace Word {
          * Note: The `importedStylesConflictBehavior` parameter was introduced in WordApiDesktop 1.1.
          *
          * @param stylesJson - Required. A JSON-formatted string representing the styles.
-         * 
+         * @param importedStylesConflictBehavior - Optional. Specifies how to handle any imported styles with the same name as existing styles in the current document.
          */
-        importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior): OfficeExtension.ClientResult<string[]>;
         /**
          * Import styles from a JSON-formatted string.
          *

diff --git a/generate-docs/api-extractor-inputs-word-release/word_1_5_hidden_document/word-desktop3.d.ts b/generate-docs/api-extractor-inputs-word-release/word_1_5_hidden_document/word-desktop3.d.ts
@@ -2425,9 +2425,9 @@ export declare namespace Word {
          * Note: The `importedStylesConflictBehavior` parameter was introduced in WordApiDesktop 1.1.
          *
          * @param stylesJson - Required. A JSON-formatted string representing the styles.
-         * 
+         * @param importedStylesConflictBehavior - Optional. Specifies how to handle any imported styles with the same name as existing styles in the current document.
          */
-        importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior): OfficeExtension.ClientResult<string[]>;
         /**
          * Import styles from a JSON-formatted string.
          *

diff --git a/generate-docs/api-extractor-inputs-word-release/word_1_6/word.d.ts b/generate-docs/api-extractor-inputs-word-release/word_1_6/word.d.ts
@@ -2425,9 +2425,9 @@ export declare namespace Word {
          * Note: The `importedStylesConflictBehavior` parameter was introduced in WordApiDesktop 1.1.
          *
          * @param stylesJson - Required. A JSON-formatted string representing the styles.
-         * 
+         * @param importedStylesConflictBehavior - Optional. Specifies how to handle any imported styles with the same name as existing styles in the current document.
          */
-        importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior): OfficeExtension.ClientResult<string[]>;
         /**
          * Import styles from a JSON-formatted string.
          *

diff --git a/generate-docs/api-extractor-inputs-word-release/word_1_7/word.d.ts b/generate-docs/api-extractor-inputs-word-release/word_1_7/word.d.ts
@@ -2858,9 +2858,9 @@ export declare namespace Word {
          * Note: The `importedStylesConflictBehavior` parameter was introduced in WordApiDesktop 1.1.
          *
          * @param stylesJson - Required. A JSON-formatted string representing the styles.
-         * 
+         * @param importedStylesConflictBehavior - Optional. Specifies how to handle any imported styles with the same name as existing styles in the current document.
          */
-        importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior): OfficeExtension.ClientResult<string[]>;
         /**
          * Import styles from a JSON-formatted string.
          *

diff --git a/generate-docs/api-extractor-inputs-word-release/word_1_8/word.d.ts b/generate-docs/api-extractor-inputs-word-release/word_1_8/word.d.ts
@@ -2927,9 +2927,9 @@ export declare namespace Word {
          * Note: The `importedStylesConflictBehavior` parameter was introduced in WordApiDesktop 1.1.
          *
          * @param stylesJson - Required. A JSON-formatted string representing the styles.
-         * 
+         * @param importedStylesConflictBehavior - Optional. Specifies how to handle any imported styles with the same name as existing styles in the current document.
          */
-        importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior): OfficeExtension.ClientResult<string[]>;
         /**
          * Import styles from a JSON-formatted string.
          *

diff --git a/generate-docs/api-extractor-inputs-word-release/word_1_9/word.d.ts b/generate-docs/api-extractor-inputs-word-release/word_1_9/word.d.ts
@@ -3083,9 +3083,9 @@ export declare namespace Word {
          * Note: The `importedStylesConflictBehavior` parameter was introduced in WordApiDesktop 1.1.
          *
          * @param stylesJson - Required. A JSON-formatted string representing the styles.
-         * 
+         * @param importedStylesConflictBehavior - Optional. Specifies how to handle any imported styles with the same name as existing styles in the current document.
          */
-        importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior): OfficeExtension.ClientResult<string[]>;
         /**
          * Import styles from a JSON-formatted string.
          *

diff --git a/generate-docs/api-extractor-inputs-word-release/word_online/word-online1.d.ts b/generate-docs/api-extractor-inputs-word-release/word_online/word-online1.d.ts
@@ -3083,9 +3083,9 @@ export declare namespace Word {
          * Note: The `importedStylesConflictBehavior` parameter was introduced in WordApiDesktop 1.1.
          *
          * @param stylesJson - Required. A JSON-formatted string representing the styles.
-         * 
+         * @param importedStylesConflictBehavior - Optional. Specifies how to handle any imported styles with the same name as existing styles in the current document.
          */
-        importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior): OfficeExtension.ClientResult<string[]>;
         /**
          * Import styles from a JSON-formatted string.
          *

diff --git a/generate-docs/api-extractor-inputs-word-release/word_online/word-online2.d.ts b/generate-docs/api-extractor-inputs-word-release/word_online/word-online2.d.ts
@@ -3083,9 +3083,9 @@ export declare namespace Word {
          * Note: The `importedStylesConflictBehavior` parameter was introduced in WordApiDesktop 1.1.
          *
          * @param stylesJson - Required. A JSON-formatted string representing the styles.
-         * 
+         * @param importedStylesConflictBehavior - Optional. Specifies how to handle any imported styles with the same name as existing styles in the current document.
          */
-        importStylesFromJson(stylesJson: string, ): OfficeExtension.ClientResult<string[]>;
+        importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior): OfficeExtension.ClientResult<string[]>;
         /**
          * Import styles from a JSON-formatted string.
          *