AllLangHelp_sdraw.mk | 1
source/text/sdraw/00/page_menu.xhp | 1
source/text/sdraw/01/duplicate_page.xhp | 28 ------------------
source/text/sdraw/main_page.xhp | 4 +-
source/text/simpress/00/00000404.xhp | 2 -
source/text/simpress/00/slide_menu.xhp | 49 ++++++++++++++++++++++++++++++++
source/text/simpress/01/04120000.xhp | 30 ++++++++++---------
source/text/simpress/main_slide.xhp | 5 +--
8 files changed, 69 insertions(+), 51 deletions(-)
New commits:
commit 1a7cb494bd4f72fbf38c539babd018b593082f70
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Fri Sep 20 18:29:07 2024 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sat Sep 21 11:24:37 2024 +0200
tdf#162607 disambiguate hid2file.js, DuplicatePage
+ merged the two pages for the same UNO command
+ fix menus
+ drop unused menus
Change-Id: I88bcc94101ec6e09c64ecbaae7d82586d09cf6f0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/173752
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Jenkins
diff --git a/AllLangHelp_sdraw.mk b/AllLangHelp_sdraw.mk
index e79d745754..06f1a38aad 100644
--- a/AllLangHelp_sdraw.mk
+++ b/AllLangHelp_sdraw.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\
helpcontent2/source/text/sdraw/01/3dsettings_toolbar \
helpcontent2/source/text/sdraw/01/consolidatetext \
helpcontent2/source/text/sdraw/01/delete_page \
- helpcontent2/source/text/sdraw/01/duplicate_page \
helpcontent2/source/text/sdraw/01/equalize_height \
helpcontent2/source/text/sdraw/01/equalize_width \
helpcontent2/source/text/sdraw/01/insert_layer \
diff --git a/source/text/sdraw/00/page_menu.xhp
b/source/text/sdraw/00/page_menu.xhp
index ae80c30e58..6ecfa78182 100644
--- a/source/text/sdraw/00/page_menu.xhp
+++ b/source/text/sdraw/00/page_menu.xhp
@@ -61,7 +61,6 @@
<paragraph role="paragraph" id="par_id311566135070776"><variable
id="contextmenurename">Right-click on the page thumbnail and choose
<menuitem>Rename Page</menuitem></variable></paragraph>
<paragraph role="paragraph" id="par_id141566138212217"><variable
id="menupagedelete">Choose <menuitem>Page - Delete
Page</menuitem></variable></paragraph>
<paragraph role="paragraph" id="par_id261566138218294"><variable
id="contextmenudelete">Right-click on the page thumbnail and choose
<menuitem>Delete Page</menuitem></variable></paragraph>
- <paragraph role="paragraph" id="par_id491566139741356"><variable
id="menupageduplicate">Choose <menuitem>Page - Duplicate
Page</menuitem></variable></paragraph>
<paragraph role="paragraph" id="par_id301566157911675"><variable
id="pagenavigation">Choose <menuitem>Page -
Navigate</menuitem>.</variable></paragraph>
</body>
diff --git a/source/text/sdraw/01/duplicate_page.xhp
b/source/text/sdraw/01/duplicate_page.xhp
deleted file mode 100644
index 7710cc2827..0000000000
--- a/source/text/sdraw/01/duplicate_page.xhp
+++ /dev/null
@@ -1,28 +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/.
- *
- -->
-
- <meta>
- <topic id="sdrawduplicatepage" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Duplicate Page</title>
- <filename>/text/sdraw/01/duplicate_page.xhp</filename>
- </topic>
- </meta>
- <body>
- <section id="duplicatepage">
- <bookmark branch="hid/.uno:DuplicatePage" xml-lang="en-US"
id="bm_id3147436" localize="false"/>
- <h1 id="hd_id3148576"><link
href="text/sdraw/01/duplicate_page.xhp">Duplicate Page</link></h1>
- <paragraph role="paragraph" id="par_id3153190" xml-lang="en-US"><ahelp
hid=".uno:DuplicatePage" visibility="visible">Inserts a copy of the current
page after the current page.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/sdraw/00/page_menu.xhp#menupageduplicate"/>
- </section>
-</body>
-</helpdocument>
diff --git a/source/text/sdraw/main_page.xhp b/source/text/sdraw/main_page.xhp
index 9b575f5787..5119855c11 100644
--- a/source/text/sdraw/main_page.xhp
+++ b/source/text/sdraw/main_page.xhp
@@ -20,7 +20,7 @@
<meta>
<topic id="textsdrawmainpagexml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Page</title>
+ <title id="tit">Page</title>
<filename>/text/sdraw/main_page.xhp</filename>
</topic>
</meta>
@@ -34,7 +34,7 @@
</section>
<embed href="text/sdraw/01/new_page.xhp#newpage"/>
-<embed href="text/sdraw/01/duplicate_page.xhp#duplicatepage"/>
+<embed href="text/simpress/01/04120000.xhp#duplicate_slide"/>
<embed href="text/simpress/01/04110100.xhp#insertslidepageobject"/>
<embed href="text/sdraw/01/rename_page.xhp#renamepage"/>
<embed href="text/sdraw/01/delete_page.xhp#deletepage"/>
diff --git a/source/text/simpress/00/00000404.xhp
b/source/text/simpress/00/00000404.xhp
index bf8182787a..c13ba568a2 100644
--- a/source/text/simpress/00/00000404.xhp
+++ b/source/text/simpress/00/00000404.xhp
@@ -28,8 +28,6 @@
</meta>
<body>
<h1 id="hd_id3143219">Insert Menu</h1>
-<paragraph role="paragraph" id="par_id3155064"><variable
id="seiteduplizieren">Choose <emph>Insert - Duplicate Slide</emph>
-</variable><comment>UFI: will be changed "SO later" to Page (for
Draw)</comment></paragraph>
<section id="insert_snap_point_line">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
<paragraph role="paragraph" id="par_id3155376">Choose <menuitem>Insert -
Snap Guide</menuitem>.</paragraph>
diff --git a/source/text/simpress/00/slide_menu.xhp
b/source/text/simpress/00/slide_menu.xhp
index 428b4b123b..5dcd849d4c 100644
--- a/source/text/simpress/00/slide_menu.xhp
+++ b/source/text/simpress/00/slide_menu.xhp
@@ -53,6 +53,55 @@
<paragraph role="paragraph" id="par_id711725397168544"><switchinline
select="sys"><caseinline
select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>
+ M</keycode>.</paragraph>
</section>
+ <section id="duplicate_slide">
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <switch select="appl">
+ <case select="IMPRESS">
+ <paragraph role="paragraph" id="par_id221726866818983">Choose
<menuitem>Slide - Duplicate Slide</menuitem>.</paragraph>
+ </case>
+ <default>
+ <paragraph role="paragraph" id="par_id121726866823895">Choose
<menuitem>Page - Duplicate Page</menuitem>.</paragraph>
+ </default>
+ </switch>
+ <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+ <switch select="appl">
+ <case select="IMPRESS">
+ <paragraph role="paragraph" id="par_id701726866830246">Choose
<menuitem>Insert - Duplicate Slide</menuitem>.</paragraph>
+ </case>
+ <default>
+ <paragraph role="paragraph" id="par_id341726866835662">Choose
<menuitem>Insert - Duplicate Page</menuitem>.</paragraph>
+ </default>
+ </switch>
+ <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+ <switch select="appl">
+ <case select="IMPRESS">
+ <table id="tab_id661726866441677">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id331726866441678" role="paragraph"><image
src="cmd/lc_duplicateslide.svg" id="img_id291726866441679" width="1cm"
height="1cm"><alt id="alt_id981726866441680">Icon Duplicate
Slide</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id331726866441682" role="paragraph">Duplicate
Slide</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </case>
+ <default>
+ <table id="tab_id251726866466954">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id351726866466955" role="paragraph"><image
src="cmd/lc_duplicatepage.svg" id="img_id331726866466956" width="1cm"
height="1cm"><alt id="alt_id41726866466957">Icon Duplicate
Page</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id171726866466959" role="paragraph">Duplicate
Page</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </default>
+ </switch>
+ </section>
+
+
<section id="summary_slide">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
<paragraph role="paragraph" id="par_id951716313892164">Choose
<menuitem>Slide - Summary Slide</menuitem></paragraph>
diff --git a/source/text/simpress/01/04120000.xhp
b/source/text/simpress/01/04120000.xhp
index e78cf2f367..bcdc7c35d5 100644
--- a/source/text/simpress/01/04120000.xhp
+++ b/source/text/simpress/01/04120000.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,11 +16,10 @@
* 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="textsimpress0104120000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Duplicate Slide</title>
+<title id="tit">Duplicate Slide</title>
<filename>/text/simpress/01/04120000.xhp</filename>
</topic>
<history>
@@ -30,15 +27,20 @@
</history>
</meta>
<body>
-
-
- <section id="duplicate_slide">
-<bookmark branch="hid/.uno:DuplicatePage" xml-lang="en-US" id="bm_id3147436"
localize="false"/>
-<h1 id="hd_id3148576"><link href="text/simpress/01/04120000.xhp">Duplicate
Slide</link></h1>
- <paragraph role="paragraph" id="par_id3153190" xml-lang="en-US"><ahelp
hid=".uno:DuplicatePage" visibility="visible">Inserts a copy of the current
slide after the current slide.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/simpress/00/00000404.xhp#seiteduplizieren"/>
+<bookmark branch="hid/.uno:DuplicatePage" id="bm_id3147436" localize="false"/>
+<section id="duplicate_slide">
+ <h1 id="hd_id3148576"><switchinline select="appl"><caseinline
select="IMPRESS"><link href="text/simpress/01/04120000.xhp">Duplicate
Slide</link></caseinline><defaultinline><link
href="text/simpress/01/04120000.xhp">Duplicate
Page</link></defaultinline></switchinline></h1>
+ <switch select="appl">
+ <case select="IMPRESS">
+ <paragraph role="paragraph" id="par_id3153190">Inserts a copy of the
current slide after the current slide.</paragraph>
+ </case>
+ <default>
+ <paragraph role="paragraph" id="par_id171726864020032">Inserts a copy of
the current page after the current page.</paragraph>
+ </default>
+ </switch>
</section>
- </body>
+<section id="howtoget">
+ <embed href="text/simpress/00/slide_menu.xhp#duplicate_slide"/>
+</section>
+</body>
</helpdocument>
diff --git a/source/text/simpress/main_slide.xhp
b/source/text/simpress/main_slide.xhp
index 13ad2a2557..82f2f4d023 100644
--- a/source/text/simpress/main_slide.xhp
+++ b/source/text/simpress/main_slide.xhp
@@ -33,9 +33,8 @@
</section>
<comment>New Slide</comment>
<embed href="text/simpress/01/new_slide.xhp#newslide"/>
- <h2 id="hd_id611615489755701">Duplicate Slide</h2>
- <paragraph role="paragraph" id="par_id71615490370664">Creates a copy of the
currently selected slide.</paragraph>
- <comment>Insert Slide from File</comment>
+ <embed href="text/simpress/01/04120000.xhp#duplicate_slide"/>
+ <comment>Insert Slide from File</comment>
<embed href="text/simpress/guide/page_copy.xhp#insertslides"/>
<comment>Layout</comment>
<embed href="text/simpress/01/05130000.xhp#slidelayout"/>
