source/text/scalc/01/02180000.xhp | 3 ++-
source/text/shared/00/edit_menu.xhp | 25 +++++++++++++++++++++++--
source/text/shared/01/02230000.xhp | 2 +-
source/text/shared/01/02230100.xhp | 12 +++++++-----
4 files changed, 33 insertions(+), 9 deletions(-)
New commits:
commit c9ef3ec7d50ab940d9f9d2a4c255c2cd16a47048
Author: Dione Maddern <dionemadd...@gmail.com>
AuthorDate: Thu May 23 21:13:11 2024 +0200
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Thu May 23 23:10:39 2024 +0200
tdf#130838 tdf#154996 Add warning about copying/moving in record mode
In text/scalc/01/02180000.xhp
- Add statement that sheets can't be moved or copied in Record Changes mode.
In text/shared/00/edit_menu.xhp
- Updated howtoget instructions for "Track Changes" and "Record Changes",
including adding Tabbed UI instructions for "Record Changes" and hiding
instructions for the Track Changes toolbar behind an application switch,
because Calc does not have a Track Changes toolbar.
In text/shared/01/02230000.xhp
- Added variable tags to H1 so that the page can be more easily linked from
other pages
In text/shared/01/02230100.xhp
- Moved howtoget function to text/shared/00/edit_menu.xhp
- Updated embed link for howtoget section
Change-Id: I4776c0d45cd5d58a822cf00ede81ae3769ef8218
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167943
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/scalc/01/02180000.xhp
b/source/text/scalc/01/02180000.xhp
index 231fabe2c2..c5cd571065 100644
--- a/source/text/scalc/01/02180000.xhp
+++ b/source/text/scalc/01/02180000.xhp
@@ -39,13 +39,14 @@
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/movecopysheet/MoveCopySheetDialog"
id="bm_id3149657" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/movecopysheet/@@nowidget@@" id="bm_id3149657"
localize="false"/>
<section id="movecopysheet">
- <h1 id="hd_id3153360"><variable id="movecopy_sheet"><link
href="text/scalc/01/02180000.xhp#movecopysheet">Move or Copy a
Sheet</link></variable></h1>
+ <h1 id="hd_id3153360"><variable id="movecopy_sheet"><link
href="text/scalc/01/02180000.xhp">Move or Copy a Sheet</link></variable></h1>
<paragraph role="paragraph" id="par_id3154686" xml-lang="en-US"><variable
id="tabelleverschiebenkopierentext"><ahelp hid=".uno:Move">Moves or copies a
sheet to a new location in the document or to a different
document.</ahelp></variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/scalc/00/sheet_menu.xhp#move_or_copy_sheet"/>
</section>
<paragraph role="warning" id="par_id2282479" xml-lang="en-US">When you copy
and paste cells containing <link href="text/scalc/01/04060102.xhp">date
values</link> between different spreadsheets, both spreadsheet documents must
be set to the same date base. If date bases differ, the displayed date values
will change!</paragraph>
+<note id="par_id3720376688484858">When the <link
href="text/shared/01/02230100.xhp"><menuitem>Record Changes</menuitem></link>
command is active, you cannot delete or move sheets.</note>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/movecopysheet/toDocument" id="bm_id3146119"
localize="false"/>
<h2 id="hd_id3163710">To Document</h2>
<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US"><ahelp
hid="modules/scalc/ui/movecopysheet/toDocument">Indicates where the current
sheet is to be moved or copied to.</ahelp> Select <emph>- new document -</emph>
if you want to create a new location for the sheet to be moved or
copied.</paragraph>
diff --git a/source/text/shared/00/edit_menu.xhp
b/source/text/shared/00/edit_menu.xhp
index 63e9ba4297..3a8797488f 100644
--- a/source/text/shared/00/edit_menu.xhp
+++ b/source/text/shared/00/edit_menu.xhp
@@ -240,7 +240,9 @@
<paragraph role="paragraph" id="par_id3145251">Choose <menuitem>Edit -
Track Changes</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
<paragraph role="paragraph" id="par_id561696881820809">Choose
<menuitem>Review</menuitem> tab.</paragraph>
- <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+ <switch select="appl">
+ <case select= "WRITER">
+ <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<table id="tab_id731696881885071">
<tablerow>
<tablecell>
@@ -251,9 +253,28 @@
</tablecell>
</tablerow>
</table>
+ </case>
+ <default>
+ </default>
+ </switch>
</section>
-<paragraph role="paragraph" id="par_id3153336"><variable
id="aufzeichnen">Choose <menuitem>Edit - Track Changes -
Record</menuitem>.</variable></paragraph>
+<section id="record_changes">
+<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+<paragraph role="paragraph" id="par_id3153336"><variable id="aufzeichnen">
+Choose <menuitem>Edit - Track Changes -
Record</menuitem>.</variable></paragraph>
+ <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+ <paragraph role="paragraph" id="par_id8579214900849931">Choose
<menuitem>Review - Record</menuitem>.</paragraph>
+ <switch select="appl">
+ <case select= "WRITER">
+ <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+ <paragraph role="paragraph" id="par_id9619616648791285">On the <emph>Track
Changes</emph> toolbar, click</paragraph>
+ <embed href="text/swriter/track_changes_toolbar.xhp#icon_record_changes"/>
+ </case>
+ <default>
+ </default>
+ </switch>
+</section>
<section id="anzeigen">
<switch select="appl">
diff --git a/source/text/shared/01/02230000.xhp
b/source/text/shared/01/02230000.xhp
index acf87fb23a..3e89302e16 100644
--- a/source/text/shared/01/02230000.xhp
+++ b/source/text/shared/01/02230000.xhp
@@ -29,7 +29,7 @@
<section id="track_changes">
<bookmark branch="hid/.uno:ChangesMenu" id="bm_id8352305" localize="false"/>
-<h1 id="hd_id3152952"><link href="text/shared/01/02230000.xhp">Track
Changes</link></h1>
+<h1 id="hd_id3152952"><variable id="track_changes_h1"><link
href="text/shared/01/02230000.xhp">Track Changes</link></variable></h1>
<paragraph id="par_id3145759" role="paragraph"><ahelp hid=".">Lists the
commands that are available for tracking changes in your
file.</ahelp></paragraph>
</section>
diff --git a/source/text/shared/01/02230100.xhp
b/source/text/shared/01/02230100.xhp
index 611b1d1162..4b44a90b6b 100644
--- a/source/text/shared/01/02230100.xhp
+++ b/source/text/shared/01/02230100.xhp
@@ -31,14 +31,14 @@
<section id="record_changes">
<bookmark xml-lang="en-US" branch="hid/.uno:TrackChanges" id="bm_id3153882"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:TraceChangeMode" id="bm_id3154841"
localize="false"/>
-<h1 id="hd_id3150758"><link href="text/shared/01/02230100.xhp">Record
Changes</link></h1>
+<h1 id="hd_id3150758"><variable id="record_changes_h1"><link
href="text/shared/01/02230100.xhp">Record Changes</link></variable></h1>
<paragraph role="paragraph" id="par_id3155599" xml-lang="en-US"><ahelp
hid=".">Tracks each change that is made in the current document by author and
date.</ahelp></paragraph>
</section>
+
<section id="howtoget">
- <embed href="text/shared/00/edit_menu.xhp#aufzeichnen"/>
- <paragraph role="paragraph" id="par_id251647262886504">On the <emph>Track
Changes</emph> toolbar, click</paragraph>
- <embed href="text/swriter/track_changes_toolbar.xhp#icon_record_changes"/>
+ <embed href="text/shared/00/edit_menu.xhp#record_changes"/>
</section>
+
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US"><switchinline
select="appl">
<caseinline select="WRITER">If you choose <emph>Edit - Track Changes -
Show</emph>, the lines containing changed text passages are indicated by a
vertical line in the left page margin. You can set the properties of the
vertical line and the other markup elements by choosing <link
href="text/shared/optionen/01040700.xhp"><emph>%PRODUCTNAME Writer -
Changes</emph></link> in the <emph>Options</emph> dialog
box.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US"><switchinline
select="appl">
@@ -103,6 +103,8 @@
<note id="par_id3154347">When the record changes command is active, you cannot
delete, move, merge, split, or copy cells or delete sheets.</note>
</case>
</switch>
-<comment>removed the note about no-tables-comparing in Writer</comment>
+<section id="relatedtopics">
+<embed href="text/shared/01/02230000.xhp#track_changes_h1"/>
+</section>
</body>
</helpdocument>
