[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 5 commits - icon-themes/galaxy icon-themes/tango officecfg/registry sw/source sw/uiconfig

Yousuf Philips philipz85 at hotmail.com
Tue Feb 3 05:32:55 PST 2015 

 icon-themes/galaxy/cmd/lc_accepttracedchange.png                     |binary
 icon-themes/galaxy/cmd/lc_accepttrackedchanges.png                   |binary
 icon-themes/galaxy/cmd/lc_commentchangetracking.png                  |binary
 icon-themes/galaxy/cmd/lc_comparedocuments.png                       |binary
 icon-themes/galaxy/cmd/lc_nexttrackedchange.png                      |binary
 icon-themes/galaxy/cmd/lc_previoustrackedchange.png                  |binary
 icon-themes/galaxy/cmd/lc_protecttracechangemode.png                 |binary
 icon-themes/galaxy/cmd/lc_rejecttracedchange.png                     |binary
 icon-themes/galaxy/cmd/lc_showtrackedchanges.png                     |binary
 icon-themes/galaxy/cmd/lc_trackchanges.png                           |binary
 icon-themes/galaxy/cmd/sc_protecttracechangemode.png                 |binary
 icon-themes/galaxy/cmd/sc_trackchanges.png                           |binary
 icon-themes/galaxy/links.txt                                         |   10 ++++
 icon-themes/tango/cmd/lc_accepttracedchange.png                      |binary
 icon-themes/tango/cmd/lc_accepttrackedchanges.png                    |binary
 icon-themes/tango/cmd/lc_commentchangetracking.png                   |binary
 icon-themes/tango/cmd/lc_comparedocuments.png                        |binary
 icon-themes/tango/cmd/lc_nexttrackedchange.png                       |binary
 icon-themes/tango/cmd/lc_previoustrackedchange.png                   |binary
 icon-themes/tango/cmd/lc_protecttracechangemode.png                  |binary
 icon-themes/tango/cmd/lc_rejecttracedchange.png                      |binary
 icon-themes/tango/cmd/lc_showtrackedchanges.png                      |binary
 icon-themes/tango/cmd/lc_trackchanges.png                            |binary
 icon-themes/tango/cmd/lc_trackchanges.xcf.bz2                        |binary
 icon-themes/tango/cmd/sc_protecttracechangemode.png                  |binary
 icon-themes/tango/cmd/sc_trackchanges.png                            |binary
 icon-themes/tango/links.txt                                          |    1 
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu       |   12 +++++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    3 +
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |    6 ++
 sw/source/core/uibase/uiview/view2.cxx                               |    2 
 sw/uiconfig/swriter/toolbar/changes.xml                              |   21 +++++-----
 32 files changed, 46 insertions(+), 9 deletions(-)

New commits:
commit 5f10e5f2ab5f940ab39f0a24a504ff943ddaba63
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Fri Nov 14 03:02:33 2014 +0400

    fdo#86183 set ctrl+shift+e to track changes and reassign edit mode
    
    Reviewed-on: https://gerrit.libreoffice.org/12415
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit d266fe13f60aab4975326eef5dc095c0f42ead48)
    
    Conflicts:
    	officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
    
    Change-Id: If1bfbc6686dd164eba9a705fbdb72fa0a08cdefe

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index ef0ec1b..58ee4bc 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -45,6 +45,18 @@
           <value xml:lang="en-US">.uno:Copy</value>
         </prop>
       </node>
+      <node oor:name="E_SHIFT_MOD1" oor:op="replace">
+        <prop oor:name="Command">
+          <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+          <value xml:lang="en-US">.uno:TrackChanges</value>
+        </prop>
+      </node>
+      <node oor:name="M_SHIFT_MOD1" oor:op="replace">
+        <prop oor:name="Command">
+          <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+          <value xml:lang="en-US">.uno:EditDoc</value>
+        </prop>
+      </node>
       <node oor:name="K_MOD1" oor:op="replace">
         <prop oor:name="Command">
           <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
commit 9fd2b7a4dc06d0db6bfd26e30ad737e9f6f2bfb1
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Mon Sep 29 05:45:35 2014 +0400

    fdo#84405 TRACK CHANGES: New icons for the changes toolbar
    
    Reviewed-on: https://gerrit.libreoffice.org/11681
    Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
    Tested-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
    (cherry picked from commit f178c2c68d51087e0f348f3abbc131baeded8ccd)
    
    Conflicts:
    	icon-themes/galaxy/links.txt
    	icon-themes/tango/links.txt
    
    Change-Id: I28c4677df53137d46cd103fe224a2747bc56e5ed

