AllLangHelp_simpress.mk | 1
source/text/shared/main0204.xhp | 20 ++++++-
source/text/simpress/00/00000405.xhp | 2
source/text/simpress/01/taskpanel.xhp | 78 ------------------------------
source/text/simpress/guide/masterpage.xhp | 16 +++++-
5 files changed, 33 insertions(+), 84 deletions(-)
New commits:
commit 599f664d48f995c461e06daf2295c1f9921fbcb8
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Fri Oct 14 14:29:59 2016 +0200
Format - Slide Design menu item is now Slide - Slide Master Design
Change-Id: I3a823853f513c66a4a5b66ed86d9201730d09c5e
Reviewed-on: https://gerrit.libreoffice.org/29821
Reviewed-by: Olivier Hallot <ohal...@collabora.co.uk>
Tested-by: Olivier Hallot <ohal...@collabora.co.uk>
diff --git a/source/text/simpress/00/00000405.xhp
b/source/text/simpress/00/00000405.xhp
index 6f4301e..c9b7809 100644
--- a/source/text/simpress/00/00000405.xhp
+++ b/source/text/simpress/00/00000405.xhp
@@ -47,7 +47,7 @@
</paragraph>
<paragraph role="paragraph" id="par_id3154765" xml-lang="en-US" l10n="U"
oldref="17">Choose <emph>Format - Layer</emph> (only $[officename]
Draw)</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3153012" xml-lang="en-US" l10n="CHG"
oldref="12"><variable id="seitenvorlage">Choose <emph>Format - Slide
Design</emph>
+<paragraph role="paragraph" id="par_id3153012" xml-lang="en-US" l10n="CHG"
oldref="12"><variable id="seitenvorlage">Choose <emph>Slide - Slide Master
Design</emph>
</variable></paragraph>
</body>
</helpdocument>
diff --git a/source/text/simpress/guide/masterpage.xhp
b/source/text/simpress/guide/masterpage.xhp
index d6546e3..8375168 100644
--- a/source/text/simpress/guide/masterpage.xhp
+++ b/source/text/simpress/guide/masterpage.xhp
@@ -41,7 +41,7 @@
<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3"
l10n="CHG" oldref="25">To apply a new slide master</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3154702" xml-lang="en-US" l10n="U"
oldref="19">Select <emph>Format - Slide Design</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154702" xml-lang="en-US" l10n="U"
oldref="19">Select <emph>Slide - Slide Master Design</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3148485" xml-lang="en-US" l10n="U"
oldref="20">Click <emph>Load</emph>.</paragraph>
commit cf275ebb3fd3535f191ed02632dae2d5d7950657
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Fri Oct 14 13:56:10 2016 +0200
Drop the obsolete Task Panes help
- Move the still used ahelp contents to masterpage.xhp
- Add description of the Table Design command directly to
the Table toolbars help page
Change-Id: I44f679a29fc26d4930ec91314022e890c3559e50
Reviewed-on: https://gerrit.libreoffice.org/29820
Reviewed-by: Olivier Hallot <ohal...@collabora.co.uk>
Tested-by: Olivier Hallot <ohal...@collabora.co.uk>
diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 78ce2d2..633fd53 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -120,7 +120,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
helpcontent2/source/text/simpress/01/effectoptionstext \
helpcontent2/source/text/simpress/01/effectoptionstiming \
helpcontent2/source/text/simpress/01/slidesorter \
- helpcontent2/source/text/simpress/01/taskpanel \
helpcontent2/source/text/simpress/02/04010000 \
helpcontent2/source/text/simpress/02/04020000 \
helpcontent2/source/text/simpress/02/04030000 \
diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp
index 5971517..d7068f5 100644
--- a/source/text/shared/main0204.xhp
+++ b/source/text/shared/main0204.xhp
@@ -63,9 +63,23 @@
<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="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 task pane.
-Draw: Table Design dialog</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:TableDesign"
id="bm_id091620081221536" localize="false"/>
+<paragraph role="heading" id="hd_id3134447820" xml-lang="en-US"
level="2">Table Design</paragraph>
+<paragraph role="paragraph" id="par_id16200812240344" xml-lang="en-US"
l10n="NEW"><ahelp hid=".uno:TableDesign">Opens the Table Design. Double-click a
preview to format the table.</ahelp></paragraph>
+<section id="sytabledesign">
+<table id="tbl_id3153978">
+<tablerow>
+<tablecell colspan="" rowspan="">
+<paragraph role="paragraph" id="par_id3153752" xml-lang="en-US">
+<image id="img_id3147292" src="cmd/sc_tabledesign.png" width="0.222inch"
height="0.222inch"><alt id="alt_id3147292" xml-lang="en-US">Icon</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell colspan="" rowspan="">
+<paragraph role="paragraph" id="par_id3156429" xml-lang="en-US">Table
Design</paragraph>
+</tablecell>
+</tablerow>
+</table>
+</section>
<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>
<embed href="text/simpress/01/05090000m.xhp#tabelletext"/>
diff --git a/source/text/simpress/01/taskpanel.xhp
b/source/text/simpress/01/taskpanel.xhp
deleted file mode 100644
index aae1b5c..0000000
--- a/source/text/simpress/01/taskpanel.xhp
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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="textsimpress01taskpanelxml" indexer="include">
-<title id="tit" xml-lang="en-US">Task Pane</title>
-<filename>/text/simpress/01/taskpanel.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="taskpanel">
-<bookmark xml-lang="en-US" branch="index"
id="bm_id3274636"><bookmark_value>task pane</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>
-</section>
-<section id="howtoget">
-<embed href="text/simpress/00/00000403.xhp#taskpane"/>
-</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>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN105D4" xml-lang="en-US" l10n="NEW"
localize="false">
- <embedvar href="text/simpress/guide/masterpage.xhp#masterpage"/>
-</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_SC_DPLAY_DATA" id="bm_id957365"
localize="false"/><comment>Master Page</comment>
-<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Master Pages tab page,
where you apply a master page (background) to all slides (left-click) or to the
selected slides (right-click).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_CURRENT_MASTERS"
id="bm_id5079500" localize="false"/><comment>Used in this presentation</comment>
-<paragraph role="paragraph" id="par_idN1067D" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Lists the currently used master
pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_RECENT_MASTERS"
id="bm_id4361705" localize="false"/><comment>Recently used</comment>
-<paragraph role="paragraph" id="par_idN106A8" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Lists the recently used master
pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_ALL_MASTERS" id="bm_id746177"
localize="false"/><comment>Available for Use</comment>
-<paragraph role="paragraph" id="par_idN106D3" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Lists all available master
pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_CURRENT"
id="bm_id2108523" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_RECENT"
id="bm_id433362" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_ALL"
id="bm_id8973662" localize="false"/>
-<paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Left-click to apply the master
page to all slides. Right-click for a submenu.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneApplyToAllSlides"
id="bm_id2527848" localize="false"/>
-<paragraph role="paragraph" id="par_idN10747" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Applies the master page to all
slides.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneApplyToSelectedSlides"
id="bm_id5487228" localize="false"/>
-<paragraph role="paragraph" id="par_idN10762" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Applies the master page or the
slide design to the selected slides.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneShowLargePreview"
id="bm_id9531235" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneShowSmallPreview"
id="bm_id4315622" localize="false"/>
-<paragraph role="paragraph" id="par_idN10785" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Resizes the preview of the master
pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_SLIDE_DESIGNS"
id="bm_id7836848" localize="false"/><comment>Layouts</comment>
-<paragraph role="paragraph" id="par_idN107B4" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Layouts tab page, where
you apply a slide design to the selected slide or slides.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS"
id="bm_id6526688" localize="false"/>
-<paragraph role="paragraph" id="par_idN107CB" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Click to apply a slide design to
all selected slides. Right-click for a submenu.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_CUSTOM_ANIMATIONS"
id="bm_id3448591" localize="false"/><comment>Custom Animation</comment>
-<paragraph role="paragraph" id="par_idN1080E" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Custom Animation tab
page, where you apply effects to the selected objects on a
slide.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_SLIDE_TRANSITIONS"
id="bm_id8300729" localize="false"/><comment>Slide Transition</comment>
-<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.
-Draw: Table Design dialog</comment></paragraph>
-</body>
-</helpdocument>
diff --git a/source/text/simpress/guide/masterpage.xhp
b/source/text/simpress/guide/masterpage.xhp
index 19cb508..d6546e3 100644
--- a/source/text/simpress/guide/masterpage.xhp
+++ b/source/text/simpress/guide/masterpage.xhp
@@ -67,6 +67,20 @@
<paragraph role="listitem" id="par_id3151387" xml-lang="en-US" l10n="U"
oldref="29">To apply the slide design to the current slide only, clear the
<emph>Exchange background page</emph> check box, and then click
<emph>OK</emph>.</paragraph>
</listitem>
</list>
+<comment>Moved from taskpanel.xhp - the described controls belong on the
Master Page sidebar</comment>
+<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_CURRENT"
id="bm_id2108523" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_RECENT"
id="bm_id433362" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_ALL"
id="bm_id8973662" localize="false"/>
+<paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Left-click to apply the master
page to all slides. Right-click for a submenu.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneApplyToAllSlides"
id="bm_id2527848" localize="false"/>
+<paragraph role="paragraph" id="par_idN10747" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Applies the master page to all
slides.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneApplyToSelectedSlides"
id="bm_id5487228" localize="false"/>
+<paragraph role="paragraph" id="par_idN10762" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Applies the master page or the
slide design to the selected slides.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneShowLargePreview"
id="bm_id9531235" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneShowSmallPreview"
id="bm_id4315622" localize="false"/>
+<paragraph role="paragraph" id="par_idN10785" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Resizes the preview of the master
pages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS"
id="bm_id6526688" localize="false"/>
+<paragraph role="paragraph" id="par_idN107CB" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Click to apply a slide design to
all selected slides. Right-click for a submenu.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/simpress/guide/background.xhp#background"/>
<paragraph role="paragraph" id="par_id3149941" xml-lang="en-US" l10n="U"
oldref="24"><link href="text/simpress/01/05100000.xhp" name="Styles and
Formatting">Styles and Formatting</link></paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
