This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push: new 381b0f8e4c Rename taskpanel.xhp to sidebar.xhp in Impress Help. A Help file for the Sidebar should be added to the other modules, too 381b0f8e4c is described below commit 381b0f8e4c28fc89af4d8e6a0fdb6dfeb254998e Author: mseidel <msei...@apache.org> AuthorDate: Sat Jan 13 14:03:10 2024 +0100 Rename taskpanel.xhp to sidebar.xhp in Impress Help. A Help file for the Sidebar should be added to the other modules, too (cherry picked from commit 5023ae336f95d3d8c5be364cf2d34255a5ca3906) --- main/helpcontent2/source/text/shared/main0204.xhp | 2 +- .../source/text/simpress/00/00000403.xhp | 2 +- .../helpcontent2/source/text/simpress/01/makefile.mk | 14 ++++++-------- .../text/simpress/01/{taskpanel.xhp => sidebar.xhp} | 20 ++++++++++---------- main/helpcontent2/source/text/simpress/main0103.xhp | 2 +- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/main/helpcontent2/source/text/shared/main0204.xhp b/main/helpcontent2/source/text/shared/main0204.xhp index 03ac4f8f5e..be2e8ade40 100644 --- a/main/helpcontent2/source/text/shared/main0204.xhp +++ b/main/helpcontent2/source/text/shared/main0204.xhp @@ -65,7 +65,7 @@ <embed href="text/swriter/01/05120500.xhp#loeschentext"/> <embed href="text/swriter/00/00000405.xhp#syspalteloeschen"/> <comment>following only optional, ext.help is available: Select Table Select Column Select Row</comment> -<paragraph role="heading" id="hd_id3134447820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/01/taskpanel.xhp" name="Table Design">Table Design</link></paragraph> +<paragraph role="heading" id="hd_id3134447820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/01/sidebar.xhp" name="Table Design">Table Design</link></paragraph> <paragraph role="paragraph" id="par_id16200812240344" xml-lang="en-US" l10n="NEW">Opens the Table Design. Double-click a preview to insert a new table.<comment>Impress: Table Design tab page in Sidebar. Draw: Table Design dialog</comment></paragraph> <paragraph role="heading" id="hd_id947820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/01/05090000m.xhp" name="Table Properties">Table Properties</link></paragraph> diff --git a/main/helpcontent2/source/text/simpress/00/00000403.xhp b/main/helpcontent2/source/text/simpress/00/00000403.xhp index 1a59110bd3..ea8f0aa9fc 100644 --- a/main/helpcontent2/source/text/simpress/00/00000403.xhp +++ b/main/helpcontent2/source/text/simpress/00/00000403.xhp @@ -40,7 +40,7 @@ </section> <paragraph role="paragraph" id="par_id3146316" xml-lang="en-US" l10n="U" oldref="8"><variable id="quali">Choose <emph>View - Color/Grayscale</emph> </variable></paragraph> -<paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US" l10n="NEW"><variable id="taskpane">Choose <emph>View - Task Pane</emph> +<paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US" l10n="NEW"><variable id="sidebar">Choose <emph>View - Sidebar</emph> </variable></paragraph> <section id="aszng"> <paragraph role="paragraph" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="10">Choose <emph>View - Normal</emph> diff --git a/main/helpcontent2/source/text/simpress/01/makefile.mk b/main/helpcontent2/source/text/simpress/01/makefile.mk index 71431e70c8..3e67ddd03d 100644 --- a/main/helpcontent2/source/text/simpress/01/makefile.mk +++ b/main/helpcontent2/source/text/simpress/01/makefile.mk @@ -1,5 +1,5 @@ #************************************************************** -# +# # 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 @@ -7,20 +7,18 @@ # 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 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# #************************************************************** - - # edit to match directory level PRJ = ..$/..$/..$/.. # same for all makefiles in "helpcontent2" @@ -132,8 +130,8 @@ XHPFILES = \ effectoptionstext.xhp \ effectoptionstiming.xhp \ slidesorter.xhp \ - taskpanel.xhp - + sidebar.xhp + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/main/helpcontent2/source/text/simpress/01/taskpanel.xhp b/main/helpcontent2/source/text/simpress/01/sidebar.xhp similarity index 89% rename from main/helpcontent2/source/text/simpress/01/taskpanel.xhp rename to main/helpcontent2/source/text/simpress/01/sidebar.xhp index 6a01652ade..4cb160ad79 100644 --- a/main/helpcontent2/source/text/simpress/01/taskpanel.xhp +++ b/main/helpcontent2/source/text/simpress/01/sidebar.xhp @@ -23,24 +23,24 @@ <helpdocument version="1.0"> <meta> -<topic id="textsimpress01taskpanelxml" indexer="include"> -<title id="tit" xml-lang="en-US">Task Pane</title> -<filename>/text/simpress/01/taskpanel.xhp</filename> +<topic id="textsimpress01sidebarxml" indexer="include"> +<title id="tit" xml-lang="en-US">Sidebar</title> +<filename>/text/simpress/01/sidebar.xhp</filename> </topic> </meta> <body> -<section id="taskpanel"> +<section id="sidebar"> <bookmark xml-lang="en-US" branch="index" id="bm_id3274636"> -<bookmark_value>task pane</bookmark_value> +<bookmark_value>sidebar</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/.uno:RightPane" id="bm_id5609302" localize="false"/> -<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/simpress/01/taskpanel.xhp">Task Pane</link></paragraph> -<paragraph role="paragraph" id="par_idN10554" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the %PRODUCTNAME Impress task pane on and off.</ahelp></paragraph> +<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/simpress/01/sidebar.xhp">Sidebar</link></paragraph> +<paragraph role="paragraph" id="par_idN10554" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the %PRODUCTNAME Impress Sidebar on and off.</ahelp></paragraph> </section> <section id="howtoget"> -<embed href="text/simpress/00/00000403.xhp#taskpane"/> +<embed href="text/simpress/00/00000403.xhp#sidebar"/> </section> -<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="CHG">The task pane contains pages to specify the master pages, layouts, custom animation, and slide transition. Click another heading to open another page.</paragraph> +<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="CHG">The Sidebar contains pages to specify the master pages, layouts, custom animation, and slide transition. Click another heading to open another page.</paragraph> <section id="relatedtopics"> <paragraph role="paragraph" id="par_idN105D4" xml-lang="en-US" l10n="NEW"> <embedvar href="text/simpress/guide/masterpage.xhp#masterpage"/> @@ -75,7 +75,7 @@ <paragraph role="paragraph" id="par_idN10839" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Slide Transition tab page, where you apply transition effects to the selected slides.</ahelp></paragraph><comment>Table Design</comment> <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TABLE_DESIGN" id="bm_id0916200812145783" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:TableDesign" id="bm_id091620081221536" localize="false"/> -<paragraph role="paragraph" id="par_id0916200812240344" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Table Design. Double-click a preview to insert a new table.</ahelp><comment>Impress: Table Design tab page in task pane. +<paragraph role="paragraph" id="par_id0916200812240344" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Table Design. Double-click a preview to insert a new table.</ahelp><comment>Impress: Table Design tab page in Sidebar. Draw: Table Design dialog</comment></paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/simpress/main0103.xhp b/main/helpcontent2/source/text/simpress/main0103.xhp index f49c8fdea8..0ae9275bb9 100644 --- a/main/helpcontent2/source/text/simpress/main0103.xhp +++ b/main/helpcontent2/source/text/simpress/main0103.xhp @@ -42,7 +42,7 @@ <embed href="text/simpress/01/03120000.xhp#handzettel"/> <embed href="text/simpress/01/03150000.xhp#hintergrund"/> <embed href="text/simpress/01/03180000.xhp#anzeigequali"/> -<embed href="text/simpress/01/taskpanel.xhp#taskpanel"/> +<embed href="text/simpress/01/sidebar.xhp#sidebar"/> <embed href="text/simpress/01/slidesorter.xhp#slidesorter"/><comment>UFI: removed masterlayouts link</comment> <embed href="text/shared/01/03060000.xhp#taskleiste"/> <embed href="text/shared/01/03040000.xhp#ime"/>