summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2024-09-16 18:11:03 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2024-09-17 14:44:05 +0200
commit614dd5fba24a70bc5b5a4cb43eb431fc4dacd3c0 (patch)
treeae5cb4323e52897d2faa4b9ef105ec4276bb174d /source
parentf7b6ce51459426167f1f17ea209ba38707788673 (diff)
tdf#162607 disambiguate hid2file.js, InsertAuthor
+ moved insert author to shared/ + Document access command, delete old command paths Change-Id: Ic2ce72a47f842b6bdaf8cdb7469beaded3f43f06 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/173483 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'source')
-rw-r--r--source/text/shared/00/00000404.xhp31
-rw-r--r--source/text/shared/01/InsertAuthorField.xhp29
-rw-r--r--source/text/simpress/00/00000404.xhp1
-rw-r--r--source/text/simpress/01/04990000.xhp6
-rw-r--r--source/text/simpress/01/04990600.xhp43
-rw-r--r--source/text/swriter/00/00000404.xhp2
-rw-r--r--source/text/swriter/02/18030700.xhp42
7 files changed, 64 insertions, 90 deletions
diff --git a/source/text/shared/00/00000404.xhp b/source/text/shared/00/00000404.xhp
index b13181a05a..38056fa028 100644
--- a/source/text/shared/00/00000404.xhp
+++ b/source/text/shared/00/00000404.xhp
@@ -717,5 +717,36 @@
</tablerow>
</table>
</section>
+<section id="insertauthor">
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph role="paragraph" id="par_id171726519211615">Choose <menuitem>Insert - Field - First Author</menuitem></paragraph>
+ </case>
+ <default>
+ <paragraph role="paragraph" id="par_id981726519216208">Choose <menuitem>Insert - Field - Author</menuitem></paragraph>
+ </default>
+ </switch>
+ <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph role="paragraph" id="par_id711726519940155">Choose <menuitem>Insert - Field - First Author</menuitem></paragraph>
+ </case>
+ <default>
+ <paragraph role="paragraph" id="par_id821726519943521">Choose <menuitem>Insert - Field - Author</menuitem></paragraph>
+ </default>
+ </switch>
+ <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+ <table id="tab_id581726519783330">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id581726519783331" role="paragraph"><image src="cmd/lc_dbviewaliases.svg" id="img_id111726519783332" width="1cm" height="1cm"><alt id="alt_id941726519783333">Icon Insert Author</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id21726519783335" role="paragraph">Insert Author</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+</section>
</body>
</helpdocument>
diff --git a/source/text/shared/01/InsertAuthorField.xhp b/source/text/shared/01/InsertAuthorField.xhp
new file mode 100644
index 0000000000..0bcf54e844
--- /dev/null
+++ b/source/text/shared/01/InsertAuthorField.xhp
@@ -0,0 +1,29 @@
+<?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="textshared01InsertAuthorFieldxhp" indexer="include" status="PUBLISH">
+ <title id="tit">Author</title>
+ <filename>/text/shared/01/InsertAuthorField.xhp</filename>
+ </topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertAuthorField" id="bm_id3154838" localize="false"/>
+<section id="insertauthor">
+ <h1 id="hd_id181726517749263"><variable id="h1"><link href="text/shared/01/InsertAuthorField.xhp"><switchinline select="appl"><caseinline select="WRITER">First Author (field)</caseinline><defaultinline>Author (field)</defaultinline></switchinline></link></variable></h1>
+
+ <paragraph id="par_id121726517749266" role="paragraph">Inserts the name of the person who created the document here as a field. The field applies the entry made under <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp"><menuitem>%PRODUCTNAME - User data</menuitem></link>.</paragraph>
+</section>
+<section id="howtoget">
+ <embed href="text/shared/00/00000404.xhp#insertauthor"/>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/simpress/00/00000404.xhp b/source/text/simpress/00/00000404.xhp
index 06d9809a3d..bf8182787a 100644
--- a/source/text/simpress/00/00000404.xhp
+++ b/source/text/simpress/00/00000404.xhp
@@ -87,7 +87,6 @@ Table</emph></paragraph>
<paragraph role="paragraph" id="par_id3153036"><variable id="feldbf3">Choose <emph>Insert - Field - Time (fixed)</emph></variable></paragraph>
<paragraph role="paragraph" id="par_id3145590"><variable id="feldbf4">Choose <emph>Insert - Field - Time (variable)</emph></variable></paragraph>
<paragraph role="paragraph" id="par_id3153935"><variable id="feldbf5">Choose <emph>Insert - Field - Page Number</emph></variable></paragraph>
- <paragraph role="paragraph" id="par_id3148583"><variable id="feldbf6">Choose <emph>Insert - Field - Author</emph></variable></paragraph>
<paragraph role="paragraph" id="par_id3155951"><variable id="feldbf7">Choose <emph>Insert - Field - File Name</emph></variable></paragraph>
</body>
</helpdocument>
diff --git a/source/text/simpress/01/04990000.xhp b/source/text/simpress/01/04990000.xhp
index 94e81c2117..bfe0c4092b 100644
--- a/source/text/simpress/01/04990000.xhp
+++ b/source/text/simpress/01/04990000.xhp
@@ -30,8 +30,8 @@
</history>
</meta>
<body>
-
-
+
+
<section id="fields">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154011"><bookmark_value>fields;in slides</bookmark_value></bookmark><h1 id="hd_id3154011"><link href="text/simpress/01/04990000.xhp">Fields</link> </h1>
<paragraph role="paragraph" id="par_id3149666" xml-lang="en-US">Lists common fields that you can insert into your slide.</paragraph>
@@ -44,7 +44,7 @@
<embed href="text/simpress/01/04990200.xhp#date_variable"/>
<embed href="text/simpress/01/04990300.xhp#time_fixed"/>
<embed href="text/simpress/01/04990400.xhp#time_variable"/>
- <embed href="text/simpress/01/04990600.xhp#author"/>
+ <embed href="text/shared/01/InsertAuthorField.xhp#insertauthor"/>
<embed href="text/simpress/01/04990500.xhp#page_number"/>
<embed href="text/simpress/01/04990700.xhp#file_name"/>
</body>
diff --git a/source/text/simpress/01/04990600.xhp b/source/text/simpress/01/04990600.xhp
deleted file mode 100644
index 6444a06bf9..0000000000
--- a/source/text/simpress/01/04990600.xhp
+++ /dev/null
@@ -1,43 +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="textsimpress0104990600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Author </title>
-<filename>/text/simpress/01/04990600.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="author">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3146974"><bookmark_value>authors</bookmark_value>
-<bookmark_value>fields; authors</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertAuthorField" id="bm_id3153728" localize="false"/>
-<h1 id="hd_id3146974"><link href="text/simpress/01/04990600.xhp">Author</link></h1>
-<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US"><ahelp hid=".uno:InsertAuthorField">Inserts the first and last names listed in the $[officename] user data into the active slide.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US">To edit the name, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp"><emph>$[officename] - User Data</emph></link>.</paragraph>
-<section id="howtoget">
- <embed href="text/simpress/00/00000404.xhp#feldbf6"/>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/swriter/00/00000404.xhp b/source/text/swriter/00/00000404.xhp
index e38616b5b2..2c8bbed237 100644
--- a/source/text/swriter/00/00000404.xhp
+++ b/source/text/swriter/00/00000404.xhp
@@ -65,7 +65,7 @@
<paragraph role="paragraph" id="par_id3149356"><variable id="pagecount_field">Choose <menuitem>Insert - Field - Page Count</menuitem></variable></paragraph>
<paragraph role="paragraph" id="par_id3153003"><variable id="feldbefehlthema">Choose <menuitem>Insert - Field - Subject</menuitem></variable></paragraph>
<paragraph role="paragraph" id="par_id3150016"><variable id="feldbefehltitel">Choose <menuitem>Insert - Field - Title</menuitem></variable></paragraph>
-<paragraph role="paragraph" id="par_id3150564"><variable id="feldbefehlautor">Choose <menuitem>Insert - Field - First Author</menuitem></variable></paragraph>
+
<section id="insert_more_fields">
<paragraph role="paragraph" id="par_id3148386">Choose <menuitem>Insert - Field - More Fields</menuitem></paragraph>
<paragraph role="paragraph" id="par_id3155990"><switchinline select="sys"><caseinline select="MAC">Command
diff --git a/source/text/swriter/02/18030700.xhp b/source/text/swriter/02/18030700.xhp
deleted file mode 100644
index 1e6f676030..0000000000
--- a/source/text/swriter/02/18030700.xhp
+++ /dev/null
@@ -1,42 +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="textswriter0218030700xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">First Author (field)</title>
-<filename>/text/swriter/02/18030700.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<section id="author">
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertAuthorField" id="bm_id3154838" localize="false"/>
-<h1 id="hd_id3154505"><link href="text/swriter/02/18030700.xhp">First Author (field)</link></h1>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US"><ahelp hid=".uno:InsertAuthorField">Inserts the name of the person who created the document here as a field.</ahelp> The field applies the entry made under <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010100.xhp"><emph>$[officename] - User data</emph></link>.</paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#feldbefehlautor"/>
-</section>
-</body>
-</helpdocument>
generated by cgit (git 2.34.1) at 2025-03-12 08:09:31 +0000