sw/uiconfig/sglobal/popupmenu/draw.xml | 8 ++-
sw/uiconfig/sglobal/popupmenu/table.xml | 1
sw/uiconfig/sglobal/popupmenu/text.xml | 4 -
sw/uiconfig/sglobal/toolbar/arrowshapes.xml | 32 +++++++-------
sw/uiconfig/sglobal/toolbar/basicshapes.xml | 20 ++++----
sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml | 11 ++--
sw/uiconfig/sglobal/toolbar/calloutshapes.xml | 3 -
sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml | 35 +++++++++------
sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml | 32 ++++++++++----
sw/uiconfig/sglobal/toolbar/findbar.xml | 4 +
sw/uiconfig/sglobal/toolbar/formsnavigationbar.xml | 3 -
sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml | 3 -
sw/uiconfig/sglobal/toolbar/previewobjectbar.xml | 17 ++++---
sw/uiconfig/sglobal/toolbar/standardbar.xml | 2
sw/uiconfig/sglobal/toolbar/starshapes.xml | 8 +--
sw/uiconfig/sglobal/toolbar/symbolshapes.xml | 16 +++----
sw/uiconfig/sglobal/toolbar/tableobjectbar.xml | 47 ++++++++++++++-------
sw/uiconfig/sglobal/toolbar/textstylebar.xml | 9 ++--
sw/uiconfig/sglobal/toolbar/viewerbar.xml | 1
sw/uiconfig/sweb/popupmenu/table.xml | 1
sw/uiconfig/sweb/popupmenu/text.xml | 4 -
sw/uiconfig/swform/popupmenu/draw.xml | 8 ++-
sw/uiconfig/swform/popupmenu/table.xml | 18 +++++---
sw/uiconfig/swform/popupmenu/text.xml | 3 -
sw/uiconfig/swreport/popupmenu/draw.xml | 8 ++-
sw/uiconfig/swreport/popupmenu/table.xml | 18 +++++---
sw/uiconfig/swreport/popupmenu/text.xml | 3 -
sw/uiconfig/swxform/popupmenu/draw.xml | 8 ++-
sw/uiconfig/swxform/popupmenu/table.xml | 1
sw/uiconfig/swxform/popupmenu/text.xml | 4 -
30 files changed, 212 insertions(+), 120 deletions(-)
New commits:
commit 9964299e7396dd7c7f5a9e1870eaa7901d930868
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Sun Oct 28 21:45:15 2018 +0100
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Mon Oct 29 19:42:45 2018 +0100
Toolbar: sync sglobal with swriter
Change-Id: I95205265c2c7dc0d7a43fdcb26394e5cfd53ee37
Reviewed-on: https://gerrit.libreoffice.org/62483
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
b/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
index e2171beab7c8..3f74148c7da9 100644
--- a/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
@@ -18,34 +18,34 @@
* 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:ArrowShapes.left-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow"/>
+ <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/>
- <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/basicshapes.xml
b/sw/uiconfig/sglobal/toolbar/basicshapes.xml
index 5b7194408b0b..148245f66672 100644
--- a/sw/uiconfig/sglobal/toolbar/basicshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/basicshapes.xml
@@ -22,25 +22,27 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid"/>
<toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie"/>
+ <toolbar:toolbaritem xlink:href=".uno:CircleCut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Arc"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
+ <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram"/>
- <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
<toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
b/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
index b20e6e3643b8..c42f57ec6e93 100644
--- a/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
@@ -18,20 +18,21 @@
* 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:ToggleObjectBezierMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierMove"/>
<toolbar:toolbaritem xlink:href=".uno:BezierInsert"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierDelete"/>
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierConvert"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierClose"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierCutLine"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierEdge"/>
<toolbar:toolbaritem xlink:href=".uno:BezierSmooth"/>
<toolbar:toolbaritem xlink:href=".uno:BezierSymmetric"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
b/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
index 43872e2e3bd5..04176302ccd1 100644
--- a/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
@@ -22,7 +22,8 @@
<toolbar:toolbaritem
xlink:href=".uno:CalloutShapes.round-rectangular-callout"/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout"/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout"/>
+ <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1"/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2"/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
b/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
index f39fb0164480..3662242f552f 100644
--- a/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
@@ -18,30 +18,26 @@
* 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:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle"/>
- <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: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/sglobal/toolbar/drawtextobjectbar.xml
b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
index 835c6b9364a3..018cd278ad5b 100644
--- a/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
@@ -21,33 +21,47 @@
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
+ <toolbar:toolbaritem xlink:href=".uno:Grow"/>
+ <toolbar:toolbaritem xlink:href=".uno:Shrink"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Bold"/>
<toolbar:toolbaritem xlink:href=".uno:Italic"/>
<toolbar:toolbaritem xlink:href=".uno:Underline"/>
+ <toolbar:toolbaritem xlink:href=".uno:Strikeout"/>
+ <toolbar:toolbaritem xlink:href=".uno:Overline" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
<toolbar:toolbaritem xlink:href=".uno:SubScript"/>
- <toolbar:toolbaritem xlink:href=".uno:Grow"/>
- <toolbar:toolbaritem xlink:href=".uno:Shrink"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Shadowed"/>
+ <toolbar:toolbaritem xlink:href=".uno:OutlineFont"/>
+ <toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Color"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
<toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
<toolbar:toolbaritem xlink:href=".uno:RightPara"/>
<toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:LineSpacing"/>
<toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaspaceIncrease"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaspaceDecrease"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight"/>
<toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll"/>
<toolbar:toolbaritem xlink:href=".uno:FontDialog"/>
<toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:SelectAll"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/findbar.xml
b/sw/uiconfig/sglobal/toolbar/findbar.xml
index 7c71a1ac2756..15a29ac85162 100644
--- a/sw/uiconfig/sglobal/toolbar/findbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/findbar.xml
@@ -27,5 +27,9 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:NavElement"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollToPrevious"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollToNext"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SearchLabel"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/formsnavigationbar.xml
b/sw/uiconfig/sglobal/toolbar/formsnavigationbar.xml
index 0767f389dee0..4ffa664e64d2 100644
--- a/sw/uiconfig/sglobal/toolbar/formsnavigationbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/formsnavigationbar.xml
@@ -35,6 +35,7 @@
<toolbar:toolbaritem xlink:href=".uno:DeleteRecord"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Refresh"/>
+ <toolbar:toolbaritem xlink:href=".uno:RefreshFormControl"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:OrderCrit"/>
<toolbar:toolbaritem xlink:href=".uno:Sortup"/>
@@ -46,4 +47,4 @@
<toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
index 10513be91e19..6494546daebd 100644
--- a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
@@ -28,8 +28,9 @@
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
<toolbar:toolbaritem xlink:href=".uno:RotateLeft"/>
<toolbar:toolbaritem xlink:href=".uno:RotateRight"/>
- <toolbar:toolbaritem xlink:href=".uno:RotateReset"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/>
<toolbar:toolbaritem xlink:href=".uno:Rotate180" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateReset" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
index 95bd3293e3ca..13956996e79e 100644
--- a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
@@ -18,23 +18,24 @@
* 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:PageUp"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ShowSinglePage"/>
<toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
<toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:JumpToSpecificPage"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreview"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview"/>
+ <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image
text"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/standardbar.xml
b/sw/uiconfig/sglobal/toolbar/standardbar.xml
index b2e81b0a21c5..98277dc3b581 100644
--- a/sw/uiconfig/sglobal/toolbar/standardbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/standardbar.xml
@@ -60,9 +60,9 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertPagebreak"/>
<toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl"/>
- <toolbar:toolbaritem xlink:href=".uno:EmojiControl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:CharmapControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:EmojiControl" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
<toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
diff --git a/sw/uiconfig/sglobal/toolbar/starshapes.xml
b/sw/uiconfig/sglobal/toolbar/starshapes.xml
index 95e333c23e10..cbc07fc70aaa 100644
--- a/sw/uiconfig/sglobal/toolbar/starshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/starshapes.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:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star4"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star5"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star6"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star8"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star12"/>
- <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star24"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.signet"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/symbolshapes.xml
b/sw/uiconfig/sglobal/toolbar/symbolshapes.xml
index d1a790def94e..9ba9f22e0c06 100644
--- a/sw/uiconfig/sglobal/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/symbolshapes.xml
@@ -19,23 +19,23 @@
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar";
xmlns:xlink="http://www.w3.org/1999/xlink";>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.smiley"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/>
+ <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket"/>
- <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
index 62eb9d8cc29b..75efbade4479 100644
--- a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
@@ -18,33 +18,52 @@
* 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:LineStyle"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertRowsBefore"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertRowsAfter"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsBefore"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteTable"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireCell"/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectTable"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:MergeCells"/>
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
+ <toolbar:toolbaritem xlink:href=".uno:SplitTable"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:OptimizeTable"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRowsAfter"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/>
- <toolbar:toolbaritem xlink:href=".uno:TableDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatStandard"
toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatCurrency"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatDecimal"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatDate"
toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:TableNumberFormatDialog"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog"/>
<toolbar:toolbaritem xlink:href=".uno:TableSort"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Protect"/>
+ <toolbar:toolbaritem xlink:href=".uno:UnsetCellsReadOnly"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AutoSum"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormula"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:TableDialog"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/textstylebar.xml
b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
index 1d660d7a715d..46fd73a5a54d 100644
--- a/sw/uiconfig/sglobal/toolbar/textstylebar.xml
+++ b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
@@ -73,9 +73,12 @@
<!-- These command can be enabled when tdf#107000 is fixed -->
<toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:text="List Styles"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BulletListStyle" toolbar:text="Bullet"/>
- <toolbar:toolbaritem xlink:href=".uno:NumberListStyle" toolbar:text="Number"/>
- <toolbar:toolbaritem xlink:href=".uno:RomanListStyle" toolbar:text="Roman"/>
+ <toolbar:toolbaritem xlink:href=".uno:BulletListStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberListStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlphaListStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlphaLowListStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:RomanListStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:RomanLowListStyle"/>
<toolbar:toolbaritem xlink:href=".uno:RemoveBullets"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
diff --git a/sw/uiconfig/sglobal/toolbar/viewerbar.xml
b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
index d1a0b59d662b..85099a7b5f46 100644
--- a/sw/uiconfig/sglobal/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
@@ -21,6 +21,7 @@
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ReadOnlyDoc" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
commit fce17ee83a3ed4ab1703524370155c113cfa3a46
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Sun Oct 28 20:50:54 2018 +0100
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Mon Oct 29 19:42:33 2018 +0100
sw modules: finish context menues
Change-Id: Iacbda858faa758a17245482acc594fcedb6d2366
Reviewed-on: https://gerrit.libreoffice.org/62481
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sw/uiconfig/sglobal/popupmenu/draw.xml
b/sw/uiconfig/sglobal/popupmenu/draw.xml
index e19d91a0627f..3205e06e952f 100644
--- a/sw/uiconfig/sglobal/popupmenu/draw.xml
+++ b/sw/uiconfig/sglobal/popupmenu/draw.xml
@@ -14,8 +14,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
<menu:menuitem menu:id=".uno:ToggleObjectRotateMode"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:TransformDialog"/>
<menu:menuitem menu:id=".uno:FormatLine"/>
@@ -62,6 +60,12 @@
<menu:menuitem menu:id=".uno:SetObjectToBackground"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:FlipMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menuitem menu:id=".uno:FormatGroup"/>
<menu:menuitem menu:id=".uno:FormatUngroup"/>
<menu:menuitem menu:id=".uno:EnterGroup"/>
diff --git a/sw/uiconfig/sglobal/popupmenu/table.xml
b/sw/uiconfig/sglobal/popupmenu/table.xml
index 0bb8d5ddea10..03021c965c6d 100644
--- a/sw/uiconfig/sglobal/popupmenu/table.xml
+++ b/sw/uiconfig/sglobal/popupmenu/table.xml
@@ -137,6 +137,7 @@
<menu:menuitem menu:id=".uno:RemoveHyperlink"/>
<menu:menuitem menu:id=".uno:OpenSmartTagMenuOnCursor"/>
<menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
<menu:menuitem menu:id=".uno:TableDialog"/>
</menu:menupopup>
diff --git a/sw/uiconfig/sglobal/popupmenu/text.xml
b/sw/uiconfig/sglobal/popupmenu/text.xml
index a801ed6325b7..f93e1bf17f30 100644
--- a/sw/uiconfig/sglobal/popupmenu/text.xml
+++ b/sw/uiconfig/sglobal/popupmenu/text.xml
@@ -88,8 +88,6 @@
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
<menu:menuitem menu:id=".uno:EditHyperlink"/>
<menu:menuitem menu:id=".uno:CopyHyperlinkLocation"/>
@@ -99,4 +97,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:CurrentFootnoteDialog"/>
<menu:menuitem menu:id=".uno:EditCurrentRegion"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PageDialog"/>
</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/table.xml
b/sw/uiconfig/sweb/popupmenu/table.xml
index 0bb8d5ddea10..03021c965c6d 100644
--- a/sw/uiconfig/sweb/popupmenu/table.xml
+++ b/sw/uiconfig/sweb/popupmenu/table.xml
@@ -137,6 +137,7 @@
<menu:menuitem menu:id=".uno:RemoveHyperlink"/>
<menu:menuitem menu:id=".uno:OpenSmartTagMenuOnCursor"/>
<menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
<menu:menuitem menu:id=".uno:TableDialog"/>
</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/text.xml
b/sw/uiconfig/sweb/popupmenu/text.xml
index a801ed6325b7..f93e1bf17f30 100644
--- a/sw/uiconfig/sweb/popupmenu/text.xml
+++ b/sw/uiconfig/sweb/popupmenu/text.xml
@@ -88,8 +88,6 @@
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
<menu:menuitem menu:id=".uno:EditHyperlink"/>
<menu:menuitem menu:id=".uno:CopyHyperlinkLocation"/>
@@ -99,4 +97,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:CurrentFootnoteDialog"/>
<menu:menuitem menu:id=".uno:EditCurrentRegion"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PageDialog"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/draw.xml
b/sw/uiconfig/swform/popupmenu/draw.xml
index e19d91a0627f..3205e06e952f 100644
--- a/sw/uiconfig/swform/popupmenu/draw.xml
+++ b/sw/uiconfig/swform/popupmenu/draw.xml
@@ -14,8 +14,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
<menu:menuitem menu:id=".uno:ToggleObjectRotateMode"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:TransformDialog"/>
<menu:menuitem menu:id=".uno:FormatLine"/>
@@ -62,6 +60,12 @@
<menu:menuitem menu:id=".uno:SetObjectToBackground"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:FlipMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menuitem menu:id=".uno:FormatGroup"/>
<menu:menuitem menu:id=".uno:FormatUngroup"/>
<menu:menuitem menu:id=".uno:EnterGroup"/>
diff --git a/sw/uiconfig/swform/popupmenu/table.xml
b/sw/uiconfig/swform/popupmenu/table.xml
index 25305b15668b..b76ca48f8974 100644
--- a/sw/uiconfig/swform/popupmenu/table.xml
+++ b/sw/uiconfig/swform/popupmenu/table.xml
@@ -70,11 +70,18 @@
<menu:menuitem menu:id=".uno:EditFootnote"/>
<menu:menuitem menu:id=".uno:IndexEntryDialog"/>
<menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
- <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
- <menu:menuitem menu:id=".uno:NextTrackedChange"/>
- <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+ <menu:menu menu:id=".uno:InsertAnnotation">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:InsertAnnotation"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
+ <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
+ <menu:menuitem menu:id=".uno:NextTrackedChange"/>
+ <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:TrackChanges"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
<menu:menuitem menu:id=".uno:EditHyperlink"/>
@@ -82,6 +89,7 @@
<menu:menuitem menu:id=".uno:RemoveHyperlink"/>
<menu:menuitem menu:id=".uno:OpenSmartTagMenuOnCursor"/>
<menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
<menu:menuitem menu:id=".uno:TableDialog"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/text.xml
b/sw/uiconfig/swform/popupmenu/text.xml
index 8f39e053c398..d8957268af14 100644
--- a/sw/uiconfig/swform/popupmenu/text.xml
+++ b/sw/uiconfig/swform/popupmenu/text.xml
@@ -40,7 +40,6 @@
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ResetAttributes"/>
<menu:menuitem menu:id=".uno:EditStyle"/>
@@ -54,4 +53,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:CurrentFootnoteDialog"/>
<menu:menuitem menu:id=".uno:EditCurrentRegion"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PageDialog"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swreport/popupmenu/draw.xml
b/sw/uiconfig/swreport/popupmenu/draw.xml
index e19d91a0627f..3205e06e952f 100644
--- a/sw/uiconfig/swreport/popupmenu/draw.xml
+++ b/sw/uiconfig/swreport/popupmenu/draw.xml
@@ -14,8 +14,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
<menu:menuitem menu:id=".uno:ToggleObjectRotateMode"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:TransformDialog"/>
<menu:menuitem menu:id=".uno:FormatLine"/>
@@ -62,6 +60,12 @@
<menu:menuitem menu:id=".uno:SetObjectToBackground"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:FlipMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menuitem menu:id=".uno:FormatGroup"/>
<menu:menuitem menu:id=".uno:FormatUngroup"/>
<menu:menuitem menu:id=".uno:EnterGroup"/>
diff --git a/sw/uiconfig/swreport/popupmenu/table.xml
b/sw/uiconfig/swreport/popupmenu/table.xml
index 25305b15668b..b76ca48f8974 100644
--- a/sw/uiconfig/swreport/popupmenu/table.xml
+++ b/sw/uiconfig/swreport/popupmenu/table.xml
@@ -70,11 +70,18 @@
<menu:menuitem menu:id=".uno:EditFootnote"/>
<menu:menuitem menu:id=".uno:IndexEntryDialog"/>
<menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
- <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
- <menu:menuitem menu:id=".uno:NextTrackedChange"/>
- <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+ <menu:menu menu:id=".uno:InsertAnnotation">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:InsertAnnotation"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
+ <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
+ <menu:menuitem menu:id=".uno:NextTrackedChange"/>
+ <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:TrackChanges"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
<menu:menuitem menu:id=".uno:EditHyperlink"/>
@@ -82,6 +89,7 @@
<menu:menuitem menu:id=".uno:RemoveHyperlink"/>
<menu:menuitem menu:id=".uno:OpenSmartTagMenuOnCursor"/>
<menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
<menu:menuitem menu:id=".uno:TableDialog"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swreport/popupmenu/text.xml
b/sw/uiconfig/swreport/popupmenu/text.xml
index 8f39e053c398..d8957268af14 100644
--- a/sw/uiconfig/swreport/popupmenu/text.xml
+++ b/sw/uiconfig/swreport/popupmenu/text.xml
@@ -40,7 +40,6 @@
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ResetAttributes"/>
<menu:menuitem menu:id=".uno:EditStyle"/>
@@ -54,4 +53,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:CurrentFootnoteDialog"/>
<menu:menuitem menu:id=".uno:EditCurrentRegion"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PageDialog"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swxform/popupmenu/draw.xml
b/sw/uiconfig/swxform/popupmenu/draw.xml
index e19d91a0627f..3205e06e952f 100644
--- a/sw/uiconfig/swxform/popupmenu/draw.xml
+++ b/sw/uiconfig/swxform/popupmenu/draw.xml
@@ -14,8 +14,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
<menu:menuitem menu:id=".uno:ToggleObjectRotateMode"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:TransformDialog"/>
<menu:menuitem menu:id=".uno:FormatLine"/>
@@ -62,6 +60,12 @@
<menu:menuitem menu:id=".uno:SetObjectToBackground"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:FlipMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menuitem menu:id=".uno:FormatGroup"/>
<menu:menuitem menu:id=".uno:FormatUngroup"/>
<menu:menuitem menu:id=".uno:EnterGroup"/>
diff --git a/sw/uiconfig/swxform/popupmenu/table.xml
b/sw/uiconfig/swxform/popupmenu/table.xml
index 0bb8d5ddea10..03021c965c6d 100644
--- a/sw/uiconfig/swxform/popupmenu/table.xml
+++ b/sw/uiconfig/swxform/popupmenu/table.xml
@@ -137,6 +137,7 @@
<menu:menuitem menu:id=".uno:RemoveHyperlink"/>
<menu:menuitem menu:id=".uno:OpenSmartTagMenuOnCursor"/>
<menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
<menu:menuitem menu:id=".uno:TableDialog"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swxform/popupmenu/text.xml
b/sw/uiconfig/swxform/popupmenu/text.xml
index a801ed6325b7..f93e1bf17f30 100644
--- a/sw/uiconfig/swxform/popupmenu/text.xml
+++ b/sw/uiconfig/swxform/popupmenu/text.xml
@@ -88,8 +88,6 @@
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
<menu:menuitem menu:id=".uno:EditHyperlink"/>
<menu:menuitem menu:id=".uno:CopyHyperlinkLocation"/>
@@ -99,4 +97,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:CurrentFootnoteDialog"/>
<menu:menuitem menu:id=".uno:EditCurrentRegion"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PageDialog"/>
</menu:menupopup>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
