Skip to content

Commit 3d05e13

Browse files
authored
Merge pull request OfficeDev#46 from OfficeDev/live
[admin] Merge to live!
2 parents c99eae4 + 278414d commit 3d05e13

4 files changed

+12
-12
lines changed

docs/docfx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"breadcrumb_path": "/office/open-xml/breadcrumb/toc.json",
3636
"extendBreadcrumb": true,
3737
"uhfHeaderId": "MSDocsHeader-Dev_Office",
38-
"ms.suite": "office365",
38+
"ms.suite": "office",
3939
"ms.author": "o365devx",
4040
"author": "o365devx",
4141
"ms.topic": "conceptual",

docs/how-to-insert-a-comment-into-a-word-processing-document.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ creates one using the [AddNewPart\<T\>()](https://msdn.microsoft.com/en-us/libra
115115
document.MainDocumentPart.WordprocessingCommentsPart.Comments;
116116
if (comments.HasChildren)
117117
{
118-
id = comments.Descendants<Comment>().Select(e => e.Id.Value).Max();
118+
id = (comments.Descendants<Comment>().Select(e => int.Parse(e.Id.Value)).Max() + 1).ToString();
119119
}
120120
}
121121
else
@@ -278,7 +278,7 @@ Following is the complete sample code in both C\# and Visual Basic.
278278
if (comments.HasChildren)
279279
{
280280
// Obtain an unused ID.
281-
id = comments.Descendants<Comment>().Select(e => e.Id.Value).Max();
281+
id = (comments.Descendants<Comment>().Select(e => int.Parse(e.Id.Value)).Max() + 1).ToString();
282282
}
283283
}
284284
else

docs/how-to-retrieve-the-number-of-slides-in-a-presentation-document.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ loading the document into Microsoft PowerPoint. It contains an example
2323
**RetrieveNumberOfSlides** method to illustrate
2424
this task.
2525

26-
To use the sample code in this topic, you must install the [Open XML SDK 2.5](http://www.microsoft.com/en-us/download/details.aspx?id=30425). You
26+
To use the sample code in this topic, you must install the [Open XML SDK 2.5](https://www.microsoft.com/download/details.aspx?id=30425). You
2727
must explicitly reference the following assemblies in your project:
2828

2929
- WindowsBase
@@ -87,10 +87,10 @@ values, as shown in the following code.
8787
--------------------------------------------------------------------------------
8888
## How the Code Works
8989
The code starts by creating an integer variable, **slidesCount**, to hold the number of slides. The code
90-
then opens the specified presentation by using the [PresentationDocument.Open](https://msdn.microsoft.com/en-us/library/office/documentformat.openxml.packaging.presentationdocument.open.aspx) method and
90+
then opens the specified presentation by using the [PresentationDocument.Open](https://msdn.microsoft.com/library/office/documentformat.openxml.packaging.presentationdocument.open.aspx) method and
9191
indicating that the document should be open for read-only access (the
9292
final **false** parameter value). Given the
93-
open presentation, the code uses the [PresentationPart](https://msdn.microsoft.com/en-us/library/office/documentformat.openxml.packaging.presentationdocument.presentationpart.aspx) property to navigate to
93+
open presentation, the code uses the [PresentationPart](https://msdn.microsoft.com/library/office/documentformat.openxml.packaging.presentationdocument.presentationpart.aspx) property to navigate to
9494
the main presentation part, storing the reference in a variable named
9595
**presentationPart**.
9696

@@ -116,11 +116,11 @@ the main presentation part, storing the reference in a variable named
116116
```
117117

118118
--------------------------------------------------------------------------------
119-
## Retrieving the Count of All Sheets
119+
## Retrieving the Count of All Slides
120120
If the presentation part reference is not null (and it will not be, for
121121
any valid presentation that loads correctly into PowerPoint), the code
122122
next calls the **Count** method on the value of
123-
the [SlideParts](https://msdn.microsoft.com/en-us/library/office/documentformat.openxml.packaging.presentationpart.slideparts.aspx) property of the presentation
123+
the [SlideParts](https://msdn.microsoft.com/library/office/documentformat.openxml.packaging.presentationpart.slideparts.aspx) property of the presentation
124124
part. If you requested all slides, including hidden slides, that is all
125125
there is to do. There is slightly more work to be done if you want to
126126
exclude hidden slides, as shown in the following code.
@@ -145,17 +145,17 @@ exclude hidden slides, as shown in the following code.
145145
```
146146

147147
--------------------------------------------------------------------------------
148-
## Retrieving the Count of Visible Sheets
148+
## Retrieving the Count of Visible Slides
149149
If you requested that the code should limit the return value to include
150150
only visible slides, the code must filter its collection of slides to
151-
include only those slides that have a [Show](https://msdn.microsoft.com/en-us/library/office/documentformat.openxml.presentation.slide.show.aspx) property that contains a value, and
151+
include only those slides that have a [Show](https://msdn.microsoft.com/library/office/documentformat.openxml.presentation.slide.show.aspx) property that contains a value, and
152152
the value is **true**. If the **Show** property is null, that also indicates that
153153
the slide is visible. This is the most likely scenario—PowerPoint does
154154
not set the value of this property, in general, unless the slide is to
155155
be hidden. The only way the **Show** property
156156
would exist and have a value of **true** would
157157
be if you had hidden and then unhidden the slide. The following code
158-
uses the [Where](http://msdn2.microsoft.com/EN-US/library/bb301979)**
158+
uses the [Where](https://msdn2.microsoft.com/library/bb301979)**
159159
function with a lambda expression to do the work.
160160

161161
```csharp

docs/how-to-retrieve-the-values-of-cells-in-a-spreadsheet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ code sample in C\# and Visual Basic.
416416
Where(c => c.CellReference == addressName).FirstOrDefault();
417417

418418
// If the cell does not exist, return an empty string.
419-
if (theCell != null)
419+
if (theCell.InnerText.Length > 0)
420420
{
421421
value = theCell.InnerText;
422422

0 commit comments

Comments
 (0)