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/menu | |
| 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/menu')
| -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 |
3 files changed, 143 insertions, 0 deletions
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 |