AllLangHelp_simpress.mk                       |    1 
 source/text/shared/menu/style_menu.xhp        |   31 ++++++++++++++++++--------
 source/text/simpress/format_submenu_lists.xhp |   31 --------------------------
 source/text/simpress/main_format.xhp          |   11 +++------
 4 files changed, 26 insertions(+), 48 deletions(-)

New commits:
commit 8f674b960e776a70c916e508073cfa3f2e2269a1
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Apr 22 12:19:01 2024 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Apr 22 17:23:23 2024 +0200

    tdf#102265 More work on Impress format menu (2)
    
    Change-Id: I165dccf3662a98a0d4d945c3541f5d6d24ae8c86
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166462
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/text/shared/menu/style_menu.xhp 
b/source/text/shared/menu/style_menu.xhp
index 4367bc3da0..4ff68262b5 100644
--- a/source/text/shared/menu/style_menu.xhp
+++ b/source/text/shared/menu/style_menu.xhp
@@ -68,11 +68,24 @@
       <case select="CALC">
         <paragraph id="par_id951701984989443" role="paragraph"><ahelp 
hid=".">Contains commands to apply, create, edit, update, load, and manage 
styles in a spreadsheet document.</ahelp></paragraph>
       </case>
+      <case select="IMPRESS">
+        <paragraph role="paragraph" id="par_id191713460859953">Contains 
commands to create, edit, update, and manage styles in a presentation 
document.</paragraph>
+      </case>
     </switch>
   </section>
   <section id="howtoget">
     <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
-    <paragraph role="paragraph" id="par_id71693522443488">Choose 
<menuitem>Styles</menuitem>.</paragraph>
+    <switch select="appl">
+      <case select="IMPRESS">
+        <paragraph role="paragraph" id="par_id991713461213944">Choose 
<menuitem>Format - Styles</menuitem>.</paragraph>
+      </case>
+      <case select="DRAW">
+        <paragraph role="paragraph" id="par_id811713461480734">Choose 
<menuitem>Format - Styles</menuitem>.</paragraph>
+      </case>
+      <default>
+        <paragraph role="paragraph" id="par_id71693522443488">Choose 
<menuitem>Styles</menuitem>.</paragraph>
+      </default>
+    </switch>
   </section>
   <switch select="appl">
     <case select="WRITER">
@@ -83,20 +96,20 @@
       <h2 id="par_id811701985858003">Cell styles entries</h2>
       <paragraph role="paragraph" id="par_id31701985198261">The entries 
includes most common cell styles. Click on the style to apply.</paragraph>
     </case>
-    <case select="IMPRESS">
-    </case>
-    <case select="DRAW">
-    </case>
+  </switch>
+  <switch select="appl">
+    <case select="IMPRESS"></case>
+    <case select="DRAW"></case>
     <default>
+      <tip id="par_id451529878529005">You can customize the list of styles 
entries using menu <link href="text/shared/01/06140100.xhp"><emph>Tools - 
Customize</emph></link>. Because custom styles belongs to the actual document, 
remember to store the customized menu in the document scope.</tip>
     </default>
   </switch>
 
-  <tip id="par_id451529878529005">You can customize the list of styles entries 
using menu <link href="text/shared/01/06140100.xhp"><emph>Tools - 
Customize</emph></link>. Because custom styles belongs to the actual document, 
remember to store the customized menu in the document scope.</tip>
-
   <switch select="appl">
-    <case select="WRITER">
+    <case select="CALC"></case>
+    <default>
       <embed href="text/swriter/01/EditStyle.xhp#editstyle"/>
-    </case>
+  </default>
   </switch>
   <embed href="text/shared/01/StyleUpdateByExample.xhp#styleupdatebyexample"/>
   <embed href="text/shared/01/StyleNewByExample.xhp#stylenewbyexample"/>
commit 3b3bc84641ec3c0b543682c9394789e86345e8e5
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Thu Apr 18 14:01:38 2024 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Apr 22 17:23:15 2024 +0200

    tdf#102265 More work on Impress format menu
    
    Change-Id: I7edb4893d9f65eb05694f777a0ef730454851101
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166461
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 2d0ac32af0..e79a530b61 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -194,7 +194,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
     helpcontent2/source/text/simpress/main0103 \
     helpcontent2/source/text/simpress/main0104 \
     helpcontent2/source/text/simpress/main_format \
