AllLangHelp_scalc.mk | 1
AllLangHelp_sdraw.mk | 1
AllLangHelp_shared.mk | 1
AllLangHelp_simpress.mk | 1
AllLangHelp_swriter.mk | 1
source/auxiliary/scalc.tree | 2
source/auxiliary/sdraw.tree | 2
source/auxiliary/simpress.tree | 2
source/auxiliary/swriter.tree | 2
source/text/scalc/01/05020000.xhp | 9 +-
source/text/scalc/02/06080000.xhp | 9 +-
source/text/scalc/main0100.xhp | 2
source/text/scalc/main0105.xhp | 69 ----------------
source/text/sdraw/01/insert_layer.xhp | 48 ++++++-----
source/text/sdraw/main0100.xhp | 2
source/text/sdraw/main_format.xhp | 57 -------------
source/text/shared/01/05010000.xhp | 2
source/text/shared/01/05200000.xhp | 11 --
source/text/shared/01/05210000.xhp | 15 +--
source/text/shared/01/05230000.xhp | 7 -
source/text/shared/01/05350000.xhp | 45 +++++-----
source/text/shared/01/05990000.xhp | 8 -
source/text/shared/main_format.xhp | 143 ++++++++++++++++++++++++++++++++++
source/text/simpress/main0100.xhp | 2
source/text/simpress/main_format.xhp | 59 --------------
source/text/swriter/01/05040500.xhp | 7 -
source/text/swriter/main0100.xhp | 2
source/text/swriter/main0105.xhp | 78 ------------------
28 files changed, 231 insertions(+), 357 deletions(-)
New commits:
commit f43f8f7b3b3658306291990afad2a675fad4b703
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Thu May 29 19:20:12 2025 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Fri May 30 00:21:27 2025 +0200
tdf#162607 Disambiguate Format menu.
+ some refactor
Change-Id: Iae790785e90fb9439a9a6ef9fd650eca59e21985
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/186027
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Jenkins
diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index dddf05d076..bf23b3a7e4 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -512,7 +512,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
helpcontent2/source/text/scalc/menu/sheet_tab_menu \
helpcontent2/source/text/scalc/main0000 \
helpcontent2/source/text/scalc/main0100 \
- helpcontent2/source/text/scalc/main0105 \
helpcontent2/source/text/scalc/main0112 \
helpcontent2/source/text/scalc/main0116 \
helpcontent2/source/text/scalc/main0200 \
diff --git a/AllLangHelp_sdraw.mk b/AllLangHelp_sdraw.mk
index 0ebc3baa4b..fed8405e90 100644
--- a/AllLangHelp_sdraw.mk
+++ b/AllLangHelp_sdraw.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\
helpcontent2/source/text/sdraw/main0000 \
helpcontent2/source/text/sdraw/main0100 \
helpcontent2/source/text/sdraw/main_insert \
- helpcontent2/source/text/sdraw/main_format \
helpcontent2/source/text/sdraw/main_page \
helpcontent2/source/text/sdraw/main_shape \
helpcontent2/source/text/sdraw/main0200 \
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 9bb9efd7c3..feb6672f76 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -842,6 +842,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/guide/xsltfilter_distribute \
helpcontent2/source/text/shared/main0103 \
helpcontent2/source/text/shared/main_edit \
+ helpcontent2/source/text/shared/main_format \
helpcontent2/source/text/shared/main0104 \
helpcontent2/source/text/shared/main0107 \
helpcontent2/source/text/shared/main0108 \
diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 08acaf717b..2d76a56304 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -183,7 +183,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
helpcontent2/source/text/simpress/guide/vectorize \
helpcontent2/source/text/simpress/main0000 \
helpcontent2/source/text/simpress/main0100 \
- helpcontent2/source/text/simpress/main_format \
helpcontent2/source/text/simpress/main0113 \
helpcontent2/source/text/simpress/main0114 \
helpcontent2/source/text/simpress/main_slide \
diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index 81e7f79059..705aa7b72b 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -412,7 +412,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/librelogo/LibreLogo \
helpcontent2/source/text/swriter/main0000 \
helpcontent2/source/text/swriter/main0100 \
- helpcontent2/source/text/swriter/main0105 \
helpcontent2/source/text/swriter/main0110 \
helpcontent2/source/text/swriter/main0120 \
helpcontent2/source/text/swriter/main0200 \
diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree
index 9528149986..51c9c24fdd 100644
--- a/source/auxiliary/scalc.tree
+++ b/source/auxiliary/scalc.tree
@@ -35,7 +35,7 @@
<topic id="shared/text/shared/main_edit.xhp">Edit</topic>
<topic id="scalc/text/shared/main0103.xhp">View</topic>
<topic id="scalc/text/shared/main0104.xhp">Insert</topic>
- <topic id="scalc/text/scalc/main0105.xhp">Format</topic>
+ <topic id="shared/text/shared/main_format.xhp">Format</topic>
<topic id="scalc/text/scalc/main0116.xhp">Sheet</topic>
<topic id="scalc/text/scalc/main0112.xhp">Data</topic>
<topic id="scalc/text/shared/main_tools.xhp">Tools</topic>
diff --git a/source/auxiliary/sdraw.tree b/source/auxiliary/sdraw.tree
index 11130600fb..d5effbb8ce 100644
--- a/source/auxiliary/sdraw.tree
+++ b/source/auxiliary/sdraw.tree
@@ -23,7 +23,7 @@
<topic id="shared/text/shared/main_edit.xhp">Edit</topic>
<topic id="sdraw/text/shared/main0103.xhp">View</topic>
<topic id="sdraw/text/sdraw/main_insert.xhp">Insert</topic>
- <topic id="sdraw/text/sdraw/main_format.xhp">Format</topic>
+ <topic id="shared/text/shared/main_format.xhp">Format</topic>
<topic id="sdraw/text/sdraw/main_page.xhp">Page</topic>
<topic id="sdraw/text/sdraw/main_shape.xhp">Shape</topic>
<topic id="sdraw/text/shared/main_tools.xhp">Tools</topic>
diff --git a/source/auxiliary/simpress.tree b/source/auxiliary/simpress.tree
index 8df1fd3ada..7ff5c5b2a4 100644
--- a/source/auxiliary/simpress.tree
+++ b/source/auxiliary/simpress.tree
@@ -33,7 +33,7 @@
<topic id="shared/text/shared/main_edit.xhp">Edit</topic>
<topic id="simpress/text/shared/main0103.xhp">View</topic>
<topic id="simpress/text/shared/main0104.xhp">Insert</topic>
- <topic id="simpress/text/simpress/main_format.xhp">Format</topic>
+ <topic id="shared/text/shared/main_format.xhp">Format</topic>
<topic id="simpress/text/simpress/main_slide.xhp">Slide</topic>
<topic id="simpress/text/simpress/main0114.xhp">Slide Show</topic>
<topic id="simpress/text/shared/main_tools.xhp">Tools</topic>
diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree
index 559bfc8fb8..8e421a290e 100644
--- a/source/auxiliary/swriter.tree
+++ b/source/auxiliary/swriter.tree
@@ -34,7 +34,7 @@
<topic id="shared/text/shared/main_edit.xhp">Edit</topic>
<topic id="swriter/text/shared/main0103.xhp">View</topic>
<topic id="swriter/text/shared/main0104.xhp">Insert</topic>
- <topic id="swriter/text/swriter/main0105.xhp">Format</topic>
+ <topic id="shared/text/shared/main_format.xhp">Format</topic>
<topic id="shared/text/shared/menu/style_menu.xhp">Styles</topic>
<topic id="swriter/text/swriter/main0110.xhp">Table</topic>
<topic id="swriter/text/swriter/main0120.xhp">Form</topic>
diff --git a/source/text/scalc/01/05020000.xhp
b/source/text/scalc/01/05020000.xhp
index 3491927fe5..c804fc3a85 100644
--- a/source/text/scalc/01/05020000.xhp
+++ b/source/text/scalc/01/05020000.xhp
@@ -33,9 +33,12 @@
<bookmark_value>cells;formatting dialog</bookmark_value>
</bookmark>
<bookmark branch="hid/.uno:FormatCellDialog" id="bm_id6056664"
localize="false"/>
-<h1 id="hd_id3148663"><variable id="h1"><variable id="format cells"><link
href="text/scalc/01/05020000.xhp">Format Cells</link></variable></variable></h1>
-<paragraph role="paragraph" id="par_id3150448"><variable
id="zellattributetext"><ahelp hid=".uno:FormatCellDialog">Allows you to specify
a variety of formatting options and to apply attributes to the selected
cells.</ahelp>
-</variable></paragraph>
+
+<section id="formatcells">
+ <h1 id="hd_id3148663"><variable id="h1"><variable id="format cells"><link
href="text/scalc/01/05020000.xhp">Format Cells</link></variable></variable></h1>
+<paragraph role="paragraph" id="par_id3150448"><variable
id="zellattributetext"><ahelp hid=".uno:FormatCellDialog">Allows you to specify
a variety of formatting options and to apply attributes to the selected
cells.</ahelp></variable></paragraph>
+</section>
+
<section id="howtoget">
<embed href="text/scalc/00/00000405.xhp#format_cells"/>
</section>
diff --git a/source/text/scalc/02/06080000.xhp
b/source/text/scalc/02/06080000.xhp
index e9d5f19c67..fee0465e7c 100644
--- a/source/text/scalc/02/06080000.xhp
+++ b/source/text/scalc/02/06080000.xhp
@@ -28,9 +28,12 @@
</meta>
<body>
<bookmark branch="hid/.uno:ChooseDesign" id="bm_id3147335" localize="false"/>
-<h1 id="hd_id3153087"><link href="text/scalc/02/06080000.xhp">Theme
Selection</link></h1>
-<paragraph role="paragraph" id="par_id3154515"><variable
id="thementext"><ahelp hid=".uno:ChooseDesign">Applies a formatting style to
the selected cells.</ahelp>
-</variable> The styles include font, border, and background color
information.</paragraph>
+
+<section id="themeselection">
+ <h1 id="hd_id3153087"><link
href="text/scalc/02/06080000.xhp">Spreadsheet Theme</link></h1>
+ <paragraph role="paragraph" id="par_id3154515"><variable
id="thementext"><ahelp hid=".uno:ChooseDesign">Applies a formatting style to
the spreadsheet document.</ahelp></variable>The styles include font, border,
and background color information.</paragraph>
+</section>
+
<section id="howtoget">
<embed href="text/scalc/00/00000405.xhp#themes"/>
</section>
diff --git a/source/text/scalc/main0100.xhp b/source/text/scalc/main0100.xhp
index fe68d3ee18..31e6e13f69 100644
--- a/source/text/scalc/main0100.xhp
+++ b/source/text/scalc/main0100.xhp
@@ -37,7 +37,7 @@
<embed href="text/shared/main_edit.xhp#edit"/>
<embed href="text/shared/main0103.xhp#view"/>
<embed href="text/shared/main0104.xhp#insert"/>
-<embed href="text/scalc/main0105.xhp#format"/>
+<embed href="text/shared/main_format.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"/>
diff --git a/source/text/scalc/main0105.xhp b/source/text/scalc/main0105.xhp
deleted file mode 100644
index 4f81b002bb..0000000000
--- a/source/text/scalc/main0105.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="textscalcmain0105xml" indexer="include" status="PUBLISH">
- <title id="tit">Format</title>
- <filename>/text/scalc/main0105.xhp</filename>
- </topic>
-</meta>
-<body>
-<section id="format">
-<bookmark branch="hid/.uno:FormatMenu" id="bm_id4623554" localize="false"/>
-
-<h1 id="hd_id3149669"><link href="text/scalc/main0105.xhp">Format</link></h1>
-<paragraph id="par_id3145171" role="paragraph"><ahelp hid=".">The
<emph>Format</emph> menu contains commands for formatting selected cells, <link
href="text/shared/00/00000005.xhp#object">objects</link>, and cell contents in
your document.</ahelp></paragraph>
-</section>
-<embed href="text/shared/menu/submenu_text.xhp#submenu_text"/>
-<embed href="text/shared/01/05080000.xhp#alignment"/>
-<embed href="text/scalc/01/default_number_formats.xhp#numberformatmenu"/>
-<embed href="text/shared/01/05010000.xhp#standard"/>
-
-<h2 id="hd_id3154732"><link href="text/scalc/01/05020000.xhp">Cells</link></h2>
-<embed href="text/scalc/01/05020000.xhp#zellattributetext"/>
-<embed href="text/scalc/01/05030000.xhp#row"/>
-<embed href="text/scalc/01/05040000.xhp#column"/>
-<embed href="text/scalc/01/MergeCellsMenu.xhp#merge_cells_menu"/>
-<embed href="text/shared/01/05020000.xhp#character"/>
-<embed href="text/shared/01/05030000.xhp#paragraph"/>
-<embed href="text/scalc/01/05070000.xhp#pagestyle"/>
-<embed href="text/scalc/01/05080000.xhp#printranges"/>
-<embed href="text/scalc/01/05120000.xhp#condformat"/>
-<embed href="text/shared/01/AutoFormat.xhp#autoformat"/>
-<embed href="text/scalc/01/FormatSparklineMenu.xhp#formatsparklinemenu"/>
-<embed href="text/shared/menu/submenu_image.xhp#submenu_image"/>
-<bookmark branch="hid/.uno:ExportAsGraphic" id="bm_id491701618146522"
localize="false"/>
-<bookmark branch="hid/.uno:ChartMenu" id="bm_id791701618151097"
localize="false"/>
-<h2 id="hd_id851701617819857">Chart - Export as Image</h2>
-<paragraph role="paragraph" id="par_id791701617919079">Exports directly the
chart as image. Select the image file type in the Save dialog.</paragraph>
-<embed href="text/swriter/01/format_object.xhp#object"/>
-<embed href="text/shared/01/05190000.xhp#name_head"/>
-<embed href="text/shared/01/05190100.xhp#description_head"/>
-<embed href="text/shared/01/05260000.xhp#anchoring"/>
-<embed href="text/shared/01/05250000.xhp#arrange"/>
-
-<embed href="text/shared/01/05070000.xhp#alignment"/>
-<embed href="text/shared/01/05080000.xhp#alignment"/>
-<embed href="text/shared/01/05240000.xhp#flip"/>
-<embed href="text/shared/01/05290000.xhp#group"/>
-
-</body>
-
-</helpdocument>
diff --git a/source/text/sdraw/01/insert_layer.xhp
b/source/text/sdraw/01/insert_layer.xhp
index 9f3a3ce214..3c1da8a4a1 100644
--- a/source/text/sdraw/01/insert_layer.xhp
+++ b/source/text/sdraw/01/insert_layer.xhp
@@ -19,16 +19,16 @@
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0104020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert Layer</title>
+<title id="tit">Insert Layer</title>
<filename>/text/sdraw/01/insert_layer.xhp</filename>
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertLayer" id="bm_id5317946"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ModifyLayer" id="bm_id3156326"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/sdraw/ui/insertlayer/@@nowidget@@" id="bm_@@nowidget@@"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/sdraw/ui/insertlayer/InsertLayerDialog" id="bm_id3150716"
localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156329">
+<bookmark branch="hid/.uno:InsertLayer" id="bm_id5317946" localize="false"/>
+<bookmark branch="hid/.uno:ModifyLayer" id="bm_id3156326" localize="false"/>
+<bookmark branch="hid/modules/sdraw/ui/insertlayer/@@nowidget@@"
id="bm_@@nowidget@@" localize="false"/>
+<bookmark branch="hid/modules/sdraw/ui/insertlayer/InsertLayerDialog"
id="bm_id3150716" localize="false"/>
+<bookmark branch="index" id="bm_id3156329">
<bookmark_value>renaming layers</bookmark_value>
<bookmark_value>layers; renaming</bookmark_value>
<bookmark_value>layers; insert</bookmark_value>
@@ -36,43 +36,47 @@
<bookmark_value>modify layer</bookmark_value>
<bookmark_value>insert layer</bookmark_value>
</bookmark>
-<h1 id="hd_id3151074"><variable id="h1"><link
href="text/sdraw/01/insert_layer.xhp">Insert or Modify
Layer</link></variable></h1>
-<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US"><variable
id="ebenetext"><ahelp hid=".uno:InsertLayer">Inserts a new layer or modify a
layer in the document. Layers are only available in Draw, not in Impress.
</ahelp></variable></paragraph>
+
+<section id="layer">
+ <h1 id="hd_id3151074"><variable id="h1"><link
href="text/sdraw/01/insert_layer.xhp">Insert or Modify
Layer</link></variable></h1>
+<paragraph role="paragraph" id="par_id3153415"><variable id="ebenetext"><ahelp
hid=".uno:InsertLayer">Inserts a new layer or modify a layer in the document.
Layers are only available in Draw, not in Impress.
</ahelp></variable></paragraph>
+</section>
+
<section id="howtoget">
<embed href="text/sdraw/00/insert_menu.xhp#insert_layer"/>
</section>
<note id="par_id3150205">To select a layer, click the corresponding tab at the
bottom of the workspace.</note>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/name"
id="bm_id3156449" localize="false"/>
+<bookmark branch="hid/modules/sdraw/ui/insertlayer/name" id="bm_id3156449"
localize="false"/>
<embed href="text/shared/06/sd_screenshots.xhp#insertlayer"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:RenameLayer" id="bm_id3145387"
localize="false"/>
+<bookmark branch="hid/.uno:RenameLayer" id="bm_id3145387" localize="false"/>
<h2 id="hd_id3145588">Name</h2>
-<paragraph role="paragraph" id="par_id3149404" xml-lang="en-US"><ahelp
hid="modules/sdraw/ui/insertlayer/name">Enter a name for the new layer. To
rename the layer, enter the new name.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149404"><ahelp
hid="modules/sdraw/ui/insertlayer/name">Enter a name for the new layer. To
rename the layer, enter the new name.</ahelp></paragraph>
<section id="reservednames">
<note id="par_id511677022598993">The following layer names are used
internally and cannot be set or modified: <literal>layout</literal>,
<literal>background</literal>, <literal>backgroundobjects</literal>,
<literal>controls</literal>,
<literal>measurelines</literal>.<br/><br/><literal>layout</literal>,
<literal>controls</literal> and <literal>measurelines</literal> layers are
visible in normal view and correspond to the predefined layers
<emph>Layout</emph>, <emph>Controls</emph> and <emph>Dimension Lines</emph>,
respectively.<br/><br/>The <literal>backgroundobjects</literal> layer is
visible in master view under the name <emph>Background
objects</emph>.<br/><br/>The <literal>background</literal> layer is never
visible and is not intended to be used.</note>
</section>
<tip id="par_id761667238910931">To rename the layer directly, right-click the
layer tab at the bottom, select <menuitem>Rename Layer</menuitem> in the
context menu and enter the new name in the tab.</tip>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/title"
id="bm_id301596204068375" localize="false"/>
+<bookmark branch="hid/modules/sdraw/ui/insertlayer/title"
id="bm_id301596204068375" localize="false"/>
<h2 id="hd_id641596204028276">Title</h2>
-<paragraph role="paragraph" id="par_id271596204273624"><ahelp
hid="modules/sdraw/ui/insertlayer/title" >Enter the title of the
layer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/textview"
id="bm_id11596204077435" localize="false"/>
+<paragraph role="paragraph" id="par_id271596204273624"><ahelp
hid="modules/sdraw/ui/insertlayer/title">Enter the title of the
layer.</ahelp></paragraph>
+<bookmark branch="hid/modules/sdraw/ui/insertlayer/textview"
id="bm_id11596204077435" localize="false"/>
<h2 id="hd_id791596204033460">Description</h2>
<paragraph role="paragraph" id="par_id471596204283656"><ahelp
hid="modules/sdraw/ui/insertlayer/textview">Enter a description of the
layer.</ahelp></paragraph>
<h2 id="hd_id3153820">Layer Properties</h2>
-<paragraph role="paragraph" id="par_id3151240" xml-lang="en-US">Set the
properties for the layer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/visible"
id="bm_id3156017" localize="false"/>
+<paragraph role="paragraph" id="par_id3151240">Set the properties for the
layer.</paragraph>
+<bookmark branch="hid/modules/sdraw/ui/insertlayer/visible" id="bm_id3156017"
localize="false"/>
<h3 id="hd_id3149945">Visible</h3>
-<paragraph role="paragraph" id="par_id3157980" xml-lang="en-US"><ahelp
hid="modules/sdraw/ui/insertlayer/visible">Show or hide the
layer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/printable"
id="bm_id3150046" localize="false"/>
+<paragraph role="paragraph" id="par_id3157980"><ahelp
hid="modules/sdraw/ui/insertlayer/visible">Show or hide the
layer.</ahelp></paragraph>
+<bookmark branch="hid/modules/sdraw/ui/insertlayer/printable"
id="bm_id3150046" localize="false"/>
<h3 id="hd_id3153246">Printable</h3>
-<paragraph role="paragraph" id="par_id3154762" xml-lang="en-US"><ahelp
hid="modules/sdraw/ui/insertlayer/printable">When printing, print or ignore
this particular layer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/locked"
id="bm_id3149870" localize="false"/>
+<paragraph role="paragraph" id="par_id3154762"><ahelp
hid="modules/sdraw/ui/insertlayer/printable">When printing, print or ignore
this particular layer.</ahelp></paragraph>
+<bookmark branch="hid/modules/sdraw/ui/insertlayer/locked" id="bm_id3149870"
localize="false"/>
<h3 id="hd_id3146965">Locked</h3>
-<paragraph role="paragraph" id="par_id3149876" xml-lang="en-US"><ahelp
hid="modules/sdraw/ui/insertlayer/locked">Prevent elements on the layer from
being edited.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149876"><ahelp
hid="modules/sdraw/ui/insertlayer/locked">Prevent elements on the layer from
being edited.</ahelp></paragraph>
<section id="relatedtopics">
<embed href="text/sdraw/guide/layers.xhp#layers"/>
<embed href="text/sdraw/guide/layer_tipps.xhp#layer_tipps"/>
</section>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/sdraw/main0100.xhp b/source/text/sdraw/main0100.xhp
index fba9b2b37a..3d646a00fb 100644
--- a/source/text/sdraw/main0100.xhp
+++ b/source/text/sdraw/main0100.xhp
@@ -37,7 +37,7 @@
<embed href="text/shared/main_edit.xhp#edit"/>
<embed href="text/shared/main0103.xhp#view"/>
<embed href="text/sdraw/main_insert.xhp#insert"/>
- <embed href="text/sdraw/main_format.xhp#format"/>
+ <embed href="text/shared/main_format.xhp#format"/>
<embed href="text/sdraw/main_page.xhp#page"/>
<embed href="text/sdraw/main_shape.xhp#shape"/>
<embed href="text/shared/main_tools.xhp#tools_menu"/>
diff --git a/source/text/sdraw/main_format.xhp
b/source/text/sdraw/main_format.xhp
deleted file mode 100644
index 82fe0d33d3..0000000000
--- a/source/text/sdraw/main_format.xhp
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 .
- -->
-<helpdocument version="1.0">
-<meta>
-<topic id="textsdrawmain_formatxml" indexer="include" status="PUBLISH">
-<title id="tit">Format</title>
-<filename>/text/sdraw/main_format.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<section id="format">
-<h1 id="hd_id3153770"><link
href="text/sdraw/main_format.xhp">Format</link></h1>
-<paragraph role="paragraph" id="par_id3152578">Contains commands for
formatting the layout and the contents of your document.</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/menu/submenu_lists.xhp#submenu_lists"/>
-<embed href="text/shared/01/05010000.xhp#standard"/>
-<h2 id="hd_id3155111"><link
href="text/shared/01/05020000.xhp">Character</link></h2>
-<embed href="text/shared/01/05020000.xhp#zeichentext"/>
-<h2 id="hd_id3146979"><link
href="text/shared/01/05030000.xhp">Paragraph</link></h2>
-<embed href="text/shared/01/05030000.xhp#absatztext"/>
-<h2 id="hd_id3166426"><link href="text/shared/01/06050000.xhp">Bullets and
Numbering</link></h2>
-<embed href="text/shared/01/06050000.xhp#numauftext"/>
-<h2 id="hd_id3146971"><link href="text/shared/01/05230000.xhp">Position and
Size</link></h2>
-<embed href="text/shared/menu/submenu_image.xhp#submenu_image"/>
-<embed href="text/shared/01/05230000.xhp#groessetext"/>
-<h2 id="hd_id3148576"><link href="text/shared/01/05200000.xhp">Line</link></h2>
-<embed href="text/shared/01/05200000.xhp#linietext"/>
-<h2 id="hd_id3151076"><link href="text/shared/01/05210000.xhp">Area</link></h2>
-<embed href="text/shared/01/05210000.xhp#flaechetext"/>
-<h2 id="hd_id3153878"><link href="text/shared/01/05990000.xhp">Text
Attributes</link></h2>
-<embed href="text/shared/01/05990000.xhp#texttext"/>
-<h2 id="hd_id3153913"><link
href="text/sdraw/01/insert_layer.xhp">Layer</link></h2>
-<embed href="text/sdraw/01/insert_layer.xhp#ebenetext"/>
-<embed href="text/shared/01/styles.xhp#styles_and_formatting"/>
-</body>
-</helpdocument>
diff --git a/source/text/shared/01/05010000.xhp
b/source/text/shared/01/05010000.xhp
index f37e2bfbae..89e9550541 100644
--- a/source/text/shared/01/05010000.xhp
+++ b/source/text/shared/01/05010000.xhp
@@ -24,7 +24,6 @@
</topic>
</meta>
<body>
-<section id="standard">
<bookmark branch="index" id="bm_id3157959">
<bookmark_value>formatting; undoing when writing</bookmark_value>
<bookmark_value>paragraph;clear direct formatting</bookmark_value>
@@ -39,6 +38,7 @@
<bookmark branch="hid/.uno:SetDefault" id="bm_id3244018" localize="false"/>
<bookmark branch="hid/.uno:StandardTextAttributes" id="bm_id2575480"
localize="false"/>
+<section id="standard">
<h1 id="hd_id3153391"><variable id="clear_direct_formatting_h1"><link
href="text/shared/01/05010000.xhp">Clear Direct
Formatting</link></variable></h1>
<section id="clear_direct_formatting_content"><paragraph role="paragraph"
id="par_id3145829"><ahelp hid=".">Removes direct formatting from the
selection.</ahelp></paragraph></section>
</section>
diff --git a/source/text/shared/01/05200000.xhp
b/source/text/shared/01/05200000.xhp
index fdfe7d1c1a..aef5255d54 100644
--- a/source/text/shared/01/05200000.xhp
+++ b/source/text/shared/01/05200000.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="textshared0105200000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Line</title>
+<title id="tit">Line</title>
<filename>/text/shared/01/05200000.xhp</filename>
</topic>
<history>
@@ -30,12 +27,10 @@
</history>
</meta>
<body>
+<bookmark branch="hid/.uno:FormatLine" id="bm_id3154545" localize="false"/>
<section id="line">
-<bookmark xml-lang="en-US" branch="hid/.uno:FormatLine" id="bm_id3154545"
localize="false"/>
<h1 id="hd_id3154350"><link href="text/shared/01/05200000.xhp">Line</link></h1>
-<paragraph role="paragraph" id="par_id3147588" xml-lang="en-US">
-<variable id="linietext"><ahelp hid=".uno:FormatLine">Sets the formatting
options for the selected line.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3147588"><variable id="linietext"><ahelp
hid=".uno:FormatLine">Sets the formatting options for the selected
line.</ahelp></variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040502.xhp#line1"/>
diff --git a/source/text/shared/01/05210000.xhp
b/source/text/shared/01/05210000.xhp
index 1a43bafc3d..ed4bc503f4 100644
--- a/source/text/shared/01/05210000.xhp
+++ b/source/text/shared/01/05210000.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="textshared0105210000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Area window</title>
+<title id="tit">Area window</title>
<filename>/text/shared/01/05210000.xhp</filename>
</topic>
<history>
@@ -30,14 +27,12 @@
</history>
</meta>
<body>
+<bookmark branch="hid/cui/ui/areadialog/AreaDialog" id="bm_id3146960"
localize="false"/>
+<bookmark branch="hid/cui/ui/areadialog/@@nowidget@@" id="bm_id3146960"
localize="false"/>
+<bookmark branch="hid/.uno:FormatArea" id="bm_id3154349" localize="false"/>
<section id="area">
-<bookmark xml-lang="en-US" branch="hid/cui/ui/areadialog/AreaDialog"
id="bm_id3146960" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/areadialog/@@nowidget@@"
id="bm_id3146960" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FormatArea" id="bm_id3154349"
localize="false"/>
<h1 id="hd_id3085157"><link href="text/shared/01/05210000.xhp">Area</link></h1>
-<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US">
-<variable id="flaechetext"><ahelp hid=".uno:FormatArea">Sets the fill
properties of the selected drawing object.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3144436"><variable
id="flaechetext"><ahelp hid=".uno:FormatArea">Sets the fill properties of the
selected drawing object.</ahelp></variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040502.xhp#area1"/>
diff --git a/source/text/shared/01/05230000.xhp
b/source/text/shared/01/05230000.xhp
index 3deadbe48a..d2cf746ace 100644
--- a/source/text/shared/01/05230000.xhp
+++ b/source/text/shared/01/05230000.xhp
@@ -22,7 +22,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textshared0105230000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Position and Size</title>
+<title id="tit">Position and Size</title>
<filename>/text/shared/01/05230000.xhp</filename>
</topic>
<history>
@@ -30,11 +30,10 @@
</history>
</meta>
<body>
+<bookmark branch="hid/.uno:TransformDialog" id="bm_id2566032"
localize="false"/>
<section id="position_and_size">
-<bookmark xml-lang="en-US" branch="hid/.uno:TransformDialog" id="bm_id2566032"
localize="false"/>
<h1 id="hd_id3152790"><link href="text/shared/01/05230000.xhp">Position and
Size</link></h1>
-<paragraph role="paragraph" id="par_id3157552" xml-lang="en-US"><variable
id="groessetext"><ahelp hid=".uno:TransformDialog">Resizes, moves, rotates, or
slants the selected object.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3157552"><variable
id="groessetext"><ahelp hid=".uno:TransformDialog">Resizes, moves, rotates, or
slants the selected object.</ahelp></variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040502.xhp#position1"/>
diff --git a/source/text/shared/01/05350000.xhp
b/source/text/shared/01/05350000.xhp
index 66678b9223..6a394d11ea 100644
--- a/source/text/shared/01/05350000.xhp
+++ b/source/text/shared/01/05350000.xhp
@@ -19,7 +19,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textshared0105350000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">3D Effects</title>
+<title id="tit">3D Effects</title>
<filename>/text/shared/01/05350000.xhp</filename>
</topic>
<history>
@@ -27,16 +27,15 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id131592533297401">
- <bookmark_value>3D Effects</bookmark_value>
-
+<bookmark branch="index" id="bm_id131592533297401">
+<bookmark_value>3D Effects</bookmark_value>
</bookmark>
+<bookmark branch="hid/svx/ui/docking3deffects/@@nowidget@@"
id="bm_@@nowidget@@" localize="false"/>
+<bookmark branch="hid/svx/ui/docking3deffects/Docking3DEffects"
id="bm_id5991850" localize="false"/>
+<bookmark branch="hid/.uno:Window3D" id="bm_id3147069" localize="false"/>
<section id="3deffects">
-<bookmark xml-lang="en-US" branch="hid/svx/ui/docking3deffects/@@nowidget@@"
id="bm_@@nowidget@@" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/svx/ui/docking3deffects/Docking3DEffects" id="bm_id5991850"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Window3D" id="bm_id3147069"
localize="false"/>
<h1 id="hd_id3153136"><link href="text/shared/01/05350000.xhp">3D
Effects</link></h1>
-<paragraph role="paragraph" id="par_id3156324" xml-lang="en-US"><ahelp
hid=".uno:Window3D">Specifies the properties of 3D object(s) in the current
document or converts a 2D object to 3D.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156324"><ahelp
hid=".uno:Window3D">Specifies the properties of 3D object(s) in the current
document or converts a 2D object to 3D.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#3d"/>
@@ -47,65 +46,65 @@
<embed href="text/shared/01/05350500.xhp#textures"/>
<embed href="text/shared/01/05350600.xhp#material"/>
<section id="otherbuttons">
-<bookmark xml-lang="en-US" branch="hid/svx/ui/docking3deffects/assign"
id="bm_id221592537288166" localize="false"/>
+<bookmark branch="hid/svx/ui/docking3deffects/assign"
id="bm_id221592537288166" localize="false"/>
<h2 id="hd_id281592536322406">Apply</h2>
<paragraph role="paragraph" id="par_id741592536331459">Click here to apply the
properties shown in the dialog to the selected object.</paragraph>
<table id="tab_id671592538701618">
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id41592538802394">
- <image src="svx/res/apply.png" id="img_id861592538802395"
width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id501592538802396">Apply
icon</alt></image>
+ <image src="svx/res/apply.png" id="img_id861592538802395"
width="1cm" height="1cm"><alt id="alt_id501592538802396">Apply
icon</alt></image>
</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id631592538701619" role="paragraph"
xml-lang="en-US" >Apply</paragraph>
+ <paragraph id="par_id631592538701619"
role="paragraph">Apply</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/svx/ui/docking3deffects/update"
id="bm_id221592537258166" localize="false"/>
+<bookmark branch="hid/svx/ui/docking3deffects/update"
id="bm_id221592537258166" localize="false"/>
<h2 id="hd_id71592536242245">Update</h2>
<paragraph role="paragraph" id="par_id631592536255091">Click here to view in
the dialog all the properties of the selected object.</paragraph>
<table id="tab_id731592538985328">
<tablerow>
<tablecell>
<paragraph id="par_id231592538985329" role="paragraph">
- <image src="res/sc10350.png" id="img_id761592538985330"
width="1cm" height="1cm"><alt xml-lang="en-US"
id="alt_id401592538985331">Update Icon</alt></image>
+ <image src="res/sc10350.png" id="img_id761592538985330"
width="1cm" height="1cm"><alt id="alt_id401592538985331">Update
Icon</alt></image>
</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id401592538985331" role="paragraph"
xml-lang="en-US" >Update</paragraph>
+ <paragraph id="par_id401592538985331"
role="paragraph">Update</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/shared/00/00000001.xhp#preview_field"/>
-<bookmark xml-lang="en-US" branch="hid/svx/ui/docking3deffects/to3d"
id="bm_id221592537288166" localize="false"/>
+<bookmark branch="hid/svx/ui/docking3deffects/to3d" id="bm_id221592537288166"
localize="false"/>
<h2 id="hd_id11592536591540">Convert to 3-D</h2>
<paragraph role="paragraph" id="par_id531592536732187"><ahelp hid=".">Use this
icon to convert a selected 2D object to a 3D object.</ahelp> You can also
select several 2D objects and convert them to one single 3D object. To convert
a group of 2D objects to 3D, you must first ungroup the selected
objects.</paragraph>
<table id="tab_id171592539101656">
<tablerow>
<tablecell>
<paragraph id="par_id281592539101657" role="paragraph">
- <image src="svx/res/convrt3d.png" id="img_id731592539101658"
width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id751592539101659">Icon
Convert to 3-D</alt></image>
+ <image src="svx/res/convrt3d.png" id="img_id731592539101658"
width="1cm" height="1cm"><alt id="alt_id751592539101659">Icon Convert to
3-D</alt></image>
</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id551592539101660" role="paragraph"
xml-lang="en-US" >Convert to 3-D</paragraph>
+ <paragraph id="par_id551592539101660" role="paragraph">Convert to
3-D</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/svx/ui/docking3deffects/tolathe"
id="bm_id231592537288166" localize="false"/>
+<bookmark branch="hid/svx/ui/docking3deffects/tolathe"
id="bm_id231592537288166" localize="false"/>
<h2 id="hd_id601592536828018">Convert to Rotation Object</h2>
<paragraph role="paragraph" id="par_id611592536869774"><ahelp hid=".">Click
here to convert a selected 2D object to a 3D rotation object.</ahelp> You can
also select several 2D objects and convert them to one single 3D rotation
object. To convert a group of 2D objects to 3D, you must first ungroup the
selected objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx/ui/docking3deffects/perspective"
id="bm_id221592537288155" localize="false"/>
+<bookmark branch="hid/svx/ui/docking3deffects/perspective"
id="bm_id221592537288155" localize="false"/>
<table id="tab_id491592539216067">
<tablerow>
<tablecell>
<paragraph id="par_id201592539216068" role="paragraph">
- <image src="svx/res/rotate3d.png" id="img_id301592539216069"
width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id321592539216069">Icon
Convert to Rotation Object</alt></image>
+ <image src="svx/res/rotate3d.png" id="img_id301592539216069"
width="1cm" height="1cm"><alt id="alt_id321592539216069">Icon Convert to
Rotation Object</alt></image>
</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id561592539216070" role="paragraph"
xml-lang="en-US" >Convert to Rotation Object</paragraph>
+ <paragraph id="par_id561592539216070" role="paragraph">Convert to
Rotation Object</paragraph>
</tablecell>
</tablerow>
</table>
@@ -115,11 +114,11 @@
<tablerow>
<tablecell>
<paragraph id="par_id141592539295096" role="paragraph">
- <image src="svx/res/persp3d.png" id="img_id341592539295097"
width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id11592539295098">Icon
Perspective On/Off</alt></image>
+ <image src="svx/res/persp3d.png" id="img_id341592539295097"
width="1cm" height="1cm"><alt id="alt_id11592539295098">Icon Perspective
On/Off</alt></image>
</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id31592539295099" role="paragraph"
xml-lang="en-US" >Perspective On/Off</paragraph>
+ <paragraph id="par_id31592539295099" role="paragraph">Perspective
On/Off</paragraph>
</tablecell>
</tablerow>
</table>
diff --git a/source/text/shared/01/05990000.xhp
b/source/text/shared/01/05990000.xhp
index b8ebd4b43d..a3de48d32e 100644
--- a/source/text/shared/01/05990000.xhp
+++ b/source/text/shared/01/05990000.xhp
@@ -19,20 +19,20 @@
<helpdocument version="1.0">
<meta>
<topic id="textshared0105990000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Text Attributes</title>
+<title id="tit">Text Attributes</title>
<filename>/text/shared/01/05990000.xhp</filename>
</topic>
</meta>
<body>
<section id="text"><comment>UFI: removed 2 help ids</comment>
-<h1 id="hd_id3155757" xml-lang="en-US"><link
href="text/shared/01/05990000.xhp">Text Attributes</link></h1>
-<paragraph role="paragraph" id="par_id3150467" xml-lang="en-US"><variable
id="texttext"><ahelp hid=".uno:TextAttributes">Sets the layout and anchoring
properties for text in the selected drawing or text object.</ahelp>
+<h1 id="hd_id3155757"><link href="text/shared/01/05990000.xhp">Text
Attributes</link></h1>
+<paragraph role="paragraph" id="par_id3150467"><variable id="texttext"><ahelp
hid=".uno:TextAttributes">Sets the layout and anchoring properties for text in
the selected drawing or text object.</ahelp>
</variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040502.xhp#formattext"/>
</section>
-<paragraph role="paragraph" id="par_id3150620" xml-lang="en-US">This command
is only available for drawing objects that can contain text, for example for
rectangles, but not for lines.</paragraph>
+<paragraph role="paragraph" id="par_id3150620">This command is only available
for drawing objects that can contain text, for example for rectangles, but not
for lines.</paragraph>
<embed href="text/shared/01/05220000.xhp#text"/>
<embed href="text/shared/01/05320000.xhp#text_animation"/>
<embed href="text/shared/00/00000001.xhp#reset"/>
diff --git a/source/text/shared/main_format.xhp
b/source/text/shared/main_format.xhp
new file mode 100644
index 0000000000..44e0f03044
--- /dev/null
+++ b/source/text/shared/main_format.xhp
@@ -0,0 +1,143 @@
+<?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="text/shared/main_format.xhp" indexer="include"
status="PUBLISH">
+ <title id="tit">Format</title>
+ <filename>/text/shared/main_format.xhp</filename>
+ </topic>
+</meta>
+<body>
+<bookmark branch="hid/.uno:FormatMenu" id="bm_id3047160" localize="false"/>
+<section id="format">
+ <h1 id="hd_id911748544026656"><variable id="h1"><link
href="text/shared/main_format.xhp">Format</link></variable></h1>
+ <paragraph id="par_id3147218" role="paragraph">Contains commands for
formatting the layout and the contents of your document.</paragraph>
+</section>
+<switch select="appl">
+ <case select="WRITER">
+ <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"/>
+ <embed href="text/shared/02/paintbrush.xhp#paintbrush_head"/>
+ <embed href="text/shared/01/05010000.xhp#standard"/>
+ <embed href="text/swriter/01/SpotlightMenu.xhp#spotlightmenu"/>
+ <embed href="text/shared/01/05020000.xhp#character"/>
+ <embed href="text/shared/01/05030000.xhp#paragraph"/>
+
+ <embed href="text/shared/menu/submenu_lists.xhp#submenu_lists"/>
+ <embed href="text/shared/01/06050000.xhp#bullets_and_numbering"/>
+ <embed href="text/shared/01/themesdialog.xhp#themesHead"/>
+ <embed href="text/swriter/01/05040000.xhp#PageStyle"/>
+ <embed
href="text/swriter/01/title_page.xhp#using_title_pages_in_your_document"/>
+ <h2 id="hd_id201602976343046"><link
href="text/shared/01/05020000.xhp">Comments</link></h2>
+ <paragraph role="paragraph" id="par_id61602976356685">When comments
are present, the character dialog is presented. Changes to font and font
formatting are applied to all comments.</paragraph>
+ <embed href="text/shared/01/05060000.xhp#ruby"/>
+ <embed href="text/swriter/01/05040500.xhp#columns_h1"/>
+ <embed href="text/swriter/01/watermark.xhp#wm01"/>
+ <embed href="text/swriter/01/02170000.xhp#formatsection"/>
+ <embed href="text/shared/menu/submenu_image.xhp#submenu_image"/>
+ <embed href="text/swriter/01/format_object.xhp#object"/>
+ <embed href="text/swriter/01/format_frame.xhp#FormatFrameMenu"/>
+ <embed href="text/shared/01/05190000.xhp#name_head"/>
+ <embed href="text/shared/01/05190100.xhp#description_head"/>
+ <embed href="text/shared/01/05260000.xhp#anchoring"/>
+ <embed href="text/swriter/01/05060200.xhp#wrap"/>
+ <embed href="text/shared/01/05250000.xhp#arrange"/>
+ <embed href="text/shared/menu/submenu_rotateflip.xhp#rotateflipmenu"/>
+ <embed href="text/shared/01/05290000.xhp#group"/>
+ </case>
+ <case select="CALC">
+ <embed href="text/shared/menu/submenu_text.xhp#submenu_text"/>
+ <embed href="text/shared/01/05080000.xhp#alignment"/>
+ <embed
href="text/scalc/01/default_number_formats.xhp#numberformatmenu"/>
+ <embed href="text/shared/01/05010000.xhp#standard"/>
+ <embed href="text/scalc/01/05020000.xhp#formatcells"/>
+ <embed href="text/scalc/01/05020000.xhp#zellattributetext"/>
+ <embed href="text/scalc/01/05030000.xhp#row"/>
+ <embed href="text/scalc/01/05040000.xhp#column"/>
+ <embed href="text/scalc/01/MergeCellsMenu.xhp#merge_cells_menu"/>
+ <embed href="text/shared/01/05020000.xhp#character"/>
+ <embed href="text/shared/01/05030000.xhp#paragraph"/>
+ <embed href="text/scalc/01/05070000.xhp#pagestyle"/>
+ <embed href="text/scalc/01/05080000.xhp#printranges"/>
+ <embed href="text/scalc/01/05120000.xhp#condformat"/>
+ <embed href="text/shared/01/AutoFormat.xhp#autoformat"/>
+ <embed href="text/scalc/02/06080000.xhp#themeselection"/>
+ <embed href="text/shared/01/themesdialog.xhp#themesHead"/>
+ <embed href="text/shared/menu/submenu_image.xhp#submenu_image"/>
+ <bookmark branch="hid/.uno:ExportAsGraphic" id="bm_id491701618146522"
localize="false"/>
+ <bookmark branch="hid/.uno:ChartMenu" id="bm_id791701618151097"
localize="false"/>
+ <h2 id="hd_id851701617819857">Chart - Export as Image</h2>
+ <paragraph role="paragraph" id="par_id791701617919079">Exports
directly the chart as image. Select the image file type in the Save
dialog.</paragraph>
+ <embed
href="text/scalc/01/FormatSparklineMenu.xhp#formatsparklinemenu"/>
+ <embed href="text/swriter/01/format_object.xhp#object"/>
+ <embed href="text/shared/01/05190000.xhp#name_head"/>
+ <embed href="text/shared/01/05190100.xhp#description_head"/>
+ <embed href="text/shared/01/05260000.xhp#anchoring"/>
+ <embed href="text/shared/01/05250000.xhp#arrange"/>
+ <embed href="text/shared/01/05240000.xhp#flip"/>
+ <embed href="text/shared/01/05290000.xhp#group"/>
+ </case>
+ <case select="IMPRESS">
+ <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"/>
+ <embed href="text/shared/menu/submenu_lists.xhp#submenu_lists"/>
+ <embed href="text/shared/01/05010000.xhp#standard"/>
+ <embed href="text/shared/menu/style_menu.xhp#styles"/>
+ <embed href="text/shared/01/05020000.xhp#character"/>
+ <embed href="text/shared/01/05030000.xhp#paragraph"/>
+ <embed href="text/shared/01/06050000.xhp#bullets_and_numbering"/>
+ <embed href="text/shared/01/themesdialog.xhp#themesHead"/>
+ <embed href="text/swriter/main0110.xhp#table"/>
+ <embed href="text/shared/menu/submenu_image.xhp#submenu_image"/>
+ <embed href="text/simpress/submenu_object_shape.xhp#objectshape"/>
+ <embed href="text/shared/01/05210600.xhp#shadow"/>
+ <embed href="text/shared/01/05280000.xhp#fontwork"/>
+ <embed href="text/simpress/01/06070000.xhp#interactionh1"/>
+ <embed href="text/shared/01/05190000.xhp#name_head"/>
+ <embed href="text/shared/01/05190100.xhp#description_head"/>
+ <embed href="text/shared/01/05360000.xhp#distribute_selection"/>
+ <embed href="text/shared/02/05090000.xhp#rotate"/>
+ <embed href="text/shared/01/05240000.xhp#flip"/>
+ <embed href="text/simpress/01/13050000.xhp#convert"/>
+ <embed href="text/shared/01/05070000.xhp#alignment"/>
+ <embed href="text/simpress/01/05250000.xhp#arrange"/>
+ <embed href="text/shared/01/05290000.xhp#group"/>
+ </case>
+ <case select="DRAW">
+ <embed href="text/shared/menu/submenu_text.xhp#submenu_text"/>
+ <embed href="text/shared/menu/submenu_spacing.xhp#submenu_spacing"/>
+ <embed href="text/shared/menu/submenu_lists.xhp#submenu_lists"/>
+ <embed href="text/shared/01/05080000.xhp#alignment"/>
+ <embed href="text/shared/01/05010000.xhp#standard"/>
+ <embed href="text/shared/01/05020000.xhp#character"/>
+ <embed href="text/shared/01/05030000.xhp#paragraph"/>
+ <embed href="text/shared/01/06050000.xhp#bullets_and_numbering"/>
+ <embed href="text/shared/01/themesdialog.xhp#themesHead"/>
+ <embed href="text/sdraw/01/insert_layer.xhp#layer"/>
+ <embed href="text/swriter/main0110.xhp#table"/>
+ <embed href="text/shared/menu/submenu_image.xhp#submenu_image"/>
+ <embed href="text/shared/01/05230000.xhp#position_and_size"/>
+ <embed href="text/shared/01/05200000.xhp#line"/>
+ <embed href="text/simpress/01/05170000.xhp#connectors"/>
+ <embed href="text/shared/01/05210000.xhp#area"/>
+ <embed href="text/shared/01/05350000.xhp#3deffects"/>
+ <embed href="text/shared/01/05210600.xhp#shadow"/>
+ <embed href="text/shared/01/05280000.xhp#fontwork"/>
+ <embed href="text/shared/01/05190000.xhp#name_head"/>
+ <embed href="text/shared/01/05190100.xhp#description_head"/>
+ </case>
+ <default>
+ </default>
+</switch>
+</body>
+</helpdocument>
diff --git a/source/text/simpress/main0100.xhp
b/source/text/simpress/main0100.xhp
index f56aa1ea85..05bfb583f9 100644
--- a/source/text/simpress/main0100.xhp
+++ b/source/text/simpress/main0100.xhp
@@ -38,7 +38,7 @@
<embed href="text/shared/main_edit.xhp#edit"/>
<embed href="text/shared/main0103.xhp#view"/>
<embed href="text/shared/main0104.xhp#insert"/>
-<embed href="text/simpress/main_format.xhp#format"/>
+<embed href="text/shared/main_format.xhp#format"/>
<embed href="text/simpress/main_slide.xhp#slide"/>
<embed href="text/simpress/main0114.xhp#slideshow"/>
<embed href="text/shared/main_tools.xhp#tools_menu"/>
diff --git a/source/text/simpress/main_format.xhp
b/source/text/simpress/main_format.xhp
deleted file mode 100644
index 6332907d82..0000000000
--- a/source/text/simpress/main_format.xhp
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 .
--->
-<helpdocument version="1.0">
- <meta>
- <topic id="textsimpressmain_formatxml" indexer="include" status="PUBLISH">
- <title id="tit">Format</title>
- <filename>/text/simpress/main_format.xhp</filename>
- </topic>
- </meta>
- <body>
- <section id="format">
- <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"><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"/>
- <embed href="text/shared/menu/submenu_lists.xhp#submenu_lists"/>
- <embed href="text/shared/01/05010000.xhp#standard"/>
- <embed href="text/shared/menu/style_menu.xhp#styles"/>
- <embed href="text/shared/01/05020000.xhp#character"/>
- <embed href="text/shared/01/05030000.xhp#paragraph"/>
- <embed href="text/shared/01/06050000.xhp#bullets_and_numbering"/>
- <embed href="text/swriter/main0110.xhp#table"/>
- <embed href="text/shared/menu/submenu_image.xhp#submenu_image"/>
- <embed href="text/simpress/submenu_object_shape.xhp#objectshape"/>
- <embed href="text/shared/01/05210600.xhp#shadow"/>
- <embed href="text/shared/01/05280000.xhp#fontwork"/>
- <embed href="text/simpress/01/06070000.xhp#interactionh1"/>
- <embed href="text/shared/01/05190000.xhp#name_head"/>
- <embed href="text/shared/01/05190100.xhp#description_head"/>
- <embed href="text/shared/01/05360000.xhp#distribute_selection"/>
- <embed href="text/shared/02/05090000.xhp#rotate"/>
- <embed href="text/shared/01/05240000.xhp#flip"/>
- <embed href="text/simpress/01/13050000.xhp#convert"/>
- <embed href="text/shared/01/05070000.xhp#alignment"/>
- <embed href="text/simpress/01/05250000.xhp#arrange"/>
- <embed href="text/shared/01/05290000.xhp#group"/>
- </body>
-
-</helpdocument>
diff --git a/source/text/swriter/01/05040500.xhp
b/source/text/swriter/01/05040500.xhp
index 0867623409..b50e8b59a4 100644
--- a/source/text/swriter/01/05040500.xhp
+++ b/source/text/swriter/01/05040500.xhp
@@ -25,15 +25,14 @@
</topic>
</meta>
<body>
- <section id="columns">
<bookmark branch="hid/.uno:FormatColumns" id="bm_id7831291" localize="false"/>
<bookmark branch="hid/modules/swriter/ui/columnpage/@@nowidget@@"
id="bm_@@nowidget@@" localize="false"/>
<bookmark branch="hid/modules/swriter/ui/columnpage/ColumnPage"
id="bm_id3153246" localize="false"/>
<bookmark branch="hid/.uno:PageColumnDialog" id="bm_id1212200809342598"
localize="false"/><comment>added two Help IDs, see i97180</comment>
+<section id="columns">
<h1 id="hd_id3149875"><variable id="columns_h1"><link
href="text/swriter/01/05040500.xhp">Columns</link></variable></h1>
- <paragraph id="par_id3151392" role="paragraph"><variable
id="spaltentext"><ahelp
hid="modules/swriter/ui/columnpage/ColumnPage">Specifies the number of columns
and the column layout for a page style, frame, or section.</ahelp>
-</variable></paragraph>
- </section>
+ <paragraph id="par_id3151392" role="paragraph"><variable
id="spaltentext"><ahelp
hid="modules/swriter/ui/columnpage/ColumnPage">Specifies the number of columns
and the column layout for a page style, frame, or
section.</ahelp></variable></paragraph>
+</section>
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#columns"/>
</section>
diff --git a/source/text/swriter/main0100.xhp b/source/text/swriter/main0100.xhp
index fc683b57c7..9c7fcabf47 100644
--- a/source/text/swriter/main0100.xhp
+++ b/source/text/swriter/main0100.xhp
@@ -37,7 +37,7 @@
<embed href="text/shared/main_edit.xhp#edit"/>
<embed href="text/shared/main0103.xhp#view"/>
<embed href="text/shared/main0104.xhp#insert"/>
-<embed href="text/swriter/main0105.xhp#format"/>
+<embed href="text/shared/main_format.xhp#format"/>
<embed href="text/shared/menu/style_menu.xhp#styles"/>
<embed href="text/swriter/main0110.xhp#table"/>
<embed href="text/swriter/main0120.xhp#form"/>
diff --git a/source/text/swriter/main0105.xhp b/source/text/swriter/main0105.xhp
deleted file mode 100644
index 96c009e2ba..0000000000
--- a/source/text/swriter/main0105.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="textswritermain0105xml" indexer="include" status="PUBLISH">
- <title id="tit">Format</title>
- <filename>/text/swriter/main0105.xhp</filename>
- </topic>
-</meta>
-<body>
-<section id="format">
-<bookmark branch="hid/.uno:FormatMenu" id="bm_id3047160" localize="false"/>
-
-<h1 id="hd_id3147820"><link href="text/swriter/main0105.xhp">Format</link></h1>
-<paragraph id="par_id3147218" role="paragraph"><ahelp
hid=".uno:FormatMenu">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"/>
-<embed href="text/shared/02/paintbrush.xhp#paintbrush_head"/>
-<embed href="text/shared/01/05010000.xhp#standard"/>
-<embed href="text/swriter/01/SpotlightMenu.xhp#spotlightmenu"/>
-<h2 id="hd_id3147261"><link
href="text/shared/01/05020000.xhp">Character</link></h2>
-<embed href="text/shared/01/05020000.xhp#zeichentext"/>
-<h2 id="hd_id3147286"><link
href="text/shared/01/05030000.xhp">Paragraph</link></h2>
-<embed href="text/shared/01/05030000.xhp#absatztext"/>
-
-<embed href="text/shared/menu/submenu_lists.xhp#submenu_lists"/>
-
-<embed href="text/shared/01/06050000.xhp#bullets_and_numbering"/>
-
-<embed href="text/shared/01/themesdialog.xhp#themesHead"/>
-<embed href="text/swriter/01/05040000.xhp#PageStyle"/>
-
-<embed
href="text/swriter/01/title_page.xhp#using_title_pages_in_your_document"/>
-
-<h2 id="hd_id201602976343046"><link
href="text/shared/01/05020000.xhp">Comments</link></h2>
-<paragraph role="paragraph" id="par_id61602976356685">When comments are
present, the character dialog is presented. Changes to font and font formatting
are applied to all comments.</paragraph>
-
-<embed href="text/shared/01/05060000.xhp#ruby"/>
-
-<h2 id="hd_id3145743"><link
href="text/swriter/01/05040500.xhp">Columns</link></h2>
-<embed href="text/swriter/01/05040500.xhp#spaltentext"/>
-
-<embed href="text/swriter/01/watermark.xhp#wm01"/>
-<embed href="text/swriter/01/02170000.xhp#formatsection"/>
-
-<embed href="text/shared/menu/submenu_image.xhp#submenu_image"/>
-
-<embed href="text/swriter/01/format_object.xhp#object"/>
-<embed href="text/swriter/01/format_frame.xhp#FormatFrameMenu"/>
-
-<embed href="text/shared/01/05190000.xhp#name_head"/>
-<embed href="text/shared/01/05190100.xhp#description_head"/>
-<embed href="text/shared/01/05260000.xhp#anchoring"/>
-<embed href="text/swriter/01/05060200.xhp#wrap"/>
-<embed href="text/shared/01/05250000.xhp#arrange"/>
-<embed href="text/shared/menu/submenu_rotateflip.xhp#rotateflipmenu"/>
-<embed href="text/shared/01/05290000.xhp#group"/>
-</body>
-</helpdocument>
