[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - 2 commits - sc/uiconfig sw/uiconfig

Yousuf Philips philipz85 at hotmail.com
Tue Jun 7 08:09:06 UTC 2016 

 sc/uiconfig/scalc/toolbar/drawbar.xml         |   16 +++++++++++-----
 sc/uiconfig/scalc/toolbar/formatobjectbar.xml |    2 ++
 sc/uiconfig/scalc/toolbar/standardbar.xml     |    1 +
 sw/uiconfig/swriter/toolbar/drawbar.xml       |    5 +++--
 sw/uiconfig/swriter/toolbar/standardbar.xml   |    2 +-
 5 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 8cb088d71c4ccda318e298dbbb425b72731f9c05
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Sat Jun 4 20:10:40 2016 +0400

    tdf#81475 Minor tweaks to writer toolbars
    
    Change-Id: Ifdc1e7305dcd3db5a77f9d9f30094031c24b9460
    Reviewed-on: https://gerrit.libreoffice.org/25894
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit 33459c1b7c76f909ccdbaa707ef27d7e3be80550)
    Reviewed-on: https://gerrit.libreoffice.org/25953
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml
index 52986b5..cb002a4 100644
--- a/sw/uiconfig/swriter/toolbar/drawbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
@@ -22,10 +22,11 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
  <toolbar:toolbaritem xlink:href=".uno:LineToolbox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="10397" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="10397"/>
  <toolbar:toolbaritem xlink:href=".uno:BezierFill" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="10395" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="10395"/>
  <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 50a94e8..8b1401e 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -68,7 +68,7 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="20329"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:TrackChanges"/>
+ <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:TrackChangesBar"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
commit 8971055bb1010ebfce38b1d0cb5a740f2ee9cc84
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Sat Jun 4 20:35:30 2016 +0400

    tdf#85594 Unify Calc drawing toolbar with Writer
    
    Change-Id: Iac74d5d8f8b20cd771ce67c713ef53eccaa6f1f0
    Reviewed-on: https://gerrit.libreoffice.org/25895
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit 3eb15d6119ff36d79aed3b8a42bac42c25afea4e)
    Reviewed-on: https://gerrit.libreoffice.org/25954
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/uiconfig/scalc/toolbar/drawbar.xml b/sc/uiconfig/scalc/toolbar/drawbar.xml
index e724e75..fef6c7e 100644
--- a/sc/uiconfig/scalc/toolbar/drawbar.xml
+++ b/sc/uiconfig/scalc/toolbar/drawbar.xml
@@ -20,19 +20,25 @@
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
  <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
  <toolbar:toolbaritem xlink:href=".uno:LineToolbox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="10397" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierFill" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="10395" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
  <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false" toolbar:helpid="10114"/>
  <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false" toolbar:helpid="10112"/>
  <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false" toolbar:helpid="10115"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>
  <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/>
diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 6c2deea..800db8d 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -24,6 +24,8 @@
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
+ <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Bold"/>
  <toolbar:toolbaritem xlink:href=".uno:Italic"/>
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml
index c3d5c5d..bbd8f42 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -59,6 +59,7 @@
  <toolbar:toolbaritem xlink:href=".uno:SortDescending"/>
  <toolbar:toolbaritem xlink:href=".uno:DataFilterAutoFilter"/>
  <toolbar:toolbaritem xlink:href=".uno:DataFilterStandardFilter" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DataFilterSpecialFilter" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:GoalSeekDialog" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>

More information about the Libreoffice-commits mailing list