summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2019-11-11 15:00:51 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2019-11-11 22:37:50 +0100
commit43596417abccb4b215f0c3b906aab26ed21ab0ed (patch)
tree9bdfa73ce0231fc330b1881d036633e05110108b
parent7179225dccf23dbe347ca6ad88e4eb22cc0abf6a (diff)
tdf#128589 Add resolved comments in page
Add Resolved comments in comments Help page, adjust View menu Change-Id: I4e1c0dbce35d71a72d08fe1940a7e76f80b55c4f Reviewed-on: https://gerrit.libreoffice.org/82464 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--source/text/shared/01/04050000.xhp14
-rw-r--r--source/text/swriter/main0103.xhp24
2 files changed, 24 insertions, 14 deletions
diff --git a/source/text/shared/01/04050000.xhp b/source/text/shared/01/04050000.xhp
index 98f0d2789a..b6f080b0ee 100644
--- a/source/text/shared/01/04050000.xhp
+++ b/source/text/shared/01/04050000.xhp
@@ -26,12 +26,15 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154100">
- <bookmark_value>comments;inserting/editing/deleting/printing</bookmark_value>
+ <bookmark_value>comments;inserting/editing/deleting/printing/resolving</bookmark_value>
+ <bookmark_value>comments;hide resolved</bookmark_value>
+ <bookmark_value>comments;resolve in text documents</bookmark_value>
<bookmark_value>inserting; comments</bookmark_value>
<bookmark_value>editing; comments</bookmark_value>
<bookmark_value>deleting;comments</bookmark_value>
<bookmark_value>Navigator;comments</bookmark_value>
<bookmark_value>printing;comments</bookmark_value>
+ <bookmark_value>resolving;comments</bookmark_value>
<bookmark_value>records; inserting comments </bookmark_value>
<bookmark_value>remarks, see also comments</bookmark_value>
</bookmark>
@@ -93,9 +96,14 @@
<paragraph id="par_id5201879" role="paragraph" xml-lang="en-US">Every user with write permission to the document can edit and delete comments of all authors.</paragraph>
<embed href="text/shared/01/04050000.xhp#dropdown"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ReplyComment" id="bm_id0429200810593995" localize="false"/>
- <paragraph id="par_id0305200911090684" role="paragraph" xml-lang="en-US">If the comment in a text document was written by another author, there is a <emph>Reply</emph> command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments command</comment>
-
<tip id="par_id0302200901430918">In the <emph>Find &amp; Replace</emph> dialog of text documents, you can select to include the comments texts in your searches.</tip>
+ <h2 id="hd_id601573488847729">Replying comments</h2>
+ <paragraph id="par_id0305200911090684" role="paragraph" xml-lang="en-US">If the comment in a text document was written by another author, there is a <emph>Reply</emph> command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments command</comment>
+ <section id="resolvecomments">
+ <h2 id="hd_id201573491050815">Marking comments resolved</h2>
+ <paragraph role="paragraph" id="par_id961573491046250">When the document has been reviewed and commented and requires your action in its contents, you can mark the comment <emph>Resolved</emph> or <emph>Unresolved</emph>. Open the comment context menu or click on the comment dropdown list to mark the Resolved checkbox. When you mark the comment resolved, the word <literal>Resolved</literal> is inserted under the date in the comment box. When marking unresolved, the word <literal>Resolved</literal> is removed.</paragraph>
+ <paragraph role="paragraph" id="par_id521573491035753">You can toggle the display of all resolved comments in the document. Hidden resolved comments are not displayed in the page margin but are not deleted. You can display back all hidden comments. Choose and mark <menuitem>View - Resolved comments</menuitem> to display the resolved comments. Unmark to hide resolved comments. The default is to display all resolved comments.</paragraph>
+ </section>
<h2 id="hd_id3445539">Navigating from comment to comment in text documents</h2>
diff --git a/source/text/swriter/main0103.xhp b/source/text/swriter/main0103.xhp
index 53793b548e..5fb40ced49 100644
--- a/source/text/swriter/main0103.xhp
+++ b/source/text/swriter/main0103.xhp
@@ -31,39 +31,41 @@
<section id="view">
<bookmark xml-lang="en-US" branch="hid/.uno:ViewMenu" id="bm_id7882320" localize="false"/>
-<paragraph id="hd_id3147233" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/main0103.xhp" name="View">View</link></paragraph>
+<h1 id="hd_id3147233"><link href="text/swriter/main0103.xhp" name="View">View</link></h1>
<paragraph id="par_id3147249" role="paragraph" xml-lang="en-US"><ahelp hid=".">This menu contains commands for controlling the on-screen display of the document.</ahelp></paragraph>
</section>
-<paragraph id="par_id102720150703473580" role="heading" level="2" xml-lang="en-US"><link href="text/swriter/01/03130000.xhp">Normal</link></paragraph>
+<h2 id="par_id102720150703473580"><link href="text/swriter/01/03130000.xhp">Normal</link></h2>
<embed href="text/swriter/01/03130000.xhp#normal_layout_text"/>
-<paragraph id="par_id102720150703478401" role="heading" level="2" xml-lang="en-US"><link href="text/swriter/01/03120000.xhp">Web</link></paragraph>
+<h2 id="par_id102720150703478401"><link href="text/swriter/01/03120000.xhp">Web</link></h2>
<embed href="text/swriter/01/03120000.xhp#web_layout_text"/>
<embed href="text/shared/02/19090000.xhp#htmlsource"/>
<embed href="text/shared/01/03990000.xhp#toolbars"/>
<embed href="text/shared/01/03060000.xhp#status_bar"/>
<embed href="text/swriter/01/03050000.xhp#rulers"/>
-<paragraph id="hd_id102720150854015048" role="heading" level="2" xml-lang="en-US">Scrollbars</paragraph>
+<h2 id="hd_id102720150854015048">Scrollbars</h2>
<paragraph id="par_id102720150854017277" role="paragraph" xml-lang="en-US">Show or hide the horizontal and vertical scroll bars that are used to change the viewable area of a document that doesn't fit within the window.</paragraph>
<embed href="text/swriter/01/03070000.xhp#text_boundaries"/>
-<paragraph id="par_idN10613" role="heading" level="2" xml-lang="en-US">Table Boundaries</paragraph>
+<h2 id="par_idN10613">Table Boundaries</h2>
<paragraph id="par_idN107CA" role="paragraph" xml-lang="en-US">Shows or hides the borders of table cells that have no set borders. The boundaries are only visible on screen and are not printed.</paragraph>
-<paragraph id="hd_id102720150854011929" role="heading" level="2" xml-lang="en-US">Images and Charts</paragraph>
+<h2 id="hd_id102720150854011929">Images and Charts</h2>
<paragraph id="par_id102720150854013292" role="paragraph" xml-lang="en-US">Show or hide graphical objects like images and charts within a document.</paragraph>
-<paragraph id="hd_id102720150854019880" role="heading" level="2" xml-lang="en-US">Comments</paragraph>
+<h2 id="hd_id102720150854019880">Comments</h2>
<paragraph id="par_id102720150854014989" role="paragraph" xml-lang="en-US">Show or hide a document's comments and replies to them.</paragraph>
+<h2 id="hd_id981573492083329">Resolved comments</h2>
+<paragraph role="paragraph" id="par_id331573492076499">Show or hide <link href="text/shared/01/04050000.xhp#resolvecomments" name="resolve comments">resolved comments</link>.</paragraph>
<embed href="text/swriter/01/03100000.xhp#nonprinting_chars"/>
<embed href="text/shared/01/grid_and_helplines.xhp#grid_and_help_lines"/>
-<paragraph id="hd_id102720150854018740" role="heading" level="2" xml-lang="en-US">Hide Whitespace</paragraph>
+<h2 id="hd_id102720150854018740">Hide Whitespace</h2>
<paragraph id="par_id102720150854012820" role="paragraph" xml-lang="en-US">View documents with the white space found at the end and beginning of pages hidden.</paragraph>
-<paragraph id="hd_id03302017034826145" role="heading" level="2" xml-lang="en-US">Track Changes</paragraph>
+<h2 id="hd_id03302017034826145">Track Changes</h2>
<embed href="text/shared/01/02230200.xhp#text"/>
<embed href="text/swriter/01/03080000.xhp#field_shadings"/>
<embed href="text/swriter/01/03090000.xhp#field_names"/>
@@ -71,13 +73,13 @@
<embed href="text/shared/01/menu_view_sidebar.xhp#sidebar"/>
<embed href="text/swriter/01/05140000.xhp#styles_and_formatting"/>
-<paragraph id="hd_id102720150908397549" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/gallery.xhp">Gallery</link></paragraph>
+<h2 id="hd_id102720150908397549"><link href="text/shared/01/gallery.xhp">Gallery</link></h2>
<embed href="text/shared/01/gallery.xhp#media_gallery_text"/>
<embed href="text/swriter/01/02110000.xhp#navigator"/>
<embed href="text/shared/01/04180100.xhp#data_sources"/>
<embed href="text/shared/01/03110000.xhp#full_screen"/>
-<paragraph id="hd_id3147265" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></paragraph>
+<h2 id="hd_id3147265"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></h2>
<embed href="text/shared/01/03010000.xhp#zoom_text"/>
</body>