AllLangHelp_shared.mk                  |    1 
 AllLangHelp_swriter.mk                 |    1 
 source/text/scalc/main0100.xhp         |    1 
 source/text/shared/menu/style_menu.xhp |  114 +++++++++++++++++++++++++++++++++
 source/text/swriter/main0100.xhp       |    2 
 source/text/swriter/main0115.xhp       |   69 -------------------
 6 files changed, 117 insertions(+), 71 deletions(-)

New commits:
commit 847d925a437f5a3c089978c7d0b8f175a1a19176
Author:     Olivier Hallot <[email protected]>
AuthorDate: Thu Dec 7 22:21:34 2023 -0300
Commit:     Olivier Hallot <[email protected]>
CommitDate: Fri Dec 8 21:41:35 2023 +0100

    tdf#155876 UI cmds Calc-Format menu (25)
    
    + Style menu for Calc
    + refactoring
    
    Change-Id: Iff39af1811013b12f6d46aebc77fbf9f8b652a4d
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160449
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <[email protected]>

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 5dfb8e87fc..64888b0d18 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -840,6 +840,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/menu/submenu_rotateflip \
     helpcontent2/source/text/shared/menu/submenu_spacing \
     helpcontent2/source/text/shared/menu/submenu_text \
+    helpcontent2/source/text/shared/menu/style_menu \
     helpcontent2/source/text/shared/need_help \
     helpcontent2/source/text/shared/optionen/01000000 \
     helpcontent2/source/text/shared/optionen/01010000 \
diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index a0707a9c4f..884fd071a5 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -419,7 +419,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/main0105 \
     helpcontent2/source/text/swriter/main0107 \
     helpcontent2/source/text/swriter/main0110 \
-    helpcontent2/source/text/swriter/main0115 \
     helpcontent2/source/text/swriter/main0120 \
     helpcontent2/source/text/swriter/main0200 \
     helpcontent2/source/text/swriter/main0202 \
diff --git a/source/text/scalc/main0100.xhp b/source/text/scalc/main0100.xhp
index 1412ec6141..9cdffd7c2f 100644
--- a/source/text/scalc/main0100.xhp
+++ b/source/text/scalc/main0100.xhp
@@ -38,6 +38,7 @@
 <embed href="text/scalc/main0103.xhp#view"/>
 <embed href="text/scalc/main0104.xhp#insert"/>
 <embed href="text/scalc/main0105.xhp#format"/>
+<embed href="text/shared/menu/style_menu.xhp#styles"/>
 <embed href="text/scalc/main0116.xhp#sheet"/>
 <embed href="text/scalc/main0112.xhp#data"/>
 <embed href="text/shared/main_tools.xhp#tools_menu"/>
diff --git a/source/text/shared/menu/style_menu.xhp 
b/source/text/shared/menu/style_menu.xhp
new file mode 100644
index 0000000000..4367bc3da0
--- /dev/null
+++ b/source/text/shared/menu/style_menu.xhp
@@ -0,0 +1,114 @@
+<?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="textswritermain0115xml" indexer="include" status="PUBLISH">
+      <title id="tit">Styles (menu)</title>
+      <filename>/text/shared/menu/style_menu.xhp</filename>
+    </topic>
+  </meta>
+  <body>
+  <bookmark branch="hid/.uno:FormatStylesMenu" id="bm_id1366008" 
localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Text body" 
id="bm_id511693520714624" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Title" 
id="bm_id851693520719649" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Subtitle" 
id="bm_id281693520723735" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Heading 1" 
id="bm_id861693520727591" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Heading 2" 
id="bm_id61693520731745" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Heading 3" 
id="bm_id261693520735847" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Quotations" 
id="bm_id961693520739814" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Preformatted Text" 
id="bm_id831693520743983" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Standard" 
id="bm_id121693520748126" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Emphasis" 
id="bm_id281693520751991" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Strong Emphasis" 
id="bm_id681693520756392" localize="false"/>
+  <bookmark branch="hid/uno:StyleApply?Style:string=Citation" 
id="bm_id1001693520760265" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Source Text" 
id="bm_id131693520764223" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=List 1" 
id="bm_id301693520768081" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Numbering 123" 
id="bm_id101693520772071" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Numbering ABC" 
id="bm_id311693520775943" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Numbering abc" 
id="bm_id241693520780040" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Numbering IVX" 
id="bm_id161693520783991" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Numbering ivx" 
id="bm_id231693520787945" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Default" 
id="bm_id711701995804043" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Accent 1" 
id="bm_id901701995810760" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Accent 2" 
id="bm_id61701995816304" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Accent 3" 
id="bm_id231701995821048" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Heading 1" 
id="bm_id171701995828398" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Heading 2" 
id="bm_id361701995838206" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Good" 
id="bm_id201701995843317" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Bad" 
id="bm_id581701995848000" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Neutral" 
id="bm_id951701995445992" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Error" 
id="bm_id301701995449696" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Warning" 
id="bm_id421701995453624" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Footnote" 
id="bm_id381701995458488" localize="false"/>
+  <bookmark branch="hid/.uno:StyleApply?Style:string=Note" 
id="bm_id331701995463552" localize="false"/>
+
+  <section id="styles">
+    <h1 id="par_idN10553"><link 
href="text/shared/menu/style_menu.xhp">Styles</link></h1>
+    <switch select="appl">
+      <case select="WRITER">
+        <paragraph id="par_idN10563" role="paragraph"><ahelp hid=".">Contains 
commands to apply, create, edit, update, load, and manage <link 
href="text/swriter/01/05130000.xhp">styles</link> in a text 
document.</ahelp></paragraph>
+      </case>
+      <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>
+    </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>
+  </section>
+  <switch select="appl">
+    <case select="WRITER">
+      <h2 id="hd_id121529878513674">Text styles entries</h2>
+      <paragraph role="paragraph" id="par_id411529878520742">The entries 
includes most common paragraph, character and list styles. Click on the style 
to apply.</paragraph>
+    </case>
+    <case select="CALC">
+      <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>
+    <default>
+    </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">
+      <embed href="text/swriter/01/EditStyle.xhp#editstyle"/>
+    </case>
+  </switch>
+  <embed href="text/shared/01/StyleUpdateByExample.xhp#styleupdatebyexample"/>
+  <embed href="text/shared/01/StyleNewByExample.xhp#stylenewbyexample"/>
+  <switch select="appl">
+    <case select="WRITER">
+      <embed href="text/swriter/01/05170000.xhp#loadstyles"/>
+    </case>
+  </switch>
+  <embed href="text/swriter/01/05140000.xhp#styles_and_formatting"/>
+  <section id="relatedtopics">
+    <embed href="text/swriter/guide/stylist_update.xhp#stylist_update"/>
+    <embed 
href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
+  </section>
+</body>
+</helpdocument>
diff --git a/source/text/swriter/main0100.xhp b/source/text/swriter/main0100.xhp
index e05f77ca99..32b730346c 100644
--- a/source/text/swriter/main0100.xhp
+++ b/source/text/swriter/main0100.xhp
@@ -41,7 +41,7 @@
 <embed href="text/swriter/main0103.xhp#view"/>
 <embed href="text/swriter/main0104.xhp#insert"/>
 <embed href="text/swriter/main0105.xhp#format"/>
