diff options
| author | Yousuf Philips <philipz85@hotmail.com> | 2016-03-07 12:06:10 +0400 |
|---|---|---|
| committer | Olivier Hallot <ohallot@collabora.co.uk> | 2016-03-09 21:50:55 +0000 |
| commit | 17d37456a2c3e912a137b7af643de8aa4aa34bbb (patch) | |
| tree | 8e6588ae1d17dba567bb6cbd00210cbbac277ff3 /source/text/shared | |
| parent | dec91da1bdf9b9abbb0d54551cf6722c7aeb3ce8 (diff) | |
tdf#92825 Rearrange Writer's insert menu
fix merge conflict
Change-Id: I8c67b61fdc6042291890bf80b47d762dd89d76d4
Reviewed-on: https://gerrit.libreoffice.org/22972
Reviewed-by: Olivier Hallot <ohallot@collabora.co.uk>
Tested-by: Olivier Hallot <ohallot@collabora.co.uk>
Diffstat (limited to 'source/text/shared')
| -rw-r--r-- | source/text/shared/00/00000404.xhp | 8 | ||||
| -rw-r--r-- | source/text/shared/01/04050000.xhp | 131 | ||||
| -rw-r--r-- | source/text/shared/01/04100000.xhp | 59 | ||||
| -rw-r--r-- | source/text/shared/01/04140000.xhp | 49 | ||||
| -rw-r--r-- | source/text/shared/01/04150000.xhp | 75 | ||||
| -rw-r--r-- | source/text/shared/01/04160500.xhp | 6 | ||||
| -rw-r--r-- | source/text/shared/01/04990000.xhp | 37 | ||||
| -rw-r--r-- | source/text/shared/01/formatting_mark.xhp | 79 | ||||
| -rw-r--r-- | source/text/shared/02/01140000.xhp | 14 | ||||
| -rw-r--r-- | source/text/shared/02/fontwork.xhp | 42 | ||||
| -rw-r--r-- | source/text/shared/guide/chart_insert.xhp | 4 | ||||
| -rw-r--r-- | source/text/shared/menu/insert_chart.xhp | 51 | ||||
| -rw-r--r-- | source/text/shared/menu/insert_form_control.xhp | 40 | ||||
| -rw-r--r-- | source/text/shared/menu/insert_shape.xhp | 52 |
14 files changed, 414 insertions, 233 deletions
diff --git a/source/text/shared/00/00000404.xhp b/source/text/shared/00/00000404.xhp index 5de6f2fef8..6424a38ac1 100644 --- a/source/text/shared/00/00000404.xhp +++ b/source/text/shared/00/00000404.xhp @@ -188,19 +188,19 @@ </section> </section> <section id="grafik"> -<paragraph role="paragraph" id="par_id3155513" xml-lang="en-US" l10n="CHG" oldref="44">Choose <emph>Insert - Image - From File</emph> +<paragraph role="paragraph" id="par_id3155513" xml-lang="en-US" l10n="CHG" oldref="44">Choose <emph>Insert - Image</emph> </paragraph> -<paragraph role="paragraph" id="par_id3155308" xml-lang="en-US" l10n="CHG" oldref="45">Open the <emph>Insert</emph> toolbar, click<comment>UFI: shortened the para</comment></paragraph> +<paragraph role="paragraph" id="par_id3155308" xml-lang="en-US" l10n="CHG" oldref="45">On the <emph>Standard</emph> toolbar, click </paragraph> <section id="sygrafik"> <table id="tbl_id3150032"> <tablerow> <tablecell colspan="" rowspan=""> <paragraph role="paragraph" id="par_id3145594" xml-lang="en-US" l10n="E"> -<image id="img_id3144764" src="cmd/sc_objectcatalog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144764" xml-lang="en-US">Icon</alt> +<image id="img_id3144764" src="cmd/lc_insertgraphic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144764" xml-lang="en-US">Icon</alt> </image></paragraph> </tablecell> <tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3149960" xml-lang="en-US" l10n="CHG" oldref="46">From File</paragraph> +<paragraph role="paragraph" id="par_id3149960" xml-lang="en-US" l10n="CHG" oldref="46">Image</paragraph> </tablecell> </tablerow> </table> diff --git a/source/text/shared/01/04050000.xhp b/source/text/shared/01/04050000.xhp index 6229a04f50..ba987ae8bd 100644 --- a/source/text/shared/01/04050000.xhp +++ b/source/text/shared/01/04050000.xhp @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - <!-- * This file is part of the LibreOffice project. * @@ -17,75 +16,85 @@ * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - +--> <meta> - <topic id="textshared0104050000xml" indexer="include"> - <title xml-lang="en-US" id="tit">Comment</title> - <filename>/text/shared/01/04050000.xhp</filename> - </topic> - </meta> - <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3154100"><bookmark_value>comments;inserting/editing/deleting/printing</bookmark_value> - <bookmark_value>inserting; comments</bookmark_value> - <bookmark_value>editing; comments</bookmark_value> - <bookmark_value>deleting;comments</bookmark_value> - <bookmark_value>Navigator;comments</bookmark_value> - <bookmark_value>printing;comments</bookmark_value> - <bookmark_value>records; inserting comments </bookmark_value> - <bookmark_value>remarks, see also comments</bookmark_value> -</bookmark><comment>mw changed "notes;" and added 3 entries</comment> + <topic id="textshared0104050000xml" indexer="include"> + <title id="tit" xml-lang="en-US">Comment</title> + <filename>/text/shared/01/04050000.xhp</filename> + </topic> +</meta> + +<body> + +<bookmark xml-lang="en-US" branch="index" id="bm_id3154100"> + <bookmark_value>comments;inserting/editing/deleting/printing</bookmark_value> + <bookmark_value>inserting; comments</bookmark_value> + <bookmark_value>editing; comments</bookmark_value> + <bookmark_value>deleting;comments</bookmark_value> + <bookmark_value>Navigator;comments</bookmark_value> + <bookmark_value>printing;comments</bookmark_value> + <bookmark_value>records; inserting comments </bookmark_value> + <bookmark_value>remarks, see also comments</bookmark_value> +</bookmark> +<comment>mw changed "notes;" and added 3 entries</comment> <bookmark xml-lang="en-US" branch="hid/.uno:InsertAnnotation" id="bm_id8906707" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertAnnotation" id="bm_id3156045" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3154100" role="heading" level="1" l10n="CHG" - oldref="1">Comment</paragraph> - <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="CHG" oldref="2"><variable id="notizbearbeitentext"><ahelp hid=".uno:InsertAnnotation">Inserts a comment.</ahelp> -</variable></paragraph> - <section id="howtoget"> - <embed href="text/shared/00/00000404.xhp#notiz"/> - </section> - <paragraph xml-lang="en-US" id="hd_id9851680" role="heading" level="2" l10n="NEW">Inserting comments</paragraph> -<comment>issue 113019 112000</comment><paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="CHG">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option -</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+C key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box. - If a text range is selected, the comment is attached to the text range.</paragraph> - <paragraph xml-lang="en-US" id="par_id0915200910571516" role="paragraph" l10n="NEW">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph> - <paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph> - <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph> - <paragraph xml-lang="en-US" id="hd_id2929166" role="heading" level="2" l10n="NEW">Editing comments</paragraph> - <paragraph xml-lang="en-US" id="par_id5201879" role="paragraph" l10n="NEW">Every user with write permission to the document can edit and delete comments of all authors.</paragraph> - <paragraph xml-lang="en-US" id="par_id2571794" role="paragraph" l10n="NEW">The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments.</paragraph> + +<section id="comment"> + +<paragraph id="hd_id3154100" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/04050000.xhp">Comment</link></paragraph> +<paragraph id="par_id3151100" role="paragraph" xml-lang="en-US"><variable id="notizbearbeitentext"><ahelp hid=".">Inserts a comment around the selected text or at the current cursor position.</ahelp></variable></paragraph> +</section> + +<section id="howtoget"> +<embed href="text/shared/00/00000404.xhp#notiz"/> +</section> + +<paragraph id="hd_id9851680" role="heading" level="2" xml-lang="en-US">Inserting comments</paragraph><comment>issue 113019 112000</comment> +<paragraph id="par_id1830500" role="paragraph" xml-lang="en-US">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option +</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+C key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box. If a text range is selected, the comment is attached to the text range.</paragraph> +<paragraph id="par_id0915200910571516" role="paragraph" xml-lang="en-US">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph> +<paragraph id="par_id1831" role="paragraph" xml-lang="en-US">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph> +<paragraph id="par_id6718649" role="paragraph" xml-lang="en-US">The comments by different authors get different colors. Choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item> +</caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph> + +<paragraph id="hd_id2929166" role="heading" level="2" xml-lang="en-US">Editing comments</paragraph> +<paragraph id="par_id5201879" role="paragraph" xml-lang="en-US">Every user with write permission to the document can edit and delete comments of all authors.</paragraph> +<paragraph id="par_id2571794" role="paragraph" xml-lang="en-US">The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments.</paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:DeleteNote" id="bm_id0429200810584478" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:DeleteNote" id="bm_id0915200910461391" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAnnotation" id="bm_id0915200910464881" localize="false"/> -<paragraph xml-lang="en-US" id="par_id0522200809383431" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete the current comment.</ahelp></paragraph> +<paragraph id="par_id0522200809383431" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete the current comment.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAuthor" id="bm_id0429200810592549" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllAnnotationByAuthor" id="bm_id0915200910471559" localize="false"/> -<paragraph xml-lang="en-US" id="par_id0522200809383485" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all comments by this author in the current document.</ahelp></paragraph> +<paragraph id="par_id0522200809383485" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete all comments by this author in the current document.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllNotes" id="bm_id0429200810593994" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllAnnotation" id="bm_id0915200910474796" localize="false"/> -<paragraph xml-lang="en-US" id="par_id0522200809383428" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all comments in the current document.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="par_id1857051" role="paragraph" l10n="NEW"><ahelp hid=".">Choose a command to delete the current comment, or all comments from the same author as the current comment, or all comments in the document.</ahelp></paragraph><comment>22500 shown for Reply, which is the same as Delete.</comment> -<paragraph xml-lang="en-US" id="par_id0305200911090684" role="paragraph" l10n="NEW">If the comment in a text document was written by another author, there is a Reply command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments command</comment> +<paragraph id="par_id0522200809383428" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete all comments in the current document.</ahelp></paragraph> +<paragraph id="par_id1857051" role="paragraph" xml-lang="en-US"><ahelp hid=".">Choose a command to delete the current comment, or all comments from the same author as the current comment, or all comments in the document.</ahelp></paragraph><comment>22500 shown for Reply, which is the same as Delete.</comment> +<paragraph id="par_id0305200911090684" role="paragraph" xml-lang="en-US">If the comment in a text document was written by another author, there is a Reply command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments command</comment> <bookmark xml-lang="en-US" branch="hid/.uno:ShowAnnotations" id="bm_id0804200803411260" localize="false"/> -<paragraph xml-lang="en-US" id="par_id0804200803435883" role="paragraph" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Comments</item> to show or hide all comments (not available in Calc).</ahelp></paragraph> - <paragraph xml-lang="en-US" id="par_id0302200901430918" role="paragraph" l10n="NEW">In the Find & Replace dialog of text documents, you can select to include the comments texts in your searches.</paragraph> - <paragraph xml-lang="en-US" id="hd_id3445539" role="heading" level="2" l10n="NEW">Navigating from comment to comment in text documents</paragraph> - <paragraph xml-lang="en-US" id="par_id4271370" role="paragraph" l10n="NEW">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option -</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC">Command+Option +<paragraph id="par_id0804200803435883" role="paragraph" xml-lang="en-US"><ahelp hid=".">Use <item type="menuitem">View - Comments</item> to show or hide all comments (not available in Calc).</ahelp></paragraph> +<paragraph id="par_id0302200901430918" role="paragraph" xml-lang="en-US">In the Find & Replace dialog of text documents, you can select to include the comments texts in your searches.</paragraph> + +<paragraph id="hd_id3445539" role="heading" level="2" xml-lang="en-US">Navigating from comment to comment in text documents</paragraph> +<paragraph id="par_id4271370" role="paragraph" xml-lang="en-US">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option +</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC">Command+Option </caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Up to jump to the previous comment.</paragraph> - <paragraph xml-lang="en-US" id="par_id2116153" role="paragraph" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one comment anchor to the next comment anchor.</paragraph> - <paragraph xml-lang="en-US" id="par_id5381328" role="tip" l10n="NEW">You can also open the Navigator to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment.</paragraph> - <paragraph xml-lang="en-US" id="hd_id5664235" role="heading" level="2" l10n="NEW">Printing comments</paragraph> - <paragraph xml-lang="en-US" id="par_id2254402" role="paragraph" l10n="NEW">To change the printing option for comments for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph> - <paragraph xml-lang="en-US" id="hd_id0915200910571612" role="heading" level="2" l10n="NEW">Comments in spreadsheets</paragraph> - <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="6">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph> - <paragraph xml-lang="en-US" id="par_id8336741" role="paragraph" l10n="NEW">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment (do not double-click the text).</paragraph> - <paragraph xml-lang="en-US" id="par_id3155390" role="paragraph" l10n="CHG" oldref="7">To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, right-click in the cell that contains the comment, and then choose <emph>Edit Comment</emph>. To specify the formatting of the comment text, right-click the comment text in edit mode.</paragraph> - <paragraph xml-lang="en-US" id="par_idN107A1" role="paragraph" l10n="NEW">To change the position or size of a comment, drag a border or corner of the comment.</paragraph> - <paragraph xml-lang="en-US" id="par_id9499496" role="paragraph" l10n="NEW">To delete a comment, right-click the cell, then choose <emph>Delete Comment</emph>.</paragraph> - <paragraph xml-lang="en-US" id="par_id2036805" role="paragraph" l10n="NEW">You can also right-click a comment name in the Navigator window to choose some editing commands.</paragraph> - <paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="U" oldref="8">To set the printing options for comments in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph> - <paragraph xml-lang="en-US" id="par_id2419507" role="note" l10n="NEW">In Impress, you can choose to use the Notes view to write a page of notes for every slide. Additionally, you can insert comments to your slides. </paragraph> - </body> +<paragraph id="par_id2116153" role="paragraph" xml-lang="en-US">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one comment anchor to the next comment anchor.</paragraph> +<paragraph id="par_id5381328" role="tip" xml-lang="en-US">You can also open the Navigator to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment.</paragraph> + +<paragraph id="hd_id5664235" role="heading" level="2" xml-lang="en-US">Printing comments</paragraph> +<paragraph id="par_id2254402" role="paragraph" xml-lang="en-US">To change the printing option for comments for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph> + +<paragraph id="hd_id0915200910571612" role="heading" level="2" xml-lang="en-US">Comments in spreadsheets</paragraph> +<paragraph id="par_id3166460" role="paragraph" xml-lang="en-US">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph> +<paragraph id="par_id8336741" role="paragraph" xml-lang="en-US">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment (do not double-click the text).</paragraph> +<paragraph id="par_id3155390" role="paragraph" xml-lang="en-US">To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, right-click in the cell that contains the comment, and then choose <emph>Edit Comment</emph>. To specify the formatting of the comment text, right-click the comment text in edit mode.</paragraph> +<paragraph id="par_idN107A1" role="paragraph" xml-lang="en-US">To change the position or size of a comment, drag a border or corner of the comment.</paragraph> +<paragraph id="par_id9499496" role="paragraph" xml-lang="en-US">To delete a comment, right-click the cell, then choose <emph>Delete Comment</emph>.</paragraph> +<paragraph id="par_id2036805" role="paragraph" xml-lang="en-US">You can also right-click a comment name in the Navigator window to choose some editing commands.</paragraph> +<paragraph id="par_id3153716" role="paragraph" xml-lang="en-US">To set the printing options for comments in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph> +<paragraph id="par_id2419507" role="note" xml-lang="en-US">In Impress, you can choose to use the Notes view to write a page of notes for every slide. Additionally, you can insert comments to your slides. </paragraph> +</body> + </helpdocument>
\ No newline at end of file diff --git a/source/text/shared/01/04100000.xhp b/source/text/shared/01/04100000.xhp index 2fcf0d4cbd..09f865d6d4 100644 --- a/source/text/shared/01/04100000.xhp +++ b/source/text/shared/01/04100000.xhp @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - - +<helpdocument version="1.0"> <!-- * This file is part of the LibreOffice project. * @@ -17,42 +16,50 @@ * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - -<helpdocument version="1.0"> +--> + <meta> -<topic id="textshared0104100000xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Special Character</title> -<filename>/text/shared/01/04100000.xhp</filename> -</topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -</history> + <topic id="textshared0104100000xml" indexer="include" status="PUBLISH"> + <title id="tit" xml-lang="en-US">Special Character</title> + <filename>/text/shared/01/04100000.xhp</filename> + </topic> </meta> + <body> + + +<section id="special_char"> <bookmark xml-lang="en-US" branch="hid/.uno:InsertSymbol" id="bm_id1495830" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:Bullet" id="bm_id3146902" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/specialcharacters/SpecialCharactersDialog" id="bm_id3146903" localize="false"/> -<paragraph role="heading" id="hd_id3152937" xml-lang="en-US" level="1" l10n="U" oldref="1">Special Character</paragraph> -<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="sonder"><ahelp hid=".uno:Bullet">Inserts special characters from the installed fonts.</ahelp> -</variable></paragraph> + +<paragraph id="hd_id3152937" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/04100000.xhp">Special Character</link></paragraph> +<paragraph id="par_id3150838" role="paragraph" xml-lang="en-US"><variable id="sonder"><ahelp hid=".">Allows a user to insert characters from the range of symbols found in the installed fonts.</ahelp> </variable></paragraph> +</section> + <section id="howtoget"> - <embed href="text/shared/00/00000404.xhp#sonder"/> +<embed href="text/shared/00/00000404.xhp#sonder"/> </section> -<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="11">When you click a character in the <emph>Special Characters </emph>dialog, a preview and the corresponding numerical code for the character is displayed.</paragraph> +<paragraph id="par_id3152372" role="paragraph" xml-lang="en-US">When you click a character in the <emph>Special Characters </emph>dialog, a preview and the corresponding numerical code for the character is displayed.</paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/specialcharacters/fontlb" id="bm_id3153910" localize="false"/> -<paragraph role="heading" id="hd_id3151315" xml-lang="en-US" level="2" l10n="U" oldref="3">Font</paragraph> -<paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="cui/ui/specialcharacters/fontlb">Select a font to display the special characters that are associated with it.</ahelp></paragraph> + +<paragraph id="hd_id3151315" role="heading" level="2" xml-lang="en-US">Font</paragraph> +<paragraph id="par_id3152924" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/specialcharacters/fontlb">Select a font to display the special characters that are associated with it.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/specialcharacters/subsetlb" id="bm_id3147292" localize="false"/> -<paragraph role="heading" id="hd_id3155555" xml-lang="en-US" level="2" l10n="U" oldref="19">Subset</paragraph> -<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="cui/ui/specialcharacters/subsetlb">Select a Unicode category for the current font.</ahelp> The special characters for the selected Unicode category are displayed in the character table.</paragraph> + +<paragraph id="hd_id3155555" role="heading" level="2" xml-lang="en-US">Subset</paragraph> +<paragraph id="par_id3145090" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/specialcharacters/subsetlb">Select a Unicode category for the current font.</ahelp> The special characters for the selected Unicode category are displayed in the character table.</paragraph> <bookmark xml-lang="en-US" branch="hid/CUI_HID_CHARMAP_CTL_SHOWSET" id="bm_id3147576" localize="false"/> -<paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="5">Character Table</paragraph> -<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_CHARMAP_CTL_SHOWSET">Click the special character(s) that you want to insert, and then click <emph>OK</emph>.</ahelp></paragraph> -<paragraph role="heading" id="hd_id3154317" xml-lang="en-US" level="2" l10n="U" oldref="7">Characters</paragraph> -<paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="8">Displays the special characters to be inserted. Edit this field if you want to change the current selection of characters.</paragraph> + +<paragraph id="hd_id3145071" role="heading" level="2" xml-lang="en-US">Character Table</paragraph> +<paragraph id="par_id3154288" role="paragraph" xml-lang="en-US"><ahelp hid="HID_CHARMAP_CTL_SHOWSET">Click the special character(s) that you want to insert, and then click <emph>OK</emph>.</ahelp></paragraph> + +<paragraph id="hd_id3154317" role="heading" level="2" xml-lang="en-US">Characters</paragraph> +<paragraph id="par_id3152551" role="paragraph" xml-lang="en-US">Displays the special characters to be inserted. Edit this field if you want to change the current selection of characters.</paragraph> + <section id="relatedtopics"> <embed href="text/shared/guide/insert_specialchar.xhp#insert_specialchar"/> </section> </body> -</helpdocument> + +</helpdocument>
\ No newline at end of file diff --git a/source/text/shared/01/04140000.xhp b/source/text/shared/01/04140000.xhp index 35928a1ec4..954061985e 100644 --- a/source/text/shared/01/04140000.xhp +++ b/source/text/shared/01/04140000.xhp @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - - +<helpdocument version="1.0"> <!-- * This file is part of the LibreOffice project. * @@ -17,39 +16,43 @@ * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - -<helpdocument version="1.0"> +--> + <meta> -<topic id="textshared0104140000xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Inserting Pictures</title> -<filename>/text/shared/01/04140000.xhp</filename> -</topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -</history> + <topic id="textshared0104140000xml" indexer="include" status="PUBLISH"> + <title id="tit" xml-lang="en-US">Inserting Pictures</title> + <filename>/text/shared/01/04140000.xhp</filename> + </topic> </meta> + <body> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertGraphic" id="bm_id9945896" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/.uno:InsertGraphic" id="bm_id3150278" localize="false"/> -<paragraph role="heading" id="hd_id3154350" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/04140000.xhp" name="Inserting Pictures">Inserting Pictures</link></paragraph> -<paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="grafiktext"><ahelp hid=".uno:InsertGraphic">Inserts a picture into the current document.</ahelp> -</variable></paragraph> + +<paragraph id="hd_id3154350" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/04140000.xhp" name="Inserting Images">Inserting Images</link></paragraph> +<paragraph id="par_id3159411" role="paragraph" xml-lang="en-US"><variable id="image_text"><variable id="grafiktext"><ahelp hid=".uno:InsertGraphic">Inserts an image into the current document <switchinline select="appl"><caseinline select="WRITER">with optimal page wrapping and centered on the line +</caseinline><caseinline select="CALC">at the current cell position +</caseinline><defaultinline>centered on the page or slide</defaultinline></switchinline>.</ahelp></variable></variable></paragraph> + <section id="howtoget"> - <embed href="text/shared/00/00000404.xhp#grafik"/> +<embed href="text/shared/00/00000404.xhp#grafik"/> </section> <embed href="text/shared/guide/insert_bitmap.xhp#insert_bitmap"/> <bookmark xml-lang="en-US" branch="hid/SVT_HID_FILEOPEN_IMAGE_TEMPLATE" id="bm_id3150902" localize="false"/> -<paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="2" l10n="U" oldref="17">Frame Style</paragraph> -<paragraph role="paragraph" id="par_id3154398" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_FILEOPEN_IMAGE_TEMPLATE">Select the frame style for the graphic.</ahelp></paragraph> + +<paragraph id="hd_id3149760" role="heading" level="2" xml-lang="en-US">Frame Style</paragraph> +<paragraph id="par_id3154398" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FILEOPEN_IMAGE_TEMPLATE">Select the frame style for the graphic.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/SVX_HID_OFA_HYPERLINK_URL_TXT" id="bm_id3157991" localize="false"/> <bookmark xml-lang="en-US" branch="hid/SVT_HID_FILEDLG_LINK_CB" id="bm_id3152542" localize="false"/> -<paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="2" l10n="U" oldref="6">Link</paragraph> -<paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_FILEDLG_LINK_CB">Inserts the selected graphic file as a link.</ahelp></paragraph> + +<paragraph id="hd_id3150789" role="heading" level="2" xml-lang="en-US">Link</paragraph> +<paragraph id="par_id3153750" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FILEDLG_LINK_CB">Inserts the selected graphic file as a link.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/HID_IMPGRF_CB_PREVIEW" id="bm_id3148548" localize="false"/> <bookmark xml-lang="en-US" branch="hid/SVT_HID_FILEDLG_PREVIEW_CB" id="bm_id3147043" localize="false"/> -<paragraph role="heading" id="hd_id3155805" xml-lang="en-US" level="2" l10n="U" oldref="8">Preview</paragraph> -<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_FILEDLG_PREVIEW_CB">Displays a preview of the selected graphic file.</ahelp></paragraph> + +<paragraph id="hd_id3155805" role="heading" level="2" xml-lang="en-US">Preview</paragraph> +<paragraph id="par_id3153311" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FILEDLG_PREVIEW_CB">Displays a preview of the selected graphic file.</ahelp></paragraph> <embed href="text/shared/00/00000001.xhp#vorschau"/> </body> + </helpdocument> diff --git a/source/text/shared/01/04150000.xhp b/source/text/shared/01/04150000.xhp index 81ca691917..875166857a 100644 --- a/source/text/shared/01/04150000.xhp +++ b/source/text/shared/01/04150000.xhp @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - <!-- * This file is part of the LibreOffice project. * @@ -17,37 +16,49 @@ * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - - +--> + <meta> - <topic id="textshared0104150000xml" indexer="include" status="PUBLISH"> - <title xml-lang="en-US" id="tit">Drawing Object</title> - <filename>/text/shared/01/04150000.xhp</filename> - </topic> - </meta> - <body> - <section id="objekt"> + <topic id="textshared0104150000xml" indexer="include" status="PUBLISH"> + <title id="tit" xml-lang="en-US">Object</title> + <filename>/text/shared/01/04150000.xhp</filename> + </topic> +</meta> + +<body> + + +<section id="object_submenu"> + +<section id="objekt"> <bookmark xml-lang="en-US" branch="hid/.uno:ObjectMenu" id="bm_id2569353" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="CHG" - oldref="1"><link href="text/shared/01/04150000.xhp" name="Drawing Object">Drawing Object</link></paragraph> - <paragraph xml-lang="en-US" id="par_id3159079" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Inserts an object into your document. For movies and sounds, use <emph>Insert - Media - Audio or Video</emph> instead.</ahelp></paragraph> - </section> - <section id="howtoget"> - <embed href="text/shared/00/00000404.xhp#objekteinf"/> - </section> - <paragraph xml-lang="en-US" id="hd_id3154894" role="heading" level="2" l10n="U" oldref="8"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></paragraph> - <embed href="text/shared/01/04150100.xhp#ole"/> - <paragraph xml-lang="en-US" id="hd_id3159201" role="heading" level="2" l10n="U" oldref="6"><link href="text/shared/01/04150400.xhp" name="Audio">Audio</link></paragraph> - <embed href="text/shared/01/04150400.xhp#klang"/> - <paragraph xml-lang="en-US" id="hd_id3157896" role="heading" level="2" l10n="U" oldref="7"><link href="text/shared/01/04150500.xhp" name="Video">Video</link></paragraph> - <embed href="text/shared/01/04150500.xhp#video"/><comment>removed Insert Applet link</comment> -<paragraph xml-lang="en-US" id="hd_id3153577" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/01/04160300.xhp" name="Formula">Formula</link></paragraph> - <embed href="text/shared/01/04160300.xhp#starmath"/> - <paragraph xml-lang="en-US" id="hd_id3152552" role="heading" level="2" l10n="U" - oldref="10"><switchinline select="appl"><caseinline select="WRITER"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link> -</caseinline></switchinline></paragraph> - <paragraph xml-lang="en-US" id="par_id0302200903593543" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="WRITER">Inserts a chart. -</caseinline></switchinline></paragraph> - </body> + +<paragraph id="hd_id3146873" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/04150000.xhp" name="Object">Object</link></paragraph> +<paragraph id="par_id3159079" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts an embedded object into your document, including formulas, 3D models, charts and OLE objects.</ahelp></paragraph> +</section> +</section> + +<section id="howtoget"> +<embed href="text/shared/00/00000404.xhp#objekteinf"/> +</section> + +<paragraph id="hd_id3153577" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/04160300.xhp" name="Formula">Formula</link></paragraph> +<embed href="text/shared/01/04160300.xhp#starmath"/> +<switch select="appl"> +<case select="CALC"> + +<paragraph id="par_id030420161017343575" role="heading" level="2" xml-lang="en-US">Chart From File</paragraph> +<paragraph id="par_id030420161036124113" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:InsertObjectChartFromFile">Inserts a chart from within another spreadsheet or from an ODF Chart file (*.odc).</ahelp></paragraph> +</case> +<case select="IMPRESS"> + +<paragraph id="par_id030420161017345031" role="heading" level="2" xml-lang="en-US">3D Model</paragraph> +<paragraph id="par_id03042016103612802" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:Insert3DModel">Inserts a 3D models in the glTF format. This option is currently only available for Windows and Linux.</ahelp></paragraph> +</case> +</switch> + +<paragraph id="hd_id3154894" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></paragraph> +<embed href="text/shared/01/04150100.xhp#ole"/> +</body> + </helpdocument>
\ No newline at end of file diff --git a/source/text/shared/01/04160500.xhp b/source/text/shared/01/04160500.xhp index 09b5270831..b8b1270010 100644 --- a/source/text/shared/01/04160500.xhp +++ b/source/text/shared/01/04160500.xhp @@ -33,11 +33,9 @@ <bookmark xml-lang="en-US" branch="index" id="bm_id3149783"><bookmark_value>floating frames in HTML documents</bookmark_value> <bookmark_value>inserting; floating frames</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectFloatingFrame" id="bm_id9760166" localize="false"/><!-- HID added by script --> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectFloatingFrame" id="bm_id3153136" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectFloatingFrame" id="bm_id9760166" localize="false"/> <paragraph role="heading" id="hd_id3149783" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Floating Frame</paragraph> -<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="frameeinfuegentext"><ahelp hid=".">Inserts a floating frame into the current document. Floating frames are used in HTML documents to display the contents of another file.</ahelp> -</variable></paragraph> +<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="floating_frame_text"><variable id="frameeinfuegentext"><ahelp hid=".">Inserts a floating frame into the current document. Floating frames are used in HTML documents to display the contents of another file.</ahelp></variable></variable></paragraph> <section id="howtoget"> <embed href="text/shared/00/00000404.xhp#eiobframe"/> </section> diff --git a/source/text/shared/01/04990000.xhp b/source/text/shared/01/04990000.xhp index 9fe77b9111..c2c2ca9e6f 100644 --- a/source/text/shared/01/04990000.xhp +++ b/source/text/shared/01/04990000.xhp @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - - +<helpdocument version="1.0"> <!-- * This file is part of the LibreOffice project. * @@ -17,26 +16,30 @@ * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - -<helpdocument version="1.0"> +--> + <meta> -<topic id="textshared0104990000xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Picture</title> -<filename>/text/shared/01/04990000.xhp</filename> -</topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -</history> + <topic id="textshared0104990000xml" indexer="include" status="PUBLISH"> + <title id="tit" xml-lang="en-US">Media</title> + <filename>/text/shared/01/04990000.xhp</filename> + </topic> </meta> + <body> + + +<section id="media_submenu"> + <section id="grafik"> <bookmark xml-lang="en-US" branch="hid/.uno:GraphicMenu" id="bm_id1919919" localize="false"/> -<paragraph role="heading" id="hd_id3156045" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/04990000.xhp" name="Picture">Picture</link></paragraph> -<paragraph role="paragraph" id="par_id3154613" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Select the source for a picture that you want to insert.</ahelp></paragraph> + +<paragraph id="hd_id3156045" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/04990000.xhp" name="media">Media</link></paragraph> +<paragraph id="par_id3154613" role="paragraph" xml-lang="en-US"><ahelp hid=".">The submenu presents various sources that an image, audio or video can be insert from.</ahelp></paragraph> +</section> </section> -<paragraph role="heading" id="hd_id3158442" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/04140000.xhp" name="From File">From File</link></paragraph> -<embed href="text/shared/01/04140000.xhp#grafiktext"/> +<embed href="text/shared/01/gallery.xhp#stargallery"/> <embed href="text/shared/01/04060000.xhp#scannen"/> +<embed href="text/shared/01/moviesound.xhp#moviesound"/> </body> -</helpdocument> + +</helpdocument>
\ No newline at end of file diff --git a/source/text/shared/01/formatting_mark.xhp b/source/text/shared/01/formatting_mark.xhp index 78aae75530..a358e5a9b7 100644 --- a/source/text/shared/01/formatting_mark.xhp +++ b/source/text/shared/01/formatting_mark.xhp @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - <!-- * This file is part of the LibreOffice project. * @@ -17,45 +16,57 @@ * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - - +--> + <meta> - <topic id="textshared01formatting_markxhp" indexer="include"> - <title xml-lang="en-US" id="tit">Formatting Mark </title> - <filename>/text/shared/01/formatting_mark.xhp</filename> - </topic> - </meta> - <body> - <section id="formatting_mark"> + <topic id="textshared01formatting_markxhp" indexer="include"> + <title id="tit" xml-lang="en-US">Formatting Mark </title> + <filename>/text/shared/01/formatting_mark.xhp</filename> + </topic> +</meta> + +<body> + + +<section id="formatting_mark"> <bookmark xml-lang="en-US" branch="hid/.uno:FormattingMarkMenu" id="bm_id7235023" localize="false"/> -<bookmark xml-lang="en-US" branch="index" id="bm_id9930722"><bookmark_value>CTL;(not) wrapping words</bookmark_value> - <bookmark_value>words;wrapping in CTL</bookmark_value> -</bookmark><comment>MW added 2 index entries because of issue 86750</comment><comment>tried to fix i86464 by creating a new file, copy everything over, then save & overwrite as formatting_mark.xhp</comment><comment>but this did not help</comment> -<paragraph xml-lang="en-US" id="hd_id030220091035120" role="heading" level="1" l10n="NEW"><variable id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting Mark</link> -</variable></paragraph> - <paragraph xml-lang="en-US" id="par_id0302200910351248" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu to insert special formatting marks. Enable CTL for more commands.</ahelp></paragraph> - </section> +<bookmark xml-lang="en-US" branch="index" id="bm_id9930722"> + <bookmark_value>CTL;(not) wrapping words</bookmark_value> + <bookmark_value>words;wrapping in CTL</bookmark_value> +</bookmark> +<comment>MW added 2 index entries because of issue 86750</comment><comment>tried to fix i86464 by creating a new file, copy everything over, then save & overwrite as formatting_mark.xhp</comment><comment>but this did not help</comment> + +<paragraph id="hd_id030220091035120" role="heading" level="1" xml-lang="en-US"><variable id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting Mark</link> </variable></paragraph> +<paragraph id="par_id0302200910351248" role="paragraph" xml-lang="en-US"><ahelp hid=".">Opens a submenu to insert special formatting marks like non-breaking space, soft hyphen, and optional break.</ahelp></paragraph> +</section> <bookmark xml-lang="en-US" branch="hid/.uno:InsertNonBreakingSpace" id="bm_id2567217" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id9996948" role="heading" level="2" l10n="NEW">Non-breaking space</paragraph> - <paragraph xml-lang="en-US" id="par_id8326975" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a space that will keep bordering characters together on line breaks.</ahelp></paragraph> + +<paragraph id="hd_id9996948" role="heading" level="2" xml-lang="en-US">Non-breaking space</paragraph> +<paragraph id="par_id8326975" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts a space that will keep bordering characters together on line breaks.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:InsertHardHyphen" id="bm_id6757713" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id6383556" role="heading" level="2" l10n="NEW">Non-breaking hyphen</paragraph> - <paragraph xml-lang="en-US" id="par_id8469191" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a hyphen that will keep bordering characters together on line breaks.</ahelp></paragraph> + +<paragraph id="hd_id6383556" role="heading" level="2" xml-lang="en-US">Non-breaking hyphen</paragraph> +<paragraph id="par_id8469191" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts a hyphen that will keep bordering characters together on line breaks.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:InsertSoftHyphen" id="bm_id8669698" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3306680" role="heading" level="2" l10n="NEW">Soft hyphen</paragraph> - <paragraph xml-lang="en-US" id="par_id9407330" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible hyphen within a word that will appear and create a line break once it becomes the last character in a line.</ahelp></paragraph> + +<paragraph id="hd_id3306680" role="heading" level="2" xml-lang="en-US">Soft hyphen</paragraph> +<paragraph id="par_id9407330" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts an invisible optional hyphen within a word that will appear and create a line break once it becomes the last character in a line.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:InsertZWSP" id="bm_id1068758" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id2295907" role="heading" level="2" l10n="NEW">No-width optional break</paragraph> - <paragraph xml-lang="en-US" id="par_id1536301" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will insert a line break once it becomes the last character in a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph> + +<paragraph id="hd_id2295907" role="heading" level="2" xml-lang="en-US">No-width optional break</paragraph> +<paragraph id="par_id1536301" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts an invisible space within a word that will insert a line break once it becomes the last character in a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:InsertZWNBSP" id="bm_id8484450" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3245643" role="heading" level="2" l10n="NEW">No-width no break</paragraph> - <paragraph xml-lang="en-US" id="par_id1085238" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will keep the word together at the end of a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph> + +<paragraph id="hd_id3245643" role="heading" level="2" xml-lang="en-US">No-width no break</paragraph> +<paragraph id="par_id1085238" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts an invisible space within a word that will keep the word together at the end of a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:InsertLRM" id="bm_id714743" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id4634540" role="heading" level="2" l10n="NEW">Left-to-right mark</paragraph> - <paragraph xml-lang="en-US" id="par_id6690878" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph> + +<paragraph id="hd_id4634540" role="heading" level="2" xml-lang="en-US">Left-to-right mark</paragraph> +<paragraph id="par_id6690878" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:InsertRLM" id="bm_id3938413" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id9420148" role="heading" level="2" l10n="NEW">Right-to-left mark</paragraph> - <paragraph xml-lang="en-US" id="par_id923184" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph> - </body> -</helpdocument> + +<paragraph id="hd_id9420148" role="heading" level="2" xml-lang="en-US">Right-to-left mark</paragraph> +<paragraph id="par_id923184" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph> +</body> + +</helpdocument>
\ No newline at end of file diff --git a/source/text/shared/02/01140000.xhp b/source/text/shared/02/01140000.xhp index 7ec05b7126..2496689bfc 100644 --- a/source/text/shared/02/01140000.xhp +++ b/source/text/shared/02/01140000.xhp @@ -87,9 +87,7 @@ </table> <bookmark xml-lang="en-US" branch="hid/.uno:Line" id="bm_id9304767" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:Line" id="bm_id3155449" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3143270" role="heading" level="2" l10n="U" - oldref="13">Line</paragraph> +<paragraph xml-lang="en-US" id="hd_id3143270" role="heading" level="2" l10n="U" oldref="13"><variable id="line_title">Line</variable></paragraph> <table id="tbl_id3150275"> <tablerow> <tablecell> @@ -98,7 +96,7 @@ </image></paragraph> </tablecell> <tablecell> - <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="64"><ahelp hid=".uno:Line">Draws a straight line where you drag in the current document. To constrain the line to 45 degrees, hold down Shift while you drag.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="64"><variable id="line_text"><ahelp hid=".uno:Line">Draws a straight line where you drag in the current document. To constrain the line to 45 degrees, hold down Shift while you drag.</ahelp></variable></paragraph> </tablecell> </tablerow> </table> @@ -249,9 +247,7 @@ </table> <bookmark xml-lang="en-US" branch="hid/.uno:DrawText" id="bm_id8730699" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:DrawText" id="bm_id3147321" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U" - oldref="36">Text</paragraph> +<paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U" oldref="36"><variable id="textbox_title">Text Box</variable></paragraph> <table id="tbl_id3150297"> <tablerow> <tablecell> @@ -260,7 +256,7 @@ </image></paragraph> </tablecell> <tablecell> - <paragraph xml-lang="en-US" id="par_id3154657" role="paragraph" l10n="CHG" oldref="69"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id3154657" role="paragraph" l10n="CHG" oldref="69"><variable id="textbox_text"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></variable></paragraph> </tablecell> </tablerow> </table> @@ -363,4 +359,4 @@ <paragraph xml-lang="en-US" id="par_id3155555" role="paragraph" l10n="CHG" oldref="74"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Tips">Tips for working with the <emph>Drawing </emph>bar.</link></paragraph> </section> </body> -</helpdocument>
\ No newline at end of file +</helpdocument> diff --git a/source/text/shared/02/fontwork.xhp b/source/text/shared/02/fontwork.xhp index 027cc0ce52..86d8d54166 100644 --- a/source/text/shared/02/fontwork.xhp +++ b/source/text/shared/02/fontwork.xhp @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - - +<helpdocument version="1.0"> <!-- * This file is part of the LibreOffice project. * @@ -17,35 +16,36 @@ * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - -<helpdocument version="1.0"> +--> + <meta> -<topic id="textshared02fontworkxhp" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Fontwork Gallery</title> -<filename>/text/shared/02/fontwork.xhp</filename> -</topic> -<history> -<created date="2004-09-28T09:26:19">UFI: Fontwork Gallery icon</created> -</history> + <topic id="textshared02fontworkxhp" indexer="include" status="PUBLISH"> + <title id="tit" xml-lang="en-US">Fontwork</title> + <filename>/text/shared/02/fontwork.xhp</filename> + </topic> </meta> + <body> + + <section id="fontwork"> <bookmark xml-lang="en-US" branch="hid/.uno:FontworkGalleryFloater" id="bm_id7113864" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:FontworkGalleryFloater" id="bm_id4359569" localize="false"/> -<paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/02/fontwork.xhp">Fontwork Gallery</link></paragraph> -<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The icon opens the Fontwork Gallery from which you can insert graphical text art into your document.</ahelp></paragraph> + +<paragraph id="par_idN10557" role="heading" level="1" xml-lang="en-US"><link href="text/shared/02/fontwork.xhp">Fontwork</link></paragraph> +<paragraph id="par_idN10567" role="paragraph" xml-lang="en-US"><ahelp hid=".">Opens the Fontwork dialog from which you can insert styled text not possible through standard font formatting into your document.</ahelp></paragraph> </section> + <section id="howtoget"> <embed href="text/shared/00/00000404.xhp#syfontworkgallery"/> </section> -<paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">Fontwork Gallery</paragraph> -<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Fontwork Gallery displays previews of Fontwork objects. To insert an object into your document, select the object, and then click OK.</ahelp></paragraph> + +<paragraph id="par_idN10591" role="heading" level="2" xml-lang="en-US">Fontwork Gallery</paragraph> +<paragraph id="par_idN10595" role="paragraph" xml-lang="en-US"><ahelp hid=".">The Fontwork Gallery displays previews of Fontwork objects. To insert an object into your document, select the object, and then click OK.</ahelp></paragraph> + <section id="relatedtopics"> -<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="NEW" localize="false" > - <embedvar href="text/shared/guide/fontwork.xhp#fontwork"/> -</paragraph> -<paragraph role="paragraph" id="par_idN10623" xml-lang="en-US" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph> +<paragraph id="par_idN105AF" role="paragraph" localize="false" xml-lang="en-US"> <embedvar href="text/shared/guide/fontwork.xhp#fontwork"/> </paragraph> +<paragraph id="par_idN10623" role="paragraph" xml-lang="en-US"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph> </section> </body> + </helpdocument> diff --git a/source/text/shared/guide/chart_insert.xhp b/source/text/shared/guide/chart_insert.xhp index 0d87d6a5a4..9269e6de0d 100644 --- a/source/text/shared/guide/chart_insert.xhp +++ b/source/text/shared/guide/chart_insert.xhp @@ -75,7 +75,7 @@ <paragraph role="listitem" id="par_id428479" xml-lang="en-US" l10n="NEW">Click inside the Writer table. </paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id7236243" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Object - Chart</emph>.</paragraph> +<paragraph role="listitem" id="par_id7236243" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Chart</emph>.</paragraph> <paragraph role="paragraph" id="par_id6171452" xml-lang="en-US" l10n="NEW">You see a chart preview and the Chart Wizard.<comment>no live preview - is this a bug?</comment></paragraph> </listitem> <listitem> @@ -85,7 +85,7 @@ <paragraph role="heading" id="hd_id6436658" xml-lang="en-US" level="2" l10n="NEW">Chart based on values of its own</paragraph> <list type="unordered"> <listitem> -<paragraph role="listitem" id="par_id6944792" xml-lang="en-US" l10n="CHG">In Writer, if you have not selected any cells, choose <emph>Insert - Object - Chart</emph> to insert a chart with default data. In Draw or Impress, choose <emph>Insert - Chart</emph> to insert a chart based on default data.<comment>it is intended to unify this command position</comment></paragraph> +<paragraph role="listitem" id="par_id6944792" xml-lang="en-US" l10n="CHG">In Writer, Draw or Impress, choose <emph>Insert - Chart</emph> to insert a chart based on default data.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3152960" xml-lang="en-US" l10n="CHG" oldref="29">You can change the default data values by double-clicking on the chart and then choosing <link href="text/schart/01/03010000.xhp" name="View - Chart Data Table"><emph>View - Chart Data Table</emph></link>.</paragraph> diff --git a/source/text/shared/menu/insert_chart.xhp b/source/text/shared/menu/insert_chart.xhp new file mode 100644 index 0000000000..007be8f456 --- /dev/null +++ b/source/text/shared/menu/insert_chart.xhp @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<helpdocument version="1.0"> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . +--> + +<meta> + <topic id="textsharedmenuinsert_chartxml"> + <title id="tit" xml-lang="en-US">Chart</title> + <filename>/text/shared/menu/insert_chart.xhp</filename> + </topic> +</meta> + +<body> + + +<section id="chart"> +<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectChart" id="bm_id030420160952412994" localize="false"/> + +<paragraph id="hd_id030420160945436725" role="heading" level="1" xml-lang="en-US"><link href="text/shared/menu/insert_chart.xhp">Chart</link></paragraph> +<paragraph id="par_id030420160947559665" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts a chart based on data from a cell or table range or with default data.</ahelp></paragraph> +</section> + +<section id="relatedtopics"> +<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/> +<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/> +<embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/> +<embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/> +<embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/> +<embed href="text/shared/guide/chart_axis.xhp#chart_axis"/> +<embed href="text/shared/guide/chart_legend.xhp#chart_legend"/> +<embed href="text/shared/guide/chart_title.xhp#chart_title"/> +<embed href="text/shared/guide/chart_barformat.xhp#chart_barformat"/> +</section> +</body> + +</helpdocument>
\ No newline at end of file diff --git a/source/text/shared/menu/insert_form_control.xhp b/source/text/shared/menu/insert_form_control.xhp new file mode 100644 index 0000000000..896e6212bd --- /dev/null +++ b/source/text/shared/menu/insert_form_control.xhp @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<helpdocument version="1.0"> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . +--> + +<meta> + <topic id="textsharedmenuinsert_form_controlxml"> + <title id="tit" xml-lang="en-US">Form Control</title> + <filename>/text/shared/menu/insert_form_control.xhp</filename> + </topic> +</meta> + +<body> + + +<section id="form_control_submenu"> +<bookmark xml-lang="en-US" branch="hid/.uno:InsertFrameInteract" id="bm_id030720160612074867" localize="false"/> + +<paragraph id="hd_id030720160611303537" role="heading" level="1" xml-lang="en-US"><link href="text/shared/menu/insert_form_control.xhp">Form Control</link></paragraph> +<paragraph id="par_id03072016061205929" role="paragraph" xml-lang="en-US"><ahelp hid=".">This submenu contains form controls like a textbox, checkbox, option button, and listbox that can be inserted into the document.</ahelp></paragraph> +</section> +<paragraph id="par_id030720160612059047" role="paragraph" xml-lang="en-US"/> +</body> + +</helpdocument>
\ No newline at end of file diff --git a/source/text/shared/menu/insert_shape.xhp b/source/text/shared/menu/insert_shape.xhp new file mode 100644 index 0000000000..5bda079864 --- /dev/null +++ b/source/text/shared/menu/insert_shape.xhp @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<helpdocument version="1.0"> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . +--> + +<meta> + <topic id="textsharedmenuinsert_shapexml"> + <title id="tit" xml-lang="en-US">Shape</title> + <filename>/text/shared/menu/insert_shape.xhp</filename> + </topic> +</meta> + +<body> + + +<section id="shape_submenu"> +<bookmark xml-lang="en-US" branch="hid/.uno:ShapesMenu" id="bm_id030420161051536316" localize="false"/> + +<paragraph id="hd_id030420161043484643" role="heading" level="1" xml-lang="en-US"><link href="text/shared/menu/insert_shape.xhp">Shape</link></paragraph> +<paragraph id="par_id030420161051456436" role="paragraph" xml-lang="en-US"><ahelp hid=".">This submenu contains common shapes like a line, circle, triangle, and square, or a symbol shape like a smiley face, heart, and flower that can be inserted into the document.</ahelp></paragraph> +</section> +<bookmark xml-lang="en-US" branch="hid/.uno:ShapesLineMenu" id="bm_id03072016064620617" localize="false"/> + +<paragraph id="par_id030720160629548185" role="heading" level="2" xml-lang="en-US">Line</paragraph> +<paragraph id="par_id030720160640091844" role="paragraph" xml-lang="en-US"><ahelp hid=".">This submenu contains straight, freeform, curved and polygon line shapes.</ahelp></paragraph> + +<paragraph id="hd_id030720160823321429" role="heading" level="3" xml-lang="en-US"><link href="text/shared/02/01140000.xhp#line_title">Line</link></paragraph> +<embed href="text/shared/02/01140000.xhp#line_text"/> + +<paragraph id="par_id030720160629546864" role="heading" level="2" xml-lang="en-US">Basic</paragraph> +<paragraph id="par_id030720160644597415" role="paragraph" xml-lang="en-US">This submenu contains basic shapes like rectangles, circles, triangles, pentagon, octagon, pentagon, cylinder, and cube.</paragraph> + +<paragraph id="par_id030720160629547675" role="heading" level="2" xml-lang="en-US">Symbol</paragraph> +<paragraph id="par_id030720160644595417" role="paragraph" xml-lang="en-US">This submenu contains symbols shapes like smiley face, heart, sun, moon, flower, puzzle, beveled shapes, and brackets.</paragraph> +</body> + +</helpdocument>
\ No newline at end of file |