summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreas kainz <kainz.a@gmail.com>2018-10-28 17:02:34 +0100
committerandreas_kainz <kainz.a@gmail.com>2018-10-28 18:00:40 +0100
commit45b6f096e7ae86d0692ecdfd5b7069622d8a6efa (patch)
tree84c75cf81eda2644cbc90568bd793fb16e668925
parentd7413085daa452b6315893e311d4249f23d0097f (diff)
sw toolbars sync context toolbars between different apps
Change-Id: Ib70cbcb392391c732f9d15a26722cf0dbdb8a56f Reviewed-on: https://gerrit.libreoffice.org/62477 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
-rw-r--r--sw/uiconfig/sglobal/toolbar/formdesign.xml40
-rw-r--r--sw/uiconfig/sglobal/toolbar/frameobjectbar.xml31
-rw-r--r--sw/uiconfig/sglobal/toolbar/oleobjectbar.xml25
-rw-r--r--sw/uiconfig/sweb/toolbar/formdesign.xml40
-rw-r--r--sw/uiconfig/sweb/toolbar/frameobjectbar.xml41
-rw-r--r--sw/uiconfig/sweb/toolbar/oleobjectbar.xml39
-rw-r--r--sw/uiconfig/swform/toolbar/formdesign.xml36
-rw-r--r--sw/uiconfig/swform/toolbar/frameobjectbar.xml41
-rw-r--r--sw/uiconfig/swform/toolbar/oleobjectbar.xml39
-rw-r--r--sw/uiconfig/swreport/toolbar/formdesign.xml37
-rw-r--r--sw/uiconfig/swreport/toolbar/frameobjectbar.xml41
-rw-r--r--sw/uiconfig/swreport/toolbar/oleobjectbar.xml39
-rw-r--r--sw/uiconfig/swriter/toolbar/formdesign.xml36
-rw-r--r--sw/uiconfig/swriter/toolbar/frameobjectbar.xml4
-rw-r--r--sw/uiconfig/swriter/toolbar/oleobjectbar.xml4
-rw-r--r--sw/uiconfig/swxform/toolbar/formdesign.xml40
-rw-r--r--sw/uiconfig/swxform/toolbar/frameobjectbar.xml41
-rw-r--r--sw/uiconfig/swxform/toolbar/oleobjectbar.xml39
18 files changed, 390 insertions, 223 deletions
diff --git a/sw/uiconfig/sglobal/toolbar/formdesign.xml b/sw/uiconfig/sglobal/toolbar/formdesign.xml
index 0af765ded677..1d4a5c96c6d9 100644
--- a/sw/uiconfig/sglobal/toolbar/formdesign.xml
+++ b/sw/uiconfig/sglobal/toolbar/formdesign.xml
@@ -18,30 +18,46 @@
* 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:SelectObject"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer"/>
- <toolbar:toolbaritem xlink:href=".uno:TabDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:AddField"/>
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
+ <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:AnchorMenu"/>
+ <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:BringToFront" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
+ <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddField"/>
+ <toolbar:toolbaritem xlink:href=".uno:TabDialog"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:OpenReadOnly"/>
+ <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GridVisible"/>
<toolbar:toolbaritem xlink:href=".uno:GridUse"/>
<toolbar:toolbaritem xlink:href=".uno:HelplinesMove"/>
diff --git a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml
index 7403ad15b88b..d001b7f23eee 100644
--- a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml
@@ -18,40 +18,43 @@
* 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:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<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: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/sglobal/toolbar/oleobjectbar.xml b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml
index 3824ccee8722..8bcd93e2b5e9 100644
--- a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/sglobal/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:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
+ <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>
diff --git a/sw/uiconfig/sweb/toolbar/formdesign.xml b/sw/uiconfig/sweb/toolbar/formdesign.xml
index 0af765ded677..1d4a5c96c6d9 100644
--- a/sw/uiconfig/sweb/toolbar/formdesign.xml
+++ b/sw/uiconfig/sweb/toolbar/formdesign.xml
@@ -18,30 +18,46 @@
* 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:SelectObject"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer"/>
- <toolbar:toolbaritem xlink:href=".uno:TabDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:AddField"/>
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
+ <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:AnchorMenu"/>
+ <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:BringToFront" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
+ <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddField"/>
+ <toolbar:toolbaritem xlink:href=".uno:TabDialog"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:OpenReadOnly"/>
+ <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GridVisible"/>
<toolbar:toolbaritem xlink:href=".uno:GridUse"/>
<toolbar:toolbaritem xlink:href=".uno:HelplinesMove"/>
diff --git a/sw/uiconfig/sweb/toolbar/frameobjectbar.xml b/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
index a119d4a6bf5d..d001b7f23eee 100644
--- a/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
@@ -18,34 +18,43 @@
* 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: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:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal"/>
+ <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: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:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <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:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<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:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <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:toolbar> \ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/toolbar/oleobjectbar.xml b/sw/uiconfig/sweb/toolbar/oleobjectbar.xml
index d89182257a95..8bcd93e2b5e9 100644
--- a/sw/uiconfig/sweb/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/oleobjectbar.xml
@@ -18,30 +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:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
<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:toolbaritem xlink:href=".uno:WrapRight"/>
<toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
+ <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:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
-</toolbar:toolbar> \ No newline at end of file
+ <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>
diff --git a/sw/uiconfig/swform/toolbar/formdesign.xml b/sw/uiconfig/swform/toolbar/formdesign.xml
index 6f4325be1281..1d4a5c96c6d9 100644
--- a/sw/uiconfig/swform/toolbar/formdesign.xml
+++ b/sw/uiconfig/swform/toolbar/formdesign.xml
@@ -18,6 +18,31 @@
* 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:AnchorMenu"/>
+ <toolbar:toolbarseparator/>
+ <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"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarseparator/>
@@ -32,17 +57,6 @@
<toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GridVisible"/>
<toolbar:toolbaritem xlink:href=".uno:GridUse"/>
diff --git a/sw/uiconfig/swform/toolbar/frameobjectbar.xml b/sw/uiconfig/swform/toolbar/frameobjectbar.xml
index a119d4a6bf5d..d001b7f23eee 100644
--- a/sw/uiconfig/swform/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/frameobjectbar.xml
@@ -18,34 +18,43 @@
* 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: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:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal"/>
+ <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: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:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <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:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<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:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <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:toolbar> \ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/oleobjectbar.xml b/sw/uiconfig/swform/toolbar/oleobjectbar.xml
index d89182257a95..8bcd93e2b5e9 100644
--- a/sw/uiconfig/swform/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/oleobjectbar.xml
@@ -18,30 +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:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
<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:toolbaritem xlink:href=".uno:WrapRight"/>
<toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
+ <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:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
-</toolbar:toolbar> \ No newline at end of file
+ <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>
diff --git a/sw/uiconfig/swreport/toolbar/formdesign.xml b/sw/uiconfig/swreport/toolbar/formdesign.xml
index 758a8a8603cb..1d4a5c96c6d9 100644
--- a/sw/uiconfig/swreport/toolbar/formdesign.xml
+++ b/sw/uiconfig/swreport/toolbar/formdesign.xml
@@ -18,13 +18,37 @@
* 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:AnchorMenu"/>
+ <toolbar:toolbarseparator/>
+ <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"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
<toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowDataNavigator"/>
<toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer"/>
<toolbar:toolbaritem xlink:href=".uno:AddField"/>
<toolbar:toolbaritem xlink:href=".uno:TabDialog"/>
@@ -33,17 +57,6 @@
<toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GridVisible"/>
<toolbar:toolbaritem xlink:href=".uno:GridUse"/>
diff --git a/sw/uiconfig/swreport/toolbar/frameobjectbar.xml b/sw/uiconfig/swreport/toolbar/frameobjectbar.xml
index a119d4a6bf5d..d001b7f23eee 100644
--- a/sw/uiconfig/swreport/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/frameobjectbar.xml
@@ -18,34 +18,43 @@
* 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: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:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal"/>
+ <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: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:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <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:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<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:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <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:toolbar> \ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/toolbar/oleobjectbar.xml b/sw/uiconfig/swreport/toolbar/oleobjectbar.xml
index d89182257a95..8bcd93e2b5e9 100644
--- a/sw/uiconfig/swreport/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/oleobjectbar.xml
@@ -18,30 +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:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
<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:toolbaritem xlink:href=".uno:WrapRight"/>
<toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
+ <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:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
-</toolbar:toolbar> \ No newline at end of file
+ <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>
diff --git a/sw/uiconfig/swriter/toolbar/formdesign.xml b/sw/uiconfig/swriter/toolbar/formdesign.xml
index 6f4325be1281..1d4a5c96c6d9 100644
--- a/sw/uiconfig/swriter/toolbar/formdesign.xml
+++ b/sw/uiconfig/swriter/toolbar/formdesign.xml
@@ -18,6 +18,31 @@
* 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:AnchorMenu"/>
+ <toolbar:toolbarseparator/>
+ <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"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarseparator/>
@@ -32,17 +57,6 @@
<toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GridVisible"/>
<toolbar:toolbaritem xlink:href=".uno:GridUse"/>
diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
index ede8dfdbc794..d001b7f23eee 100644
--- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
@@ -43,8 +43,8 @@
<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:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
index f653df59a9a7..8bcd93e2b5e9 100644
--- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
@@ -43,8 +43,8 @@
<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:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
diff --git a/sw/uiconfig/swxform/toolbar/formdesign.xml b/sw/uiconfig/swxform/toolbar/formdesign.xml
index 7a1efcd993ea..1d4a5c96c6d9 100644
--- a/sw/uiconfig/swxform/toolbar/formdesign.xml
+++ b/sw/uiconfig/swxform/toolbar/formdesign.xml
@@ -18,12 +18,37 @@
* 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:AnchorMenu"/>
+ <toolbar:toolbarseparator/>
+ <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"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
- <toolbar:toolbaritem xlink:href=".uno:SwitchXFormsDesignMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowDataNavigator"/>
<toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer"/>
<toolbar:toolbaritem xlink:href=".uno:AddField"/>
<toolbar:toolbaritem xlink:href=".uno:TabDialog"/>
@@ -32,17 +57,6 @@
<toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GridVisible"/>
<toolbar:toolbaritem xlink:href=".uno:GridUse"/>
diff --git a/sw/uiconfig/swxform/toolbar/frameobjectbar.xml b/sw/uiconfig/swxform/toolbar/frameobjectbar.xml
index a119d4a6bf5d..d001b7f23eee 100644
--- a/sw/uiconfig/swxform/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/frameobjectbar.xml
@@ -18,34 +18,43 @@
* 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: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:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal"/>
+ <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: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:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <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:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<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:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <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:toolbar> \ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/toolbar/oleobjectbar.xml b/sw/uiconfig/swxform/toolbar/oleobjectbar.xml
index d89182257a95..8bcd93e2b5e9 100644
--- a/sw/uiconfig/swxform/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/oleobjectbar.xml
@@ -18,30 +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:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
<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:toolbaritem xlink:href=".uno:WrapRight"/>
<toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
+ <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:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
-</toolbar:toolbar> \ No newline at end of file
+ <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>