-<embed href="text/swriter/main0115.xhp#styles"/>
+<embed href="text/shared/menu/style_menu.xhp#styles"/>
 <embed href="text/swriter/main0110.xhp#table"/>
 <embed href="text/swriter/main0120.xhp#form"/>
 <embed href="text/shared/main_tools.xhp#tools_menu"/>
diff --git a/source/text/swriter/main0115.xhp b/source/text/swriter/main0115.xhp
deleted file mode 100644
index f4a7cf4892..0000000000
--- a/source/text/swriter/main0115.xhp
+++ /dev/null
@@ -1,69 +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="textswritermain0115xml" indexer="include" status="PUBLISH">
-    <title id="tit">Styles (menu)</title>
-    <filename>/text/swriter/main0115.xhp</filename>
-  </topic>
-</meta>
-<body>
-  <bookmark branch="hid/.uno:FormatStylesMenu" id="bm_id1366008" 
localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Text body" 
id="bm_id511693520714624" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Title" 
id="bm_id851693520719649" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Subtitle" 
id="bm_id281693520723735" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Heading 1" 
id="bm_id861693520727591" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Heading 2" 
id="bm_id61693520731745" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Heading 3" 
id="bm_id261693520735847" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Quotations" 
id="bm_id961693520739814" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Preformatted Text" 
id="bm_id831693520743983" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Standard" 
id="bm_id121693520748126" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Emphasis" 
id="bm_id281693520751991" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Strong Emphasis" 
id="bm_id681693520756392" localize="false"/>
-  <bookmark branch="hid/uno:StyleApply?Style:string=Citation" 
id="bm_id1001693520760265" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Source Text" 
id="bm_id131693520764223" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=List 1" 
id="bm_id301693520768081" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Numbering 123" 
id="bm_id101693520772071" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Numbering ABC" 
id="bm_id311693520775943" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Numbering abc" 
id="bm_id241693520780040" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Numbering IVX" 
id="bm_id161693520783991" localize="false"/>
-  <bookmark branch="hid/.uno:StyleApply?Style:string=Numbering ivx" 
id="bm_id231693520787945" localize="false"/>
- <section id="styles">
-  <h1 id="par_idN10553"><link 
href="text/swriter/main0115.xhp">Styles</link></h1>
-  <paragraph id="par_idN10563" role="paragraph"><ahelp hid=".">Contains 
commands to apply, create, edit, update, load, and manage <link 
href="text/swriter/01/05130000.xhp">styles</link> in a text 
document.</ahelp></paragraph>
- </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>
- </section>
- <h2 id="hd_id121529878513674">Text styles entries</h2>
- <paragraph role="paragraph" id="par_id411529878520742">The entries includes 
most common paragraph, character and list styles. Click on the style to 
apply.</paragraph>
- <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>
- <embed href="text/swriter/01/EditStyle.xhp#editstyle"/>
- <embed href="text/shared/01/StyleUpdateByExample.xhp#styleupdatebyexample"/>
- <embed href="text/shared/01/StyleNewByExample.xhp#stylenewbyexample"/>
- <embed href="text/swriter/01/05170000.xhp#loadstyles"/>
- <embed href="text/swriter/01/05140000.xhp#styles_and_formatting"/>
-<section id="relatedtopics">
-   <embed href="text/swriter/guide/stylist_update.xhp#stylist_update"/>
-   <embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
-</section>
-</body>
-</helpdocument>

Reply via email to