Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to live #33

Merged
merged 172 commits into from
Aug 16, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
6e56072
Initialize open publishing repository: https://github.com/MicrosoftDo…
Apr 24, 2018
fad2c04
add Access
Apr 24, 2018
b1acdcc
add latest object model docs
May 9, 2018
1f7e49c
add images from VBA content
May 9, 2018
2f3bf74
Access Renaming with existing api name
May 11, 2018
baa2901
Rename title and update content
May 14, 2018
f83196f
update links
May 14, 2018
fc185d7
correct more links
May 14, 2018
8724ee4
Rename Outlook step1
May 15, 2018
69d7f1c
rename outlook - step2
May 15, 2018
c4e7c97
update contents
May 15, 2018
8742f6f
update PowerPoint
May 15, 2018
25ba499
rename and update Project
May 15, 2018
630d8ca
rename and update - publisher
May 15, 2018
e65b8d2
Rename and update content
May 15, 2018
0e69536
rename and update
May 16, 2018
874fe0e
update content 2
May 16, 2018
a2f510c
update content 2
May 16, 2018
c3549c9
update content 2
May 16, 2018
4a9a86b
Update content 2
May 16, 2018
8e3c994
Rename and Update
May 16, 2018
bfda0e7
Revert "Access Renaming with existing api name"
May 16, 2018
f6e0aeb
Merge branch 'AccessUpdating' of https://github.com/MicrosoftDocs/VBA…
May 16, 2018
349e7d7
Merge pull request #8 from MicrosoftDocs/ExcelUpdating
May 16, 2018
07adb0f
Merge pull request #7 from MicrosoftDocs/OutlookUpdating
May 16, 2018
8f69d7a
Merge pull request #6 from MicrosoftDocs/PowerpointUpdating
May 16, 2018
71dbcda
Merge pull request #5 from MicrosoftDocs/Project
May 16, 2018
1a4c881
Merge pull request #4 from MicrosoftDocs/PublisherUpdating
May 16, 2018
a81cf0e
Merge pull request #3 from MicrosoftDocs/VisioUpdating
May 16, 2018
0fe4f43
Merge pull request #2 from MicrosoftDocs/WordUpdating
May 16, 2018
8be8ca8
Initialize open publishing repository: https://github.com/MicrosoftDo…
May 17, 2018
9099c35
Update .openpublishing.publish.config.json
May 17, 2018
2ca1acc
move docfx to root
May 17, 2018
a1411a6
update docfx
May 17, 2018
da9bed2
Update docfx.json
May 17, 2018
fe76877
Merge pull request #11 from MicrosoftDocs/update_docfx
May 17, 2018
7a5a335
UpdateTOC and copy concepts
Jun 1, 2018
d14d562
Merge pull request #12 from MicrosoftDocs/UpdateTOC
Jun 1, 2018
0478677
add all remaining files and folders
Jun 1, 2018
215b0b8
Merge pull request #13 from MicrosoftDocs/AddRemainings
Jun 1, 2018
e959f09
Update docfx.json
dend Jun 5, 2018
1e527c7
resfine-part1
Jun 12, 2018
d21ef73
rename folder
Jun 12, 2018
1fc0cec
fix
Jun 12, 2018
22aa078
remainings
Jun 13, 2018
c51eeae
remaining last
Jun 13, 2018
8dada96
remove ####concepts
Saisang Jun 14, 2018
00eb0be
add vb in code title
Saisang Jun 14, 2018
32a35bb
Merge pull request #14 from Saisang/sai-formatbulkupdate
Jun 15, 2018
1e45591
fix tables
Jun 18, 2018
3678173
Merge branch 'master' of https://github.com/MicrosoftDocs/VBA-Docs
Jun 18, 2018
d2b09fb
update images locations
Jun 18, 2018
f3a2464
update syntax part 1
Jun 19, 2018
89a5d78
syntax part1.1
Jun 19, 2018
6095c04
syntax part 1.2
Jun 19, 2018
2039954
add sub level for Properties, methods and events in toc
Saisang Jun 20, 2018
c5dc7b9
Merge pull request #16 from MicrosoftDocs/sai-tocsublevel
Jun 20, 2018
b98d43c
testscript
Jun 21, 2018
1f84aa7
synctax part2 -access
Jun 21, 2018
88ce457
syntax part2 - others
Jun 21, 2018
b85fa3f
Merge pull request #17 from MicrosoftDocs/syntax-part2
Jun 21, 2018
8cd27c3
remove the Other Resources label
Jun 22, 2018
7bf823f
Incorrect single tick used
Jun 22, 2018
f2db4ca
fix table format
Jun 22, 2018
a84286c
fix table 2
Jun 22, 2018
92e610c
Sai regression bugs fix (#18)
Saisang Jun 22, 2018
d514506
move references to the end of the list
Saisang Jun 22, 2018
ce6d9df
Merge pull request #19 from MicrosoftDocs/sai-movetoc
Saisang Jun 22, 2018
bf4be8e
fix libraryReferences
Jun 25, 2018
36f2be5
move libraryRefence
Jun 25, 2018
c76ec45
fix overviews
Jun 25, 2018
c571ba0
remove empty anchor
Saisang Jun 26, 2018
b885041
correct links
Jun 26, 2018
3371695
redirect msdn links to docs
Saisang Jun 26, 2018
134e6a4
Merge branch 'master' into sai-redirectmsdntodocs
Saisang Jun 26, 2018
0e25125
correct links
Jun 26, 2018
50e0c79
Merge pull request #20 from MicrosoftDocs/sai-redirectmsdntodocs
Saisang Jun 26, 2018
f6ec7c1
fix warnings and missing files
Jun 27, 2018
c64c359
Merge branch 'master' of https://github.com/MicrosoftDocs/VBA-Docs
Jun 27, 2018
7c72105
add missing
Jun 27, 2018
15253d4
redirect to docs
Saisang Jun 27, 2018
28f8969
update TOC
Jun 27, 2018
8a53d10
manual redirection fixing typo
Saisang Jun 28, 2018
dc20894
manually redirect
Saisang Jun 28, 2018
3626325
redirect msdn links which docs topics are missing to landing pages
Saisang Jun 28, 2018
282d820
Merge pull request #21 from MicrosoftDocs/sai-redirectiontolandings
Saisang Jun 28, 2018
3c02533
fix links
Jun 28, 2018
287b333
resolve conflicts
Jun 28, 2018
bbc8baa
update links
Jun 29, 2018
2389d0b
fix links
Jun 29, 2018
2289814
fix language reference links
Jun 29, 2018
372a957
correct links
Jun 29, 2018
b7629cc
add missing fixes
Jun 29, 2018
8cd1e48
remove 4 wrong copy files - api
Jul 2, 2018
6cd63e6
copy missing files from source code
Saisang Jul 2, 2018
2082425
Merge bug fixes to master (#22)
Linda-Editor Jul 3, 2018
4cf3e3a
fix missing files in api
Jul 3, 2018
e5bbaf9
resolve missing
Jul 3, 2018
ae37e8b
correct links
Jul 3, 2018
c8c38e7
fix merge conflict
Jul 3, 2018
17c44a3
Merge pull request #23 from MicrosoftDocs/sai-copymissingfiles
Jul 3, 2018
633e232
remove dulplicated toc nodes
Saisang Jul 3, 2018
39e39d3
fix links
Jul 3, 2018
8072e43
change structure language-reference/language-reference/ to language/r…
Saisang Jul 4, 2018
ac9b6a3
Merge branch 'master' of https://github.com/MicrosoftDocs/VBA-Docs in…
Saisang Jul 4, 2018
ddbe412
fix typo in toc
Saisang Jul 4, 2018
173904a
move overview topics into product sub folders
Saisang Jul 4, 2018
86d964a
update due to renaming
Jul 4, 2018
c0d64cf
correct file name
Jul 4, 2018
3e4fb06
fix links
Jul 4, 2018
3e0fa3b
fix typo in toc
Saisang Jul 4, 2018
a4fd4a0
scan and fix broken links
Saisang Jul 4, 2018
5457590
fix broken links
Saisang Jul 4, 2018
da04147
Merge branch 'master' of https://github.com/MicrosoftDocs/VBA-Docs in…
Saisang Jul 4, 2018
702b4d8
fix broken links
Saisang Jul 5, 2018
042e605
fix broken links
Saisang Jul 5, 2018
815d722
Merge pull request #24 from MicrosoftDocs/sai-dulptocnodefix
Jul 5, 2018
3c87271
add missing files'
Jul 5, 2018
945bfa8
Merge branch 'master' of https://github.com/MicrosoftDocs/VBA-Docs
Jul 5, 2018
e07cf44
fix typo and missings
Jul 5, 2018
58e5871
update breadcrumb
Jul 5, 2018
2127ab1
lastwarning
Jul 5, 2018
317a547
fix remaining tables
Jul 5, 2018
e8508ab
remove object model dulp file
Saisang Jul 5, 2018
bf0f67f
remove dulp toc
Saisang Jul 5, 2018
7ec4e7b
delete dulp files
Saisang Jul 6, 2018
cd6bd04
redirecttion after removing
Saisang Jul 6, 2018
77a1be1
Merge pull request #26 from MicrosoftDocs/sai-removedulpfiles
Saisang Jul 6, 2018
d3239d3
remove dulp toc
Saisang Jul 9, 2018
26e8f32
fix meta & image alt
Jul 9, 2018
7b3c7f6
insert files which missing toc
Saisang Jul 9, 2018
caea202
https checking
Jul 9, 2018
65e79f4
insert missing toc files manually
Saisang Jul 9, 2018
c7b7759
Merge pull request #27 from MicrosoftDocs/sai-removedulptoc
Saisang Jul 9, 2018
c8bbec8
Merge "missing language specification" fixes (#28)
Linda-Editor Jul 10, 2018
ea7f86e
Fixed merge conflict
Linda-Editor Jul 11, 2018
4e84274
Fix code block
Linda-Editor Jul 11, 2018
833b457
Fix code, take 2
Linda-Editor Jul 11, 2018
ffcb8d2
Fixed missing lang spec
Linda-Editor Jul 11, 2018
7f07dea
Fixed bullet and NOTE formatting
Linda-Editor Jul 11, 2018
6344fce
update http
Jul 11, 2018
4756487
merge conflicts
Jul 11, 2018
9f09952
match case sensitive
Saisang Jul 11, 2018
11667e6
add missing toc manually
Saisang Jul 11, 2018
c22d967
fix some typo
Saisang Jul 11, 2018
2742f79
fix some typo
Saisang Jul 11, 2018
72db72d
Merge pull request #29 from MicrosoftDocs/sai-missingtoc
Saisang Jul 11, 2018
1df32b8
🔒 HTTPS link changes
Jul 12, 2018
fad7f1a
✅ Content fixes.
Jul 12, 2018
7f5cd9d
📢 GitHub feedback.
Jul 12, 2018
2c82621
Fixed See also link
Linda-Editor Jul 19, 2018
c8c1035
fix typo in toc
Saisang Aug 1, 2018
1693725
Merge pull request #30 from MicrosoftDocs/sai-fixtypointoc
Saisang Aug 1, 2018
5ac3f51
delete duplicated files and fix the toc links
Saisang Aug 2, 2018
833f942
fix broken links after deleting files.
Saisang Aug 2, 2018
0f8ea97
fix broken links after deleting files.
Saisang Aug 2, 2018
ce882b1
Updated headings to match other glossary
Aug 2, 2018
fd5cb9d
Merge pull request #31 from MicrosoftDocs/sai-removeduplicatefilesbys…
Saisang Aug 3, 2018
5692e71
Made glossaries consistent
Aug 3, 2018
4840b20
copy F1 Landing folder
Saisang Aug 6, 2018
64d523b
copy F1 Landing folder
Saisang Aug 6, 2018
977230b
copy other files according to missing guid
Saisang Aug 6, 2018
5010d52
move files into correct path
Saisang Aug 6, 2018
15d09e5
fix broken links
Saisang Aug 7, 2018
332bdf3
fix broken links
Saisang Aug 7, 2018
22044b3
Merge pull request #32 from MicrosoftDocs/sai-addF1LandingPages
Saisang Aug 7, 2018
4054a08
Added ROBOTS for F1 and misc. topics
Aug 9, 2018
bfe75ca
Added YAML metadata
Aug 9, 2018
8eba74d
Merge branch 'master' of https://github.com/MicrosoftDocs/VBA-Docs
Aug 9, 2018
9ed099c
Changed Office-F1-Landing to F1
Aug 16, 2018
851cb43
Updated F1 under ROBOTS
Aug 16, 2018
2b4277e
Merge branch 'live' into master
Aug 16, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
✅ Content fixes.
  • Loading branch information
Den Delimarsky committed Jul 12, 2018
commit fad7f1a56bfa039085e9dbb72f43ae5854cdfe8c
1 change: 0 additions & 1 deletion api/Excel(enumerations).md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ This section contains documentation for the enumerations in the Excel object mod
| **[XlPageBreak Enumeration](Excel.XlPageBreak.md)** |
| **[XlPageBreakExtent Enumeration](Excel.XlPageBreakExtent.md)** |
| **[XlPageOrientation Enumeration](Excel.XlPageOrientation.md)** |
| **[XlPageOrientation Enumeration (Excel)](#.md)** |
| **[XlPaperSize Enumeration](Excel.XlPaperSize.md)** |
| **[XlParameterDataType Enumeration](Excel.XlParameterDataType.md)** |
| **[XlParameterType Enumeration](Excel.XlParameterType.md)** |
Expand Down
92 changes: 45 additions & 47 deletions docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"files": [
"**/*.png",
"**/*.jpg",
"**/*.gif"
"**/*.gif"
],
"exclude": [
"**/obj/**",
Expand All @@ -38,56 +38,54 @@
"globalMetadata": {
"breadcrumb_path": "/breadcrumb/toc.json",
"extendBreadcrumb": true,
"ms.suite": "office",
"ms.technology": "vba",
"ms.author": "o365devx",
"author": "o365devx",
"ms.topic": "reference"
"ms.suite": "office",
"ms.date": "7/12/2018",
"ms.technology": "vba",
"ms.author": "o365devx",
"author": "o365devx",
"ms.topic": "reference"
},
"fileMetadata": {
"ms.topic":
{
"api/**.md": "reference",
"access/**.md": "conceptual",
"excel/**.md": "conceptual",
"Language/**.md": "conceptual",
"Library-Reference/**.md": "conceptual",
"Office-Mac/**.md": "conceptual",
"outlook/**.md": "conceptual",
"powerpoint/**.md": "conceptual",
"project/**.md": "conceptual",
"publisher/**.md": "conceptual",
"visio/**.md": "conceptual",
"word/**.md": "conceptual"
},
"ms.prod":
{
"api/Access.*.md": "access",
"api/Excel.*.md": "excel",
"api/Outlook.*.md": "outlook",
"api/PowerPoint.*.md": "powerpoint",
"api/Project.*.md": "project",
"api/Publisher.*.md": "publisher",
"api/Visio.*.md": "visio",
"api/Word.*.md": "word",
"api/Office.*.md": "office",
"api/overview/**.md": "vba",

"access/**.md": "access",
"excel/**.md": "excel",
"Language/**.md": "office",
"Library-Reference/**.md": "office",
"Office-Mac/**.md": "office",
"outlook/**.md": "outlook",
"powerpoint/**.md": "powerpoint",
"project/**.md": "project",
"publisher/**.md": "publisher",
"visio/**.md": "visio",
"word/**.md": "word"
}
"ms.topic": {
"api/**.md": "reference",
"access/**.md": "conceptual",
"excel/**.md": "conceptual",
"Language/**.md": "conceptual",
"Library-Reference/**.md": "conceptual",
"Office-Mac/**.md": "conceptual",
"outlook/**.md": "conceptual",
"powerpoint/**.md": "conceptual",
"project/**.md": "conceptual",
"publisher/**.md": "conceptual",
"visio/**.md": "conceptual",
"word/**.md": "conceptual"
},
"ms.prod": {
"api/Access.*.md": "access",
"api/Excel.*.md": "excel",
"api/Outlook.*.md": "outlook",
"api/PowerPoint.*.md": "powerpoint",
"api/Project.*.md": "project",
"api/Publisher.*.md": "publisher",
"api/Visio.*.md": "visio",
"api/Word.*.md": "word",
"api/Office.*.md": "office",
"api/overview/**.md": "vba",
"access/**.md": "access",
"excel/**.md": "excel",
"Language/**.md": "office",
"Library-Reference/**.md": "office",
"Office-Mac/**.md": "office",
"outlook/**.md": "outlook",
"powerpoint/**.md": "powerpoint",
"project/**.md": "project",
"publisher/**.md": "publisher",
"visio/**.md": "visio",
"word/**.md": "word"
}
},
"template": [],
"dest": "VBA-Docs",
"markdownEngineName": "markdig"
}
}
}
14 changes: 1 addition & 13 deletions word/Concepts/Working-with-Word/working-with-content-controls.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ ms.assetid: b4092c71-a383-f1db-8d68-de69e8d8a86b
ms.date: 06/08/2017
---


# Working with Content Controls

## What Are Content Controls?
Expand All @@ -23,13 +22,10 @@ Content controls are bounded and potentially labeled regions in a document that

The easiest way to create a content control is through the user interface (although you can also create them programmatically). To create a content control through the user interface (UI), select the content that you want to turn into a content control (for example, some text or a picture) and then choose the content control type you want from the content controls section of the Developer ribbon. This creates a content control around the selected content.


## Content Controls in the Word Object Model

The following table shows the objects in the Word object model that relate to content controls.



|**Name**|**Description**|
|:-----|:-----|
| **[ContentControl](../../../api/Word.ContentControl.md)**|Each **ContentControl** object represents an individual content control within a document. Use the **ContentControls** collection to access individual **ContentControl** objects.|
Expand All @@ -39,7 +35,6 @@ The following table shows the objects in the Word object model that relate to co

Each of these objects or collections has methods and properties that allow you to work with the content controls both individually and as a collection. Because there are various types of content controls (see the following section "Types of Content Controls"), the **ContentControl** object has members that might not apply to all the different types of content controls. The following table shows those properties and methods of the **ContentControl** object that only apply to certain types of content controls.


> [!NOTE]
> For a complete list of all properties and methods of the **ContentControl** object, see [Content Controls](https://msdn.microsoft.com/en-us/library/bb157891.aspx).

Expand All @@ -60,8 +55,6 @@ Each of these objects or collections has methods and properties that allow you t

There are eight different types of content controls that you can add to a document, each of which is represented in a new enumeration called **[WdContentControlType](../../../api/Word.WdContentControlType.md)**.



|**Content Control Type**|**Description**|**WdContentControlType Constant**|
|:-----|:-----|:-----|
||A checkbox.| **wdContentControlCheckBox**|
Expand All @@ -78,8 +71,6 @@ There are eight different types of content controls that you can add to a docume

In addition to the properties and methods available with the content control object model in Word, you can also use several events that allow you to run code when adding or removing a content control or when a user edits a content control. The following list describes each of the events and when the event code runs. All of these events are members of the **Document** object.



|**Event Name**|**Description**|
|:-----|:-----|
| **[ContentControlAfterAdd](../../../api/Word.Document.ContentControlAfterAdd.md)**|Occurs after adding a new content control to a document. This event runs whether the user adds the content control by using the tools in the UI or adds them by using code.|
Expand All @@ -93,7 +84,6 @@ In addition to the properties and methods available with the content control obj

Whether you want to add a content control, delete a content control, or access and manipulate existing content controls, you can do it with code. The following sections are just a few samples of what you can do.


## Adding a Content Control

As mentioned previously, there are eight different types of content controls that you can add to your documents. Use the **Add** method of the **ContentControls** collection to add a content control to a document. The following example adds a date picker to the active document and sets the date value to the current date.
Expand Down Expand Up @@ -162,6 +152,4 @@ Sub SetPlaceholderText()
End Sub
```

These are just a few of the ways that you can use the object model to manipulate content controls in your documents. For more examples, see the [How To](how-do-i-word-vba-reference.md) section.


These are just a few of the ways that you can use the object model to manipulate content controls in your documents. For more examples, see the [How To](how-do-i-word-vba-reference.md) section.
26 changes: 8 additions & 18 deletions word/Concepts/Working-with-Word/working-with-document-objects.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ ms.assetid: af304f65-6cdd-ff7d-a81f-cce0161f2b47
ms.date: 06/08/2017
---


# Working with Document Objects

In Visual Basic, the methods for modifying files are methods of the **[Document](../../../api/Word.Document.md)** object or the **[Documents](../../../api/Word.documents.md)** collection. This topic includes Visual Basic examples related to the following tasks:
Expand Down Expand Up @@ -94,7 +93,7 @@ To save a single document, use the **[SaveAs2](../../../api/Word.SaveAs2.md)** m

```vb
Sub SaveNewDocument()
ActiveDocument.SaveAs FileName:="Temp.doc"
ActiveDocument.SaveAs FileName:="Temp.doc"
End Sub
```

Expand All @@ -105,35 +104,28 @@ The **_FileName_** argument can include only the file name or the complete path

To close a single document, use the **[Close](../../../api/Word.Document.Close(method).md)** method with a **Document** object. The following instruction closes and saves the document named Sales.doc.


```vb
Sub CloseDocument()
Sub CloseDocument()
Documents("Sales.doc").Close SaveChanges:=wdSaveChanges
End Sub
```

You can close all open documents by applying the **[Close](../../../api/Word.Documents.Close.md)** method of the **Documents** collection. The following instruction closes all documents without saving changes.




```vb
Sub CloseAllDocuments()
Documents.Close SaveChanges:=wdDoNotSaveChanges
Documents.Close SaveChanges:=wdDoNotSaveChanges
End Sub
```

The following example prompts the user to save each document before the document is closed.




```vb
Sub PromptToSaveAndClose()
Dim doc As Document
Sub PromptToSaveAndClose()
Dim doc As Document
For Each doc In Documents
doc.Close SaveChanges:=wdPromptToSaveChanges
Next
doc.Close SaveChanges:=wdPromptToSaveChanges
Next
End Sub
```

Expand Down Expand Up @@ -188,6 +180,4 @@ Sub ActiveDocumentName()
MsgBox "No documents are open"
End If
End Sub
```


```