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/01/04150000.xhp | |
| parent | "embed" is not a valid child of "paragraph" (diff) | |
| download | help-17d37456a2c3e912a137b7af643de8aa4aa34bbb.tar.gz help-17d37456a2c3e912a137b7af643de8aa4aa34bbb.zip | |
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/01/04150000.xhp')
| -rw-r--r-- | source/text/shared/01/04150000.xhp | 75 |
1 files changed, 43 insertions, 32 deletions
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 |