diff --git a/icon-themes/galaxy/cmd/lc_accepttracedchange.png b/icon-themes/galaxy/cmd/lc_accepttracedchange.png
new file mode 100644
index 0000000..176f2c5
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_accepttracedchange.png differ
diff --git a/icon-themes/galaxy/cmd/lc_accepttrackedchanges.png b/icon-themes/galaxy/cmd/lc_accepttrackedchanges.png
new file mode 100644
index 0000000..323754d
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_accepttrackedchanges.png differ
diff --git a/icon-themes/galaxy/cmd/lc_commentchangetracking.png b/icon-themes/galaxy/cmd/lc_commentchangetracking.png
new file mode 100644
index 0000000..6ec8b68
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_commentchangetracking.png differ
diff --git a/icon-themes/galaxy/cmd/lc_comparedocuments.png b/icon-themes/galaxy/cmd/lc_comparedocuments.png
new file mode 100644
index 0000000..6d3cbda
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_comparedocuments.png differ
diff --git a/icon-themes/galaxy/cmd/lc_nexttrackedchange.png b/icon-themes/galaxy/cmd/lc_nexttrackedchange.png
new file mode 100644
index 0000000..7abe09b
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_nexttrackedchange.png differ
diff --git a/icon-themes/galaxy/cmd/lc_previoustrackedchange.png b/icon-themes/galaxy/cmd/lc_previoustrackedchange.png
new file mode 100644
index 0000000..45bbab0
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_previoustrackedchange.png differ
diff --git a/icon-themes/galaxy/cmd/lc_protecttracechangemode.png b/icon-themes/galaxy/cmd/lc_protecttracechangemode.png
new file mode 100644
index 0000000..3581a21
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_protecttracechangemode.png differ
diff --git a/icon-themes/galaxy/cmd/lc_rejecttracedchange.png b/icon-themes/galaxy/cmd/lc_rejecttracedchange.png
new file mode 100644
index 0000000..569f329
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_rejecttracedchange.png differ
diff --git a/icon-themes/galaxy/cmd/lc_showtrackedchanges.png b/icon-themes/galaxy/cmd/lc_showtrackedchanges.png
new file mode 100644
index 0000000..8b588ba
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_showtrackedchanges.png differ
diff --git a/icon-themes/galaxy/cmd/lc_trackchanges.png b/icon-themes/galaxy/cmd/lc_trackchanges.png
new file mode 100644
index 0000000..c440a20
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_trackchanges.png differ
diff --git a/icon-themes/galaxy/cmd/sc_protecttracechangemode.png b/icon-themes/galaxy/cmd/sc_protecttracechangemode.png
new file mode 100644
index 0000000..ef47f54
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_protecttracechangemode.png differ
diff --git a/icon-themes/galaxy/cmd/sc_trackchanges.png b/icon-themes/galaxy/cmd/sc_trackchanges.png
new file mode 100644
index 0000000..2f66cde
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_trackchanges.png differ
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 96ccd9b..ff528d8 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -2,3 +2,13 @@ cmd/lc_datastreamsplay.png avmedia/res/avl02049.png
 cmd/sc_datastreamsplay.png avmedia/res/av02049.png
 cmd/lc_datastreamsstop.png avmedia/res/avl02051.png
 cmd/sc_datastreamsstop.png avmedia/res/av02051.png
+cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
+cmd/sc_trackchanges.png cmd/sc_recsave.png
+cmd/sc_previoustrackedchange.png cmd/sc_navigateback.png
+cmd/sc_nexttrackedchange.png cmd/sc_navigateforward.png
+cmd/sc_accepttracedchange.png cmd/sc_yes.png
+cmd/sc_rejecttracedchange.png cmd/sc_no.png
+cmd/sc_protecttracechangemode.png cmd/sc_chainframes.png
+cmd/sc_commentchangetracking.png cmd/sc_editdoc.png
+cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png
+cmd/sc_comparedocuments.png cmd/sc_copy.png
diff --git a/icon-themes/tango/cmd/lc_accepttracedchange.png b/icon-themes/tango/cmd/lc_accepttracedchange.png
new file mode 100644
index 0000000..176f2c5
Binary files /dev/null and b/icon-themes/tango/cmd/lc_accepttracedchange.png differ
diff --git a/icon-themes/tango/cmd/lc_accepttrackedchanges.png b/icon-themes/tango/cmd/lc_accepttrackedchanges.png
new file mode 100644
index 0000000..323754d
Binary files /dev/null and b/icon-themes/tango/cmd/lc_accepttrackedchanges.png differ
diff --git a/icon-themes/tango/cmd/lc_commentchangetracking.png b/icon-themes/tango/cmd/lc_commentchangetracking.png
new file mode 100644
index 0000000..6ec8b68
Binary files /dev/null and b/icon-themes/tango/cmd/lc_commentchangetracking.png differ
diff --git a/icon-themes/tango/cmd/lc_comparedocuments.png b/icon-themes/tango/cmd/lc_comparedocuments.png
new file mode 100644
index 0000000..6d3cbda
Binary files /dev/null and b/icon-themes/tango/cmd/lc_comparedocuments.png differ
diff --git a/icon-themes/tango/cmd/lc_nexttrackedchange.png b/icon-themes/tango/cmd/lc_nexttrackedchange.png
new file mode 100644
index 0000000..7abe09b
Binary files /dev/null and b/icon-themes/tango/cmd/lc_nexttrackedchange.png differ
diff --git a/icon-themes/tango/cmd/lc_previoustrackedchange.png b/icon-themes/tango/cmd/lc_previoustrackedchange.png
new file mode 100644
index 0000000..45bbab0
Binary files /dev/null and b/icon-themes/tango/cmd/lc_previoustrackedchange.png differ
diff --git a/icon-themes/tango/cmd/lc_protecttracechangemode.png b/icon-themes/tango/cmd/lc_protecttracechangemode.png
new file mode 100644
index 0000000..3581a21
Binary files /dev/null and b/icon-themes/tango/cmd/lc_protecttracechangemode.png differ
diff --git a/icon-themes/tango/cmd/lc_rejecttracedchange.png b/icon-themes/tango/cmd/lc_rejecttracedchange.png
new file mode 100644
index 0000000..569f329
Binary files /dev/null and b/icon-themes/tango/cmd/lc_rejecttracedchange.png differ
diff --git a/icon-themes/tango/cmd/lc_showtrackedchanges.png b/icon-themes/tango/cmd/lc_showtrackedchanges.png
new file mode 100644
index 0000000..8b588ba
Binary files /dev/null and b/icon-themes/tango/cmd/lc_showtrackedchanges.png differ
diff --git a/icon-themes/tango/cmd/lc_trackchanges.png b/icon-themes/tango/cmd/lc_trackchanges.png
new file mode 100644
index 0000000..c440a20
Binary files /dev/null and b/icon-themes/tango/cmd/lc_trackchanges.png differ
diff --git a/icon-themes/tango/cmd/lc_trackchanges.xcf.bz2 b/icon-themes/tango/cmd/lc_trackchanges.xcf.bz2
new file mode 100644
index 0000000..d87d020
Binary files /dev/null and b/icon-themes/tango/cmd/lc_trackchanges.xcf.bz2 differ
diff --git a/icon-themes/tango/cmd/sc_protecttracechangemode.png b/icon-themes/tango/cmd/sc_protecttracechangemode.png
new file mode 100644
index 0000000..ef47f54
Binary files /dev/null and b/icon-themes/tango/cmd/sc_protecttracechangemode.png differ
diff --git a/icon-themes/tango/cmd/sc_trackchanges.png b/icon-themes/tango/cmd/sc_trackchanges.png
new file mode 100644
index 0000000..2f66cde
Binary files /dev/null and b/icon-themes/tango/cmd/sc_trackchanges.png differ
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 81db89c..1a34336 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -125,24 +125,6 @@ sw/imglst/sc20558.png cmd/sc_ok.png
 avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/av02048.png cmd/sc_open.png
 svx/res/id02.png cmd/sc_open.png
-cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
-cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
-cmd/lc_trackchanges.png cmd/lc_recsave.png
-cmd/sc_trackchanges.png cmd/sc_recsave.png
-cmd/lc_previoustrackedchange.png cmd/lc_upsearch.png
-cmd/sc_previoustrackedchange.png cmd/sc_upsearch.png
-cmd/lc_nexttrackedchange.png cmd/lc_downsearch.png
-cmd/sc_nexttrackedchange.png cmd/sc_downsearch.png
-cmd/lc_accepttracedchange.png cmd/lc_zoomin.png
-cmd/sc_accepttracedchange.png cmd/sc_zoomin.png
-cmd/lc_rejecttracedchange.png cmd/lc_zoomminus.png
-cmd/sc_rejecttracedchange.png cmd/sc_zoomminus.png
-cmd/lc_protecttracechangemode.png cmd/lc_chainframes.png
-cmd/sc_protecttracechangemode.png cmd/sc_chainframes.png
-cmd/lc_commentchangetracking.png cmd/lc_editdoc.png
-cmd/sc_commentchangetracking.png cmd/sc_editdoc.png
-cmd/lc_accepttrackedchanges.png cmd/lc_insertobjectfloatingframe.png
-cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png
 
 
 # Duplicates
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 0704fa6..1c3af1c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3897,6 +3897,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Co~mpare Document...</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:MergeDocuments" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
diff --git a/sw/uiconfig/swriter/toolbar/changes.xml b/sw/uiconfig/swriter/toolbar/changes.xml
index 0b094ef..dc89387 100644
--- a/sw/uiconfig/swriter/toolbar/changes.xml
+++ b/sw/uiconfig/swriter/toolbar/changes.xml
@@ -18,19 +18,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:style="image text" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:style="image text" toolbar:helpid="10725"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:text="Show" toolbar:helpid="10624"/>
+ <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:text="Record" toolbar:helpid="10725"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviousTrackedChange" toolbar:text="Previous" toolbar:style="image text" />
- <toolbar:toolbaritem xlink:href=".uno:NextTrackedChange" toolbar:text="Next" toolbar:style="image text" />
- <toolbar:toolbaritem xlink:href=".uno:AcceptTracedChange" toolbar:text="Accept" toolbar:style="image text" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RejectTracedChange" toolbar:text="Reject" toolbar:style="image text" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges" toolbar:text="More" toolbar:style="image text" toolbar:helpid="10622"/>
+ <toolbar:toolbaritem xlink:href=".uno:PreviousTrackedChange" toolbar:text="Previous"/>
+ <toolbar:toolbaritem xlink:href=".uno:NextTrackedChange" toolbar:text="Next"/>
+ <toolbar:toolbaritem xlink:href=".uno:AcceptTracedChange" toolbar:text="Accept" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:RejectTracedChange" toolbar:text="Reject" toolbar:helpid="10626"/>
+ <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges" toolbar:text="List" toolbar:helpid="10622"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking" toolbar:style="image text" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:text="Protect" toolbar:style="image text" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking" toolbar:text="Comment" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:text="Protect" toolbar:helpid="10625"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CompareDocuments" toolbar:text="Compare" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:CompareDocuments" toolbar:text="Compare"/>
  <toolbar:toolbaritem xlink:href=".uno:MergeDocuments" toolbar:text="Merge" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:visible="false" toolbar:helpid="10625"/>
 </toolbar:toolbar>
commit 0e7b7d861b78ac6885943487bf073ee35bada271
Author: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Date:   Wed Sep 24 10:36:38 2014 +0200

    fdo#83955 Fix changes toolbar to display icons+text
    
    (cherry picked from commit 6332c643016ce4c4d254c8429a5eceae6664bf5c)
    
    Conflicts:
    	icon-themes/galaxy/links.txt
    	icon-themes/tango/links.txt
    
    Change-Id: I88ab66f60fc477f0e1e33d4049af7721e9435272

diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 8497da6..96ccd9b 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -2,21 +2,3 @@ cmd/lc_datastreamsplay.png avmedia/res/avl02049.png
 cmd/sc_datastreamsplay.png avmedia/res/av02049.png
 cmd/lc_datastreamsstop.png avmedia/res/avl02051.png
 cmd/sc_datastreamsstop.png avmedia/res/av02051.png
-cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
-cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
-cmd/lc_trackchanges.png cmd/lc_recsave.png
-cmd/sc_trackchanges.png cmd/sc_recsave.png
-cmd/lc_previoustrackedchange.png cmd/lc_upsearch.png
-cmd/sc_previoustrackedchange.png cmd/sc_upsearch.png
-cmd/lc_nexttrackedchange.png cmd/lc_downsearch.png
-cmd/sc_nexttrackedchange.png cmd/sc_downsearch.png
-cmd/lc_accepttracedchange.png cmd/lc_zoomplus.png
-cmd/sc_accepttracedchange.png cmd/sc_zoomplus.png
-cmd/lc_rejecttracedchange.png cmd/lc_zoomminus.png
-cmd/sc_rejecttracedchange.png cmd/sc_zoomminus.png
-cmd/lc_protecttracechangemode.png cmd/lc_chainframes.png
-cmd/sc_protecttracechangemode.png cmd/sc_chainframes.png
-cmd/lc_commentchangetracking.png cmd/lc_editdoc.png
-cmd/sc_commentchangetracking.png cmd/sc_editdoc.png
-cmd/lc_accepttrackedchanges.png cmd/lc_insertobjectfloatingframe.png
-cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 3fbac61..81db89c 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -125,6 +125,25 @@ sw/imglst/sc20558.png cmd/sc_ok.png
 avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/av02048.png cmd/sc_open.png
 svx/res/id02.png cmd/sc_open.png
+cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
+cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
+cmd/lc_trackchanges.png cmd/lc_recsave.png
+cmd/sc_trackchanges.png cmd/sc_recsave.png
+cmd/lc_previoustrackedchange.png cmd/lc_upsearch.png
+cmd/sc_previoustrackedchange.png cmd/sc_upsearch.png
+cmd/lc_nexttrackedchange.png cmd/lc_downsearch.png
+cmd/sc_nexttrackedchange.png cmd/sc_downsearch.png
+cmd/lc_accepttracedchange.png cmd/lc_zoomin.png
+cmd/sc_accepttracedchange.png cmd/sc_zoomin.png
+cmd/lc_rejecttracedchange.png cmd/lc_zoomminus.png
+cmd/sc_rejecttracedchange.png cmd/sc_zoomminus.png
+cmd/lc_protecttracechangemode.png cmd/lc_chainframes.png
+cmd/sc_protecttracechangemode.png cmd/sc_chainframes.png
+cmd/lc_commentchangetracking.png cmd/lc_editdoc.png
+cmd/sc_commentchangetracking.png cmd/sc_editdoc.png
+cmd/lc_accepttrackedchanges.png cmd/lc_insertobjectfloatingframe.png
+cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png
+
 
 # Duplicates
 cmd/lc_outlineleft.png cmd/lc_incrementlevel.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 2417301..9c26885 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -184,11 +184,17 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Next Change</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:PreviousTrackedChange" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Pr~evious Change</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:UpdateAllLinks" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 05d318e..4dcc178 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -744,9 +744,6 @@
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>false</value>
         </prop>
-        <prop oor:name="Style" oor:type="xs:int">
-          <value>2</value>
-        </prop>
       </node>
     </node>
   </node>
diff --git a/sw/uiconfig/swriter/toolbar/changes.xml b/sw/uiconfig/swriter/toolbar/changes.xml
index 1b7bf95..0b094ef 100644
--- a/sw/uiconfig/swriter/toolbar/changes.xml
+++ b/sw/uiconfig/swriter/toolbar/changes.xml
@@ -18,17 +18,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:helpid="10725"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:style="image text" toolbar:helpid="10624"/>
+ <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:style="image text" toolbar:helpid="10725"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviousTrackedChange" toolbar:text="Previous"/>
- <toolbar:toolbaritem xlink:href=".uno:NextTrackedChange" toolbar:text="Next"/>
- <toolbar:toolbaritem xlink:href=".uno:AcceptTracedChange" toolbar:text="Accept" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RejectTracedChange" toolbar:text="Reject" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges" toolbar:text="More" toolbar:helpid="10622"/>
+ <toolbar:toolbaritem xlink:href=".uno:PreviousTrackedChange" toolbar:text="Previous" toolbar:style="image text" />
+ <toolbar:toolbaritem xlink:href=".uno:NextTrackedChange" toolbar:text="Next" toolbar:style="image text" />
+ <toolbar:toolbaritem xlink:href=".uno:AcceptTracedChange" toolbar:text="Accept" toolbar:style="image text" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:RejectTracedChange" toolbar:text="Reject" toolbar:style="image text" toolbar:helpid="10626"/>
+ <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges" toolbar:text="More" toolbar:style="image text" toolbar:helpid="10622"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:text="Protect" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking" toolbar:style="image text" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:text="Protect" toolbar:style="image text" toolbar:helpid="10625"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CompareDocuments" toolbar:text="Compare" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:MergeDocuments" toolbar:text="Merge" toolbar:visible="false"/>
commit b2509849da52a75dd45eeb8d99f686476cf46784
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Mon Sep 22 05:20:42 2014 +0400

    fdo#83955 Track Changes: Improve the changes toolbar
    
    Reviewed-on: https://gerrit.libreoffice.org/11575
    Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
    Tested-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
    (cherry picked from commit bba15935842071289f6fbf9edef409b605254508)
    
    Conflicts:
    	icon-themes/galaxy/links.txt
    
    Change-Id: I50986a5c3d55890536dd2b1736887a816c931699

diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 96ccd9b..8497da6 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -2,3 +2,21 @@ cmd/lc_datastreamsplay.png avmedia/res/avl02049.png
 cmd/sc_datastreamsplay.png avmedia/res/av02049.png
 cmd/lc_datastreamsstop.png avmedia/res/avl02051.png
 cmd/sc_datastreamsstop.png avmedia/res/av02051.png
+cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
+cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
+cmd/lc_trackchanges.png cmd/lc_recsave.png
+cmd/sc_trackchanges.png cmd/sc_recsave.png
+cmd/lc_previoustrackedchange.png cmd/lc_upsearch.png
+cmd/sc_previoustrackedchange.png cmd/sc_upsearch.png
+cmd/lc_nexttrackedchange.png cmd/lc_downsearch.png
+cmd/sc_nexttrackedchange.png cmd/sc_downsearch.png
+cmd/lc_accepttracedchange.png cmd/lc_zoomplus.png
+cmd/sc_accepttracedchange.png cmd/sc_zoomplus.png
+cmd/lc_rejecttracedchange.png cmd/lc_zoomminus.png
+cmd/sc_rejecttracedchange.png cmd/sc_zoomminus.png
+cmd/lc_protecttracechangemode.png cmd/lc_chainframes.png
+cmd/sc_protecttracechangemode.png cmd/sc_chainframes.png
+cmd/lc_commentchangetracking.png cmd/lc_editdoc.png
+cmd/sc_commentchangetracking.png cmd/sc_editdoc.png
+cmd/lc_accepttrackedchanges.png cmd/lc_insertobjectfloatingframe.png
+cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 4dcc178..05d318e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -744,6 +744,9 @@
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>false</value>
         </prop>
+        <prop oor:name="Style" oor:type="xs:int">
+          <value>2</value>
+        </prop>
       </node>
     </node>
   </node>
diff --git a/sw/uiconfig/swriter/toolbar/changes.xml b/sw/uiconfig/swriter/toolbar/changes.xml
index 29a7984..1b7bf95 100644
--- a/sw/uiconfig/swriter/toolbar/changes.xml
+++ b/sw/uiconfig/swriter/toolbar/changes.xml
@@ -19,15 +19,18 @@
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
  <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:helpid="10624"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:helpid="10725"/>
- <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges" toolbar:helpid="10622"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:AcceptTracedChange" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:PreviousTrackedChange" toolbar:text="Previous"/>
+ <toolbar:toolbaritem xlink:href=".uno:NextTrackedChange" toolbar:text="Next"/>
+ <toolbar:toolbaritem xlink:href=".uno:AcceptTracedChange" toolbar:text="Accept" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:RejectTracedChange" toolbar:text="Reject" toolbar:helpid="10626"/>
+ <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges" toolbar:text="More" toolbar:helpid="10622"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RejectTracedChange" toolbar:helpid="10626"/>
  <toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:text="Protect" toolbar:helpid="10625"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:CompareDocuments" toolbar:text="Compare" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:MergeDocuments" toolbar:text="Merge" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:visible="false" toolbar:helpid="10625"/>
 </toolbar:toolbar>
commit 51f12e45fff089f32fad6f1caafacd0e34ca0d01
Author: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Date:   Sun Sep 21 21:30:29 2014 +0200

    fdo#83953 Jump to next change when accepting or rejecting a change
    
    Change-Id: I08f4e2ddd75f1b24ef9799e8703a5fbee85734e7

diff --git a/sw/source/core/uibase/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx
index eac7a19..1bedbcb 100644
--- a/sw/source/core/uibase/uiview/view2.cxx
+++ b/sw/source/core/uibase/uiview/view2.cxx
@@ -690,6 +690,8 @@ void SwView::Execute(SfxRequest &rReq)
                         m_pWrtShell->RejectRedline(nRedline);
                 }
             }
+            // Go to next change after accepting or rejecting one (fdo#83953)
+            GetViewFrame()->GetDispatcher()->Execute(FN_REDLINE_NEXT_CHANGE, SFX_CALLMODE_ASYNCHRON);
         }
         break;

More information about the Libreoffice-commits mailing list