sc/uiconfig/scalc/toolbar/drawobjectbar.xml | 41 +++++++++++++------- sc/uiconfig/scalc/toolbar/graphicobjectbar.xml | 46 ++++++++++++----------- sw/uiconfig/swriter/toolbar/drawingobjectbar.xml | 31 +++++++++------ sw/uiconfig/swriter/toolbar/frameobjectbar.xml | 27 +++++++------ sw/uiconfig/swriter/toolbar/oleobjectbar.xml | 25 +++++++----- 5 files changed, 100 insertions(+), 70 deletions(-)
New commits: commit e48fc4d011f43d5d2260e4db435fa925037cbcd8 Author: andreas kainz <kain...@gmail.com> AuthorDate: Wed Oct 24 22:23:29 2018 +0200 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Sat Oct 27 11:13:55 2018 +0200 tdf#120856 sync shape, graphic, frame and ole contect toolbar in writer and calc Change-Id: I36458c27027748c790a5e6ef768fcd19986b656d Reviewed-on: https://gerrit.libreoffice.org/62336 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml index 4d55efe27314..976ca019a23c 100644 --- a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml @@ -18,25 +18,18 @@ * 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:FormatLine" toolbar:visible="false"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:XLineColor"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/> - <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:LineWidth"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FormatArea"/> - <toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FillStyle"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/> <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:visible="false"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:BringToFront"/> <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/> <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/> @@ -45,8 +38,26 @@ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/> <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/> + <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/> + <toolbar:toolbaritem xlink:href=".uno:LineWidth"/> + <toolbar:toolbaritem xlink:href=".uno:XLineColor"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:FillStyle"/> + <toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/> + <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:FormatGroup"/> + <toolbar:toolbaritem xlink:href=".uno:EnterGroup"/> + <toolbar:toolbaritem xlink:href=".uno:LeaveGroup"/> + <toolbar:toolbaritem xlink:href=".uno:FormatUngroup"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:visible="false"/> </toolbar:toolbar> diff --git a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml index 3c4556964b82..47f9a46c0bc5 100644 --- a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml @@ -18,45 +18,49 @@ * 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:GraphicFilterToolbox"/> + <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:GrafMode"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:XLineColor"/> - <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:visible="false"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:BringToFront"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/> + <toolbar:toolbaritem xlink:href=".uno:SendToBack"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/> <toolbar:toolbaritem xlink:href=".uno:LineWidth"/> + <toolbar:toolbaritem xlink:href=".uno:XLineColor"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FormatArea"/> <toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FillStyle"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:Crop"/> <toolbar:toolbaritem xlink:href=".uno:FillShadow"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/> - <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/> + <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:BringToFront"/> - <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/> - <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/> - <toolbar:toolbaritem xlink:href=".uno:SendToBack"/> + <toolbar:toolbaritem xlink:href=".uno:GrafMode"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/> - <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/> + <toolbar:toolbaritem xlink:href=".uno:Crop"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/> <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/> + <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ColorSettings"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:GraphicDialog"/> <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:visible="false"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml index ec235029eda6..3662242f552f 100644 --- a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml @@ -18,17 +18,6 @@ * 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:XLineColor"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/> - <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:LineWidth"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FillStyle"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:WrapOff"/> @@ -39,9 +28,16 @@ <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/> <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/> <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:visible="false"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:BringToFront"/> <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/> <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/> @@ -50,6 +46,17 @@ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/> <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/> + <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/> + <toolbar:toolbaritem xlink:href=".uno:LineWidth"/> + <toolbar:toolbaritem xlink:href=".uno:XLineColor"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:FillStyle"/> + <toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/> + <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FormatGroup"/> <toolbar:toolbaritem xlink:href=".uno:EnterGroup"/> <toolbar:toolbaritem xlink:href=".uno:LeaveGroup"/> diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml index 7403ad15b88b..ede8dfdbc794 100644 --- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml @@ -18,24 +18,25 @@ * 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:StyleApply" toolbar:visible="false"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:WrapOff"/> <toolbar:toolbaritem xlink:href=".uno:WrapOn"/> <toolbar:toolbaritem xlink:href=".uno:WrapIdeal"/> - <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:WrapLeft"/> + <toolbar:toolbaritem xlink:href=".uno:WrapRight"/> <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/> + <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/> - <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/> - <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:visible="false"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:AlignUp"/> - <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/> - <toolbar:toolbaritem xlink:href=".uno:AlignDown"/> + <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:BringToFront"/> <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/> @@ -49,9 +50,11 @@ <toolbar:toolbaritem xlink:href=".uno:LineStyle"/> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/> <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/> + <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:GraphicDialog" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ChainFrames"/> <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:visible="false"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml index 3824ccee8722..f653df59a9a7 100644 --- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml @@ -18,34 +18,39 @@ * 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:StyleApply" toolbar:visible="false"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:WrapOff"/> <toolbar:toolbaritem xlink:href=".uno:WrapOn"/> <toolbar:toolbaritem xlink:href=".uno:WrapIdeal"/> - <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:WrapLeft"/> + <toolbar:toolbaritem xlink:href=".uno:WrapRight"/> <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/> + <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/> - <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/> - <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:visible="false"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:AlignUp"/> - <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/> - <toolbar:toolbaritem xlink:href=".uno:AlignDown"/> + <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:BringToFront"/> <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/> <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/> <toolbar:toolbaritem xlink:href=".uno:SendToBack"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:visible="false"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/> <toolbar:toolbaritem xlink:href=".uno:LineStyle"/> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/> <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/> + <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:visible="false"/> </toolbar:toolbar> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits