[Libreoffice-commits] .: helpers/help_hid.lst helpers/longnames_commands.csv helpers/uno-commands.csv helpers/uno_hid.lst source/text util/swriter

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 27 07:06:05 PST 2012 

 helpers/help_hid.lst                              |    2 
 helpers/longnames_commands.csv                    |    2 
 helpers/uno-commands.csv                          |    2 
 helpers/uno_hid.lst                               |    2 
 source/text/shared/guide/makefile.mk              |    1 
 source/text/shared/guide/redlining.xhp            |    4 +
 source/text/shared/guide/redlining_accept.xhp     |    4 +
 source/text/shared/guide/redlining_doccompare.xhp |    3 +
 source/text/shared/guide/redlining_docmerge.xhp   |    3 +
 source/text/shared/guide/redlining_enter.xhp      |    3 +
 source/text/shared/guide/redlining_navigation.xhp |   50 ++++++++++++++++++++++
 source/text/shared/guide/redlining_protect.xhp    |    3 +
 source/text/shared/guide/redlining_versions.xhp   |    7 +++
 util/swriter/makefile.mk                          |    1 
 14 files changed, 85 insertions(+), 2 deletions(-)

New commits:
commit df872eb038151f90ee6a128f33acbbd96c000a70
Author: Muhammad Haggag <mhaggag at gmail.com>
Date:   Sun Nov 25 02:06:22 2012 +0200

    fdo#48317 Help content for next/previous change navigation.
    
    Change-Id: Id0b44f449bf099b7e79c33cb7f060c0b05457145
    Reviewed-on: https://gerrit.libreoffice.org/1163
    Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
    Tested-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6808909..ac4a167 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -370,6 +370,8 @@ FN_REDLINE_ON,21825,.uno:TrackChanges
 FN_REDLINE_PROTECT,21823,.uno:ProtectTraceChangeMode
 FN_REDLINE_REJECT_DIRECT,21838,
 FN_REDLINE_SHOW,21826,.uno:ShowTrackedChanges
+FN_REDLINE_NEXT_CHANGE,21841,.uno:NextTrackedChange
+FN_REDLINE_PREV_CHANGE,21841,.uno:PreviousTrackedChange
 FN_REFRESH_VIEW,20201,.uno:RefreshView
 FN_REMOVE_CUR_TOX,20655,.uno:RemoveTableOf
 FN_REMOVE_DIRECT_CHAR_FORMATS,21759,
diff --git a/helpers/longnames_commands.csv b/helpers/longnames_commands.csv
index 981b12c..cb85831 100644
--- a/helpers/longnames_commands.csv
+++ b/helpers/longnames_commands.csv
@@ -351,6 +351,8 @@ FN_REDLINE_COMMENT,.uno:CommentChangeTracking
 FN_REDLINE_ON,.uno:TrackChanges
 FN_REDLINE_PROTECT,.uno:ProtectTraceChangeMode
 FN_REDLINE_SHOW,.uno:ShowTrackedChanges
+FN_REDLINE_NEXT_CHANGE,.uno:NextTrackedChange
+FN_REDLINE_PREV_CHANGE,.uno:PreviousTrackedChange
 FN_REFRESH_VIEW,.uno:RefreshView
 FN_REMOVE_CUR_TOX,.uno:RemoveTableOf
 FN_REPAGINATE,.uno:Repaginate
diff --git a/helpers/uno-commands.csv b/helpers/uno-commands.csv
index 25898a5..6eb9509 100644
--- a/helpers/uno-commands.csv
+++ b/helpers/uno-commands.csv
@@ -1156,6 +1156,7 @@
 .uno:NextMark
 .uno:NextPage
 .uno:NextRecord
+.uno:NextTrackedChange
 .uno:NormalMultiPaneGUI
 .uno:NormalViewMode
 .uno:NoteVisible
@@ -1279,6 +1280,7 @@
 .uno:PreviewWindow
 .uno:PreviewZoom
 .uno:PreviousPage
+.uno:PreviousTrackedChange
 .uno:Print
 .uno:PrintDefault
 .uno:PrintLayout
diff --git a/helpers/uno_hid.lst b/helpers/uno_hid.lst
index a09ce72..5205757 100644
--- a/helpers/uno_hid.lst
+++ b/helpers/uno_hid.lst
@@ -351,6 +351,8 @@ FN_REDLINE_COMMENT,21827,.uno:CommentChangeTracking
 FN_REDLINE_ON,21825,.uno:TrackChanges
 FN_REDLINE_PROTECT,21823,.uno:ProtectTraceChangeMode
 FN_REDLINE_SHOW,21826,.uno:ShowTrackedChanges
