Skip to content

Commit cf25be2

Browse files
[Word] Fix replacement condition (#2366)
1 parent e6d02e0 commit cf25be2

File tree

29 files changed

+29
-330
lines changed

29 files changed

+29
-330
lines changed

docs/docs-ref-autogen/word_1_6/word/word.document.yml

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -753,10 +753,10 @@ methods:
753753
return:
754754
type: <xref uid="word!Word.StyleCollection:class" />
755755
description: ''
756-
- name: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
756+
- name: importStylesFromJson(stylesJson)
757757
uid: word!Word.Document#importStylesFromJson:member(1)
758758
package: word!
759-
fullName: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
759+
fullName: importStylesFromJson(stylesJson)
760760
summary: Import styles from a JSON-formatted string.
761761
remarks: >-
762762
\[ [API set: WordApi
@@ -792,44 +792,12 @@ methods:
792792
isDeprecated: false
793793
syntax:
794794
content: >-
795-
importStylesFromJson(stylesJson: string,
796-
importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior):
795+
importStylesFromJson(stylesJson: string):
797796
OfficeExtension.ClientResult<string[]>;
798797
parameters:
799798
- id: stylesJson
800799
description: Required. A JSON-formatted string representing the styles.
801800
type: string
802-
- id: importedStylesConflictBehavior
803-
description: ''
804-
type: Word.ImportedStylesConflictBehavior
805-
return:
806-
type: >-
807-
<xref uid="office!OfficeExtension.ClientResult:class"
808-
/>&lt;string[]&gt;
809-
description: ''
810-
- name: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
811-
uid: word!Word.Document#importStylesFromJson:member(2)
812-
package: word!
813-
fullName: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
814-
summary: Import styles from a JSON-formatted string.
815-
remarks: >-
816-
\[ [API set: WordApi
817-
1.6](/javascript/api/requirement-sets/word/word-api-requirement-sets) \]
818-
819-
isPreview: false
820-
isDeprecated: false
821-
syntax:
822-
content: >-
823-
importStylesFromJson(stylesJson: string,
824-
importedStylesConflictBehavior?: "Ignore" | "Overwrite" | "CreateNew"):
825-
OfficeExtension.ClientResult<string[]>;
826-
parameters:
827-
- id: stylesJson
828-
description: Required. A JSON-formatted string representing the styles.
829-
type: string
830-
- id: importedStylesConflictBehavior
831-
description: ''
832-
type: '"Ignore" | "Overwrite" | "CreateNew"'
833801
return:
834802
type: >-
835803
<xref uid="office!OfficeExtension.ClientResult:class"

docs/docs-ref-autogen/word_1_7/word/word.document.yml

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -775,10 +775,10 @@ methods:
775775
return:
776776
type: <xref uid="word!Word.StyleCollection:class" />
777777
description: ''
778-
- name: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
778+
- name: importStylesFromJson(stylesJson)
779779
uid: word!Word.Document#importStylesFromJson:member(1)
780780
package: word!
781-
fullName: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
781+
fullName: importStylesFromJson(stylesJson)
782782
summary: Import styles from a JSON-formatted string.
783783
remarks: >-
784784
\[ [API set: WordApi
@@ -814,44 +814,12 @@ methods:
814814
isDeprecated: false
815815
syntax:
816816
content: >-
817-
importStylesFromJson(stylesJson: string,
818-
importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior):
817+
importStylesFromJson(stylesJson: string):
819818
OfficeExtension.ClientResult<string[]>;
820819
parameters:
821820
- id: stylesJson
822821
description: Required. A JSON-formatted string representing the styles.
823822
type: string
824-
- id: importedStylesConflictBehavior
825-
description: ''
826-
type: Word.ImportedStylesConflictBehavior
827-
return:
828-
type: >-
829-
<xref uid="office!OfficeExtension.ClientResult:class"
830-
/>&lt;string[]&gt;
831-
description: ''
832-
- name: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
833-
uid: word!Word.Document#importStylesFromJson:member(2)
834-
package: word!
835-
fullName: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
836-
summary: Import styles from a JSON-formatted string.
837-
remarks: >-
838-
\[ [API set: WordApi
839-
1.6](/javascript/api/requirement-sets/word/word-api-requirement-sets) \]
840-
841-
isPreview: false
842-
isDeprecated: false
843-
syntax:
844-
content: >-
845-
importStylesFromJson(stylesJson: string,
846-
importedStylesConflictBehavior?: "Ignore" | "Overwrite" | "CreateNew"):
847-
OfficeExtension.ClientResult<string[]>;
848-
parameters:
849-
- id: stylesJson
850-
description: Required. A JSON-formatted string representing the styles.
851-
type: string
852-
- id: importedStylesConflictBehavior
853-
description: ''
854-
type: '"Ignore" | "Overwrite" | "CreateNew"'
855823
return:
856824
type: >-
857825
<xref uid="office!OfficeExtension.ClientResult:class"

docs/docs-ref-autogen/word_1_8/word/word.document.yml

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -775,10 +775,10 @@ methods:
775775
return:
776776
type: <xref uid="word!Word.StyleCollection:class" />
777777
description: ''
778-
- name: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
778+
- name: importStylesFromJson(stylesJson)
779779
uid: word!Word.Document#importStylesFromJson:member(1)
780780
package: word!
781-
fullName: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
781+
fullName: importStylesFromJson(stylesJson)
782782
summary: Import styles from a JSON-formatted string.
783783
remarks: >-
784784
\[ [API set: WordApi
@@ -814,44 +814,12 @@ methods:
814814
isDeprecated: false
815815
syntax:
816816
content: >-
817-
importStylesFromJson(stylesJson: string,
818-
importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior):
817+
importStylesFromJson(stylesJson: string):
819818
OfficeExtension.ClientResult<string[]>;
820819
parameters:
821820
- id: stylesJson
822821
description: Required. A JSON-formatted string representing the styles.
823822
type: string
824-
- id: importedStylesConflictBehavior
825-
description: ''
826-
type: Word.ImportedStylesConflictBehavior
827-
return:
828-
type: >-
829-
<xref uid="office!OfficeExtension.ClientResult:class"
830-
/>&lt;string[]&gt;
831-
description: ''
832-
- name: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
833-
uid: word!Word.Document#importStylesFromJson:member(2)
834-
package: word!
835-
fullName: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
836-
summary: Import styles from a JSON-formatted string.
837-
remarks: >-
838-
\[ [API set: WordApi
839-
1.6](/javascript/api/requirement-sets/word/word-api-requirement-sets) \]
840-
841-
isPreview: false
842-
isDeprecated: false
843-
syntax:
844-
content: >-
845-
importStylesFromJson(stylesJson: string,
846-
importedStylesConflictBehavior?: "Ignore" | "Overwrite" | "CreateNew"):
847-
OfficeExtension.ClientResult<string[]>;
848-
parameters:
849-
- id: stylesJson
850-
description: Required. A JSON-formatted string representing the styles.
851-
type: string
852-
- id: importedStylesConflictBehavior
853-
description: ''
854-
type: '"Ignore" | "Overwrite" | "CreateNew"'
855823
return:
856824
type: >-
857825
<xref uid="office!OfficeExtension.ClientResult:class"

docs/docs-ref-autogen/word_1_9/word/word.document.yml

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -775,10 +775,10 @@ methods:
775775
return:
776776
type: <xref uid="word!Word.StyleCollection:class" />
777777
description: ''
778-
- name: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
778+
- name: importStylesFromJson(stylesJson)
779779
uid: word!Word.Document#importStylesFromJson:member(1)
780780
package: word!
781-
fullName: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
781+
fullName: importStylesFromJson(stylesJson)
782782
summary: Import styles from a JSON-formatted string.
783783
remarks: >-
784784
\[ [API set: WordApi
@@ -814,44 +814,12 @@ methods:
814814
isDeprecated: false
815815
syntax:
816816
content: >-
817-
importStylesFromJson(stylesJson: string,
818-
importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior):
817+
importStylesFromJson(stylesJson: string):
819818
OfficeExtension.ClientResult<string[]>;
820819
parameters:
821820
- id: stylesJson
822821
description: Required. A JSON-formatted string representing the styles.
823822
type: string
824-
- id: importedStylesConflictBehavior
825-
description: ''
826-
type: Word.ImportedStylesConflictBehavior
827-
return:
828-
type: >-
829-
<xref uid="office!OfficeExtension.ClientResult:class"
830-
/>&lt;string[]&gt;
831-
description: ''
832-
- name: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
833-
uid: word!Word.Document#importStylesFromJson:member(2)
834-
package: word!
835-
fullName: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
836-
summary: Import styles from a JSON-formatted string.
837-
remarks: >-
838-
\[ [API set: WordApi
839-
1.6](/javascript/api/requirement-sets/word/word-api-requirement-sets) \]
840-
841-
isPreview: false
842-
isDeprecated: false
843-
syntax:
844-
content: >-
845-
importStylesFromJson(stylesJson: string,
846-
importedStylesConflictBehavior?: "Ignore" | "Overwrite" | "CreateNew"):
847-
OfficeExtension.ClientResult<string[]>;
848-
parameters:
849-
- id: stylesJson
850-
description: Required. A JSON-formatted string representing the styles.
851-
type: string
852-
- id: importedStylesConflictBehavior
853-
description: ''
854-
type: '"Ignore" | "Overwrite" | "CreateNew"'
855823
return:
856824
type: >-
857825
<xref uid="office!OfficeExtension.ClientResult:class"

docs/docs-ref-autogen/word_online/word/word.document.yml

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -775,10 +775,10 @@ methods:
775775
return:
776776
type: <xref uid="word!Word.StyleCollection:class" />
777777
description: ''
778-
- name: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
778+
- name: importStylesFromJson(stylesJson)
779779
uid: word!Word.Document#importStylesFromJson:member(1)
780780
package: word!
781-
fullName: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
781+
fullName: importStylesFromJson(stylesJson)
782782
summary: Import styles from a JSON-formatted string.
783783
remarks: >-
784784
\[ [API set: WordApi
@@ -814,44 +814,12 @@ methods:
814814
isDeprecated: false
815815
syntax:
816816
content: >-
817-
importStylesFromJson(stylesJson: string,
818-
importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior):
817+
importStylesFromJson(stylesJson: string):
819818
OfficeExtension.ClientResult<string[]>;
820819
parameters:
821820
- id: stylesJson
822821
description: Required. A JSON-formatted string representing the styles.
823822
type: string
824-
- id: importedStylesConflictBehavior
825-
description: ''
826-
type: Word.ImportedStylesConflictBehavior
827-
return:
828-
type: >-
829-
<xref uid="office!OfficeExtension.ClientResult:class"
830-
/>&lt;string[]&gt;
831-
description: ''
832-
- name: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
833-
uid: word!Word.Document#importStylesFromJson:member(2)
834-
package: word!
835-
fullName: importStylesFromJson(stylesJson, importedStylesConflictBehavior)
836-
summary: Import styles from a JSON-formatted string.
837-
remarks: >-
838-
\[ [API set: WordApi
839-
1.6](/javascript/api/requirement-sets/word/word-api-requirement-sets) \]
840-
841-
isPreview: false
842-
isDeprecated: false
843-
syntax:
844-
content: >-
845-
importStylesFromJson(stylesJson: string,
846-
importedStylesConflictBehavior?: "Ignore" | "Overwrite" | "CreateNew"):
847-
OfficeExtension.ClientResult<string[]>;
848-
parameters:
849-
- id: stylesJson
850-
description: Required. A JSON-formatted string representing the styles.
851-
type: string
852-
- id: importedStylesConflictBehavior
853-
description: ''
854-
type: '"Ignore" | "Overwrite" | "CreateNew"'
855823
return:
856824
type: >-
857825
<xref uid="office!OfficeExtension.ClientResult:class"

docs/includes/word-1_6.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
|[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.|
55
|[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.|
66
|[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.|
7-
||[importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior)](/javascript/api/word/word.document#word-word-document-importstylesfromjson-member(1))|Import styles from a JSON-formatted string.|
7+
||[importStylesFromJson(stylesJson: string)](/javascript/api/word/word.document#word-word-document-importstylesfromjson-member(1))|Import styles from a JSON-formatted string.|
88
||[onParagraphAdded](/javascript/api/word/word.document#word-word-document-onparagraphadded-member)|Occurs when the user adds new paragraphs.|
99
||[onParagraphChanged](/javascript/api/word/word.document#word-word-document-onparagraphchanged-member)|Occurs when the user changes paragraphs.|
1010
||[onParagraphDeleted](/javascript/api/word/word.document#word-word-document-onparagraphdeleted-member)|Occurs when the user deletes paragraphs.|

docs/includes/word-desktop-1_1.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
||[outsideBorderType](/javascript/api/word/word.bordercollection#word-word-bordercollection-outsidebordertype-member)|Specifies the border type of the outside borders.|
1818
||[outsideBorderWidth](/javascript/api/word/word.bordercollection#word-word-bordercollection-outsideborderwidth-member)|Specifies the width of the outside borders.|
1919
|[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.|
20+
||[importStylesFromJson(stylesJson: string, importedStylesConflictBehavior?: Word.ImportedStylesConflictBehavior)](/javascript/api/word/word.document#word-word-document-importstylesfromjson-member(1))|Import styles from a JSON-formatted string.|
2021
|[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.|
2122
||[authorName](/javascript/api/word/word.documentcompareoptions#word-word-documentcompareoptions-authorname-member)|The reviewer name associated with the differences generated by the comparison.|
2223
||[compareTarget](/javascript/api/word/word.documentcompareoptions#word-word-documentcompareoptions-comparetarget-member)|The target document for the comparison.|

generate-docs/api-extractor-inputs-word-release/word_1_1/word.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,6 @@ export declare namespace Word {
781781

782782

783783

784-
785784
/**
786785
* Saves the document.
787786
*

generate-docs/api-extractor-inputs-word-release/word_1_2/word.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,6 @@ export declare namespace Word {
799799

800800

801801

802-
803802
/**
804803
* Saves the document.
805804
*

generate-docs/api-extractor-inputs-word-release/word_1_3/word.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,6 @@ export declare namespace Word {
11991199

12001200

12011201

1202-
12031202
/**
12041203
* Saves the document.
12051204
*

0 commit comments

Comments
 (0)