summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2014-12-26 19:20:14 +0400
committerCaolán McNamara <caolanm@redhat.com>2015-01-05 17:27:35 +0000
commitca2174e24369bc63a2475ee471bf76697a859317 (patch)
treec1dfeb4d8e7825fe5f1daa3e504608784439b065
parent62280beffe7f0c25c9d6a45fd5135a622f5ef4d4 (diff)
fdo#81475 rearrangement of writer's frame toolbar (4.4)
Change-Id: I0c6b7469aba62a8d427ffebfdcc9f6212fb3fd3f Reviewed-on: https://gerrit.libreoffice.org/13663 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit 88ae2a436ec79dd152f9e81edea00e402438cc1f) Reviewed-on: https://gerrit.libreoffice.org/13666 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu6
-rw-r--r--sw/uiconfig/swriter/toolbar/frameobjectbar.xml22
2 files changed, 20 insertions, 8 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 30d44a8940c6..89823161a39f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3188,11 +3188,17 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Forward One</value>
</prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
</node>
<node oor:name=".uno:ObjectBackOne" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Back One</value>
</prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
</node>
<node oor:name=".uno:EditFrameSet" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
index 1b0614edea76..ce76e79da1c8 100644
--- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
@@ -20,9 +20,11 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:style="dropdown"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:style="radio" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:style="radio" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:style="radio"/>
@@ -35,17 +37,21 @@
<toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
<toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:style="dropdown"/>
<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:ToggleAnchorType" toolbar:style="dropdown"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ChainFrames"/>
<toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/>
-</toolbar:toolbar> \ No newline at end of file
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
+</toolbar:toolbar>