AllLangHelp_scalc.mk | 1
source/text/scalc/01/format_graphic.xhp | 46 -------------------------------
source/text/swriter/01/format_object.xhp | 16 ++++++++--
3 files changed, 13 insertions(+), 50 deletions(-)
New commits:
commit 9426607bb843538b580738195af7316b5683623c
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Sat Sep 21 12:37:27 2024 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sat Sep 21 17:39:23 2024 +0200
tdf#162607 disambiguate hid2file.js, DrawGraphicMenu
+ This uno:DrawGraphicMenu does not exist (anymore)
+ drop duplicate page in scalc/01 folder
+ adjust format_object.xhp for Writer and Calc
Change-Id: I45b58ca078115a564e06a3b02bd93c0f50dc1e26
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/173764
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 79f3c53a1c..f2ff6bad6e 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -192,7 +192,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
helpcontent2/source/text/scalc/01/events_sheet \
helpcontent2/source/text/scalc/01/ex_data_stat_func \
helpcontent2/source/text/scalc/01/FieldMenu \
- helpcontent2/source/text/scalc/01/format_graphic \
helpcontent2/source/text/scalc/01/formula2value \
helpcontent2/source/text/scalc/01/FormatSparklineMenu \
helpcontent2/source/text/scalc/01/ful_func \
diff --git a/source/text/scalc/01/format_graphic.xhp
b/source/text/scalc/01/format_graphic.xhp
deleted file mode 100644
index fba576a5d8..0000000000
--- a/source/text/scalc/01/format_graphic.xhp
+++ /dev/null
@@ -1,46 +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="textscalc01format_graphicxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Graphic</title>
-<filename>/text/scalc/01/format_graphic.xhp</filename>
-</topic>
-<history>
-<created date="2005-07-15T13:44:54">Format Graphic menu in Calc</created>
-</history>
-</meta>
-<body>
-<section id="graphic">
-<bookmark xml-lang="en-US" branch="hid/.uno:DrawGraphicMenu" id="bm_id7711111"
localize="false"/>
-<h1 id="par_idN10548"><link
href="text/scalc/01/format_graphic.xhp">Graphic</link></h1>
-<paragraph role="paragraph" id="par_idN10558" xml-lang="en-US"><ahelp
hid=".">Opens a submenu to edit the properties of the selected
object.</ahelp></paragraph>
-</section>
-<embed href="text/shared/01/05230000.xhp#position_and_size"/>
-<embed href="text/shared/01/05200000.xhp#line"/>
-<embed href="text/shared/01/05210000.xhp#area"/>
-<h2 id="par_id1650440"><link href="text/shared/01/05990000.xhp">Define Text
Attributes</link></h2>
-<paragraph role="paragraph" id="par_id363475" xml-lang="en-US">Sets the layout
and anchoring properties for text in the selected drawing or text
object.</paragraph>
-<h2 id="par_id9746696">Points</h2>
-<paragraph role="paragraph" id="par_id2480544" xml-lang="en-US"><ahelp
hid=".">Switches <emph>Edit Points</emph> mode for an inserted freeform line on
and off.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/source/text/swriter/01/format_object.xhp
b/source/text/swriter/01/format_object.xhp
index 2af76e8423..a736a51671 100644
--- a/source/text/swriter/01/format_object.xhp
+++ b/source/text/swriter/01/format_object.xhp
@@ -27,7 +27,7 @@
</history>
</meta>
<body>
-<bookmark branch="hid/.uno:DrawGraphicMenu" id="bm_id5739310"
localize="false"/>
+
<bookmark branch="hid/.uno:FormatObjectMenu" id="bm_id301692832205444"
localize="false"/>
<section id="object">
<h1 id="par_idN10548" ><link href="text/swriter/01/format_object.xhp">Text Box
and Shape</link></h1>
@@ -37,11 +37,21 @@
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
<paragraph role="paragraph" id="par_id201692832345816">Choose
<menuitem>Format - Text Box and Shape</menuitem>.</paragraph>
</section>
+
<embed href="text/shared/01/05230000.xhp#position_and_size"/>
<embed href="text/shared/01/05200000.xhp#line"/>
<embed href="text/shared/01/05210000.xhp#area"/>
+
<embed href="text/shared/01/05990000.xhp#text"/><comment>Text
Attributes</comment>
-<h2 id="par_id9466841" ><link
href="text/shared/01/05280000.xhp">Fontwork</link></h2>
-<paragraph role="paragraph" id="par_id2874538" >Edits Fontwork effects of the
selected object that has been created with the previous Fontwork
dialog.</paragraph>
+
+<switch select="appl">
+ <case select="WRITER">
+ <embed href="text/shared/01/05280000.xhp#fontwork"/>
+ </case>
+ <case select="CALC">
+ <embed href="text/shared/01/05270000.xhp#edit_points"/>
+ </case>
+</switch>
+
</body>
</helpdocument>