+FN_REDLINE_NEXT_CHANGE,21841,.uno:NextTrackedChange
+FN_REDLINE_PREV_CHANGE,21841,.uno:PreviousTrackedChange
 FN_REFRESH_VIEW,20201,.uno:RefreshView
 FN_REMOVE_CUR_TOX,20655,.uno:RemoveTableOf
 FN_REPAGINATE,20161,.uno:Repaginate
diff --git a/source/text/shared/guide/makefile.mk b/source/text/shared/guide/makefile.mk
index 9bc4454..ded269b 100644
--- a/source/text/shared/guide/makefile.mk
+++ b/source/text/shared/guide/makefile.mk
@@ -151,6 +151,7 @@ XHPFILES = \
    redlining_enter.xhp \
    redlining_protect.xhp \
    redlining_versions.xhp \
+   redlining_navigation.xhp \
    round_corner.xhp \
    scripting.xhp \
    space_hyphen.xhp \
diff --git a/source/text/shared/guide/redlining.xhp b/source/text/shared/guide/redlining.xhp
index eef290f..b4186d4 100644
--- a/source/text/shared/guide/redlining.xhp
+++ b/source/text/shared/guide/redlining.xhp
@@ -53,6 +53,9 @@
       <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph>
       <embed href="text/shared/00/00000004.xhp#related"/>
+      <switch select="appl">
+      <case select="WRITER"><embed href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
+      </switch>
       <embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
       <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
       <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
@@ -60,4 +63,4 @@
       <embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
       <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/shared/guide/redlining_accept.xhp b/source/text/shared/guide/redlining_accept.xhp
index 64129ac..702c30d 100644
--- a/source/text/shared/guide/redlining_accept.xhp
+++ b/source/text/shared/guide/redlining_accept.xhp
@@ -66,7 +66,9 @@
 <paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="42">Color-coded entries display the result of the filter that is set. Entries in black can be accepted or rejected and match the filter criteria. Entries in blue do not themselves match the filter criteria, but have subentries that are included by the filter. Gray entries cannot be accepted or rejected and do not match the filter criterion. Green entries do match the filter but cannot be accepted or rejected.</paragraph>
 <section id="relatedtopics">
 <embed href="text/shared/guide/redlining.xhp#redlining"/>
-<embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
+<switch select="appl">
+<case select="WRITER"><embed href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
+</switch>
 <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
 <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
 <embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
diff --git a/source/text/shared/guide/redlining_doccompare.xhp b/source/text/shared/guide/redlining_doccompare.xhp
index 665e2d7..f8bd85a 100644
--- a/source/text/shared/guide/redlining_doccompare.xhp
+++ b/source/text/shared/guide/redlining_doccompare.xhp
@@ -70,6 +70,9 @@
 </list>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/shared/guide/redlining.xhp#redlining"/>
+<switch select="appl">
+<case select="WRITER"><embed href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
+</switch>
 <embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
 <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
 <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
diff --git a/source/text/shared/guide/redlining_docmerge.xhp b/source/text/shared/guide/redlining_docmerge.xhp
index d275d18..cdcd945 100644
--- a/source/text/shared/guide/redlining_docmerge.xhp
+++ b/source/text/shared/guide/redlining_docmerge.xhp
@@ -67,6 +67,9 @@
 </list>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/shared/guide/redlining.xhp#redlining"/>
+<switch select="appl">
+<case select="WRITER"><embed href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
+</switch>
 <embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
 <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
 <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
diff --git a/source/text/shared/guide/redlining_enter.xhp b/source/text/shared/guide/redlining_enter.xhp
index 112094d..94a662b 100644
--- a/source/text/shared/guide/redlining_enter.xhp
+++ b/source/text/shared/guide/redlining_enter.xhp
@@ -81,6 +81,9 @@
 <paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/shared/guide/redlining.xhp#redlining"/>
+<switch select="appl">
+<case select="WRITER"><embed href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
+</switch>
 <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
 <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
 <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
diff --git a/source/text/shared/guide/redlining_navigation.xhp b/source/text/shared/guide/redlining_navigation.xhp
new file mode 100644
index 0000000..ffd651d
--- /dev/null
+++ b/source/text/shared/guide/redlining_navigation.xhp
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+/*
+ * Copyright 2012 LibreOffice contributors.
+ *
+ * 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/.
+ *-->
+<helpdocument version="1.0">
+<meta>
+    <topic id="textsharedguideredlining_navigationxml" indexer="include" status="PUBLISH">
+        <title id="title" xml-lang="en-US">Navigating Changes</title>
+        <filename>/text/shared/guide/redlining_navigation.xhp</filename>
+    </topic>
+    <history>
+        <created date="2012-11-23T20:13:00">Muhammad Haggag.</created>
+    </history>
+</meta>
+<body>
+    <bookmark xml-lang="en-US" branch="index" id="bm_redlining_navigation">
+        <bookmark_value>changes; navigating</bookmark_value>
+        <bookmark_value>review function; navigating changes</bookmark_value>
+    </bookmark>
+    <paragraph role="heading" xml-lang="en-US" level="1"><variable id="redlining_navigation"><link href="text/shared/guide/redlining_navigation.xhp" name="Navigating Changes">Navigating Changes</link></variable></paragraph>
+    <section>
+        <paragraph role="note" xml-lang="en-US">This feature is Writer-specific.</paragraph>
+        <paragraph role="paragraph" xml-lang="en-US">There are two available commands to navigate changes in a Writer document:</paragraph>
+        <list type="unordered">
+            <listitem>
+                <bookmark xml-lang="en-US" branch="hid/.uno:NextTrackedChange" id="bm_next_tracked_change" localize="false"/>
+                <paragraph role="listitem" xml-lang="en-US"><emph>Edit - Changes - Next Change</emph>: <ahelp hid=".uno:NextTrackedChange">Jumps to and selects the next change in the document, if any.</ahelp></paragraph>
+            </listitem>
+            <listitem>
+                <bookmark xml-lang="en-US" branch="hid/.uno:PreviousTrackedChange" id="bm_previous_tracked_change" localize="false"/>
+                <paragraph role="listitem" xml-lang="en-US"><emph>Edit - Changes - Previous Change</emph>: <ahelp hid=".uno:PreviousTrackedChange">Jumps to and selects the previous change in the document, if any.</ahelp></paragraph>
+            </listitem>
+        </list>
+        <paragraph role="paragraph" xml-lang="en-US">Using these commands in conjunction with the <emph>Accept Change</emph> and <emph>Reject Change</emph> commands allows navigating, accepting and rejecting changes without invoking the <emph>Edit - Changes - Accept or Reject</emph> dialog.</paragraph>
+    </section>
+    <section id="relatedtopics">
+        <embed href="text/shared/guide/redlining.xhp#redlining"/>
+        <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
+        <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
+        <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
+        <embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/guide/redlining_protect.xhp b/source/text/shared/guide/redlining_protect.xhp
index b38bc5e..9928e17 100644
--- a/source/text/shared/guide/redlining_protect.xhp
+++ b/source/text/shared/guide/redlining_protect.xhp
@@ -63,6 +63,9 @@
   </list>
   <embed href="text/shared/00/00000004.xhp#related"/>
   <embed href="text/shared/guide/redlining.xhp#redlining"/>
+  <switch select="appl">
+  <case select="WRITER"><embed href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
+  </switch>
   <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
   <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
   <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
diff --git a/source/text/shared/guide/redlining_versions.xhp b/source/text/shared/guide/redlining_versions.xhp
index fe8fdaf..dadf081 100644
--- a/source/text/shared/guide/redlining_versions.xhp
+++ b/source/text/shared/guide/redlining_versions.xhp
@@ -50,6 +50,13 @@
 <paragraph role="paragraph" id="par_id3149399" xml-lang="en-US" l10n="U" oldref="44">You can choose to view individual versions of a document, or you can display the differences between versions with color markings.</paragraph>
 <paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="45">In the dialog to open a document, you can select from a combo box which version of this document you want to open.</paragraph>
 <section id="relatedtopics">
+<embed href="text/shared/00/00000004.xhp#related"/>
+<embed href="text/shared/guide/redlining.xhp#redlining"/>
+<switch select="appl">
+<case select="WRITER"><embed href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
+</switch>
+<embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
+<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
 <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
 </section>
 </body>
diff --git a/util/swriter/makefile.mk b/util/swriter/makefile.mk
index 1accc63..d1fbaf5 100644
--- a/util/swriter/makefile.mk
+++ b/util/swriter/makefile.mk
@@ -1221,6 +1221,7 @@ LINKLINKFILES= \
    text$/shared$/guide$/redlining_enter.xhp \
    text$/shared$/guide$/redlining_protect.xhp \
    text$/shared$/guide$/redlining_versions.xhp \
+   text$/shared$/guide$/redlining_navigation.xhp \
    text$/shared$/guide$/round_corner.xhp \
    text$/shared$/guide$/scripting.xhp \
    text$/shared$/guide$/space_hyphen.xhp \

More information about the Libreoffice-commits mailing list