-    helpcontent2/source/text/simpress/format_submenu_lists \
     helpcontent2/source/text/simpress/main0107 \
     helpcontent2/source/text/simpress/main0113 \
     helpcontent2/source/text/simpress/main0114 \
diff --git a/source/text/simpress/format_submenu_lists.xhp 
b/source/text/simpress/format_submenu_lists.xhp
deleted file mode 100644
index 78bbdbdf01..0000000000
--- a/source/text/simpress/format_submenu_lists.xhp
+++ /dev/null
@@ -1,31 +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="formatsubmenulists" indexer="include" status="PUBLISH">
-            <title id="tit" xml-lang="en-US">Lists</title>
-            <filename>/text/simpress/format_submenu_lists.xhp</filename>
-        </topic>
-    </meta>
-    <body>
-    <section id="impressformatsubmenulists">
-        <bookmark id="bm_id341649419524036" xml-lang="en-US" branch="hid/zzzz" 
localize="false"/>
-        <h1 id="hd_id501649419524037"><variable id="h1"><link 
href="text/simpress/format_submenu_lists.xhp">Lists</link></variable></h1>
-        <paragraph id="par_id291649419524039" role="paragraph" 
xml-lang="en-US">For the selected paragraphs, adds numbering or bullets, edit 
the outline levels and move them up or down in the slide.</paragraph>
-    </section>
-    <embed href="text/shared/02/06120000.xhp#toggle_bullets"/>
-    <embed href="text/swriter/02/02110000.xhp#numberingh1"/>
-    <embed href="text/shared/02/06060000.xhp#promote_one_level"/>
-    <embed href="text/shared/02/06050000.xhp#demote_one_level"/>
-    <embed href="text/shared/02/06110000.xhp#move_down"/>
-    <embed href="text/shared/02/06100000.xhp#move_up"/>
-</body>
-</helpdocument>
diff --git a/source/text/simpress/main_format.xhp 
b/source/text/simpress/main_format.xhp
index 33f38ff966..288396bb67 100644
--- a/source/text/simpress/main_format.xhp
+++ b/source/text/simpress/main_format.xhp
@@ -19,24 +19,21 @@
 <helpdocument version="1.0">
   <meta>
     <topic id="textsimpressmain_formatxml" indexer="include" status="PUBLISH">
-      <title id="tit" xml-lang="en-US">Format</title>
+      <title id="tit">Format</title>
       <filename>/text/simpress/main_format.xhp</filename>
     </topic>
   </meta>
   <body>
     <section id="format">
-      <bookmark xml-lang="en-US" branch="hid/.uno:FormatMenu" 
id="bm_id4682149" localize="false"/>
+      <bookmark branch="hid/.uno:FormatMenu" id="bm_id4682149" 
localize="false"/>
 
       <h1 id="hd_id3152596"><link 
href="text/simpress/main_format.xhp">Format</link></h1>
-      <paragraph id="par_id3145801" role="paragraph" xml-lang="en-US"><ahelp 
hid=".">Contains commands for formatting the layout and the contents of your 
document.</ahelp></paragraph>
+      <paragraph id="par_id3145801" role="paragraph"><ahelp hid=".">Contains 
commands for formatting the layout and the contents of your 
document.</ahelp></paragraph>
     </section>
     <embed href="text/shared/menu/submenu_text.xhp#submenu_text"/>
     <embed href="text/shared/menu/submenu_spacing.xhp#submenu_spacing"/>
     <embed href="text/shared/01/05080000.xhp#alignment"/>
-
-    <h2 id="hd_id951602975070826"><link 
href="text/simpress/format_submenu_lists.xhp">Lists</link></h2>
-    <paragraph role="paragraph" id="par_id461602975083850">Opens a submenu 
where you can modify the formatting of list paragraphs.</paragraph>
-
+    <embed href="text/shared/menu/submenu_lists.xhp#submenu_lists"/>
     <embed href="text/shared/01/05010000.xhp#standard"/>
 
     <h2 id="hd_id451615217475502">Styles</h2>

Reply via email to