diff options
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 3 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/basicshapes.xml | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/drawbar.xml | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/drawingobjectbar.xml | 38 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml | 5 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/numobjectbar.xml | 14 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/oleobjectbar.xml | 28 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/starshapes.xml | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/tableobjectbar.xml | 11 |
9 files changed, 63 insertions, 42 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index f6915685dc20..736e95648150 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1704,6 +1704,9 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Number Format: Decimal</value> </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>1</value> + </prop> </node> <node oor:name=".uno:GotoPrevObject" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> diff --git a/sw/uiconfig/swriter/toolbar/basicshapes.xml b/sw/uiconfig/swriter/toolbar/basicshapes.xml index 17a56adbcbd1..f7e73cdad2fc 100644 --- a/sw/uiconfig/swriter/toolbar/basicshapes.xml +++ b/sw/uiconfig/swriter/toolbar/basicshapes.xml @@ -39,10 +39,10 @@ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/> <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:toolbaritem xlink:href=".uno:BasicShapes.ring"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml index df7353b5a4dc..ee39158950a0 100644 --- a/sw/uiconfig/swriter/toolbar/drawbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawbar.xml @@ -18,7 +18,7 @@ * 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:helpid="10128"/> + <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/> <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/> diff --git a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml index ef68b95dc986..ad90ec6542ba 100644 --- a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml @@ -18,43 +18,45 @@ * 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:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:FormatLine"/> - <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:style="dropdown"/> + <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:style="dropdown"/> <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LineWidth"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FormatArea"/> + <toolbar:toolbaritem xlink:href=".uno:FillColor"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FillStyle"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/> - <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false" toolbar:helpid="27322"/> - <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/> - <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/> + <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:visible="false" toolbar:helpid="20472"/> - <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:visible="false" toolbar:helpid="20473"/> - <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/> + <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/> + <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/> + <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:helpid="20563"/> <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/> <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/> - <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:visible="false" toolbar:helpid="20474"/> + <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="20474"/> <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false" toolbar:helpid="20584"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:helpid="10283"/> - <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="10282"/> + <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/> <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/> <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/> <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/> - <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/> + <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:helpid="10283"/> + <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="10282"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="10455"/> <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="10454"/> + <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="10455"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false" toolbar:helpid="27322"/> + <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/> + <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:visible="false"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml index 23c2786e8734..e7627b4c8c79 100644 --- a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml @@ -29,10 +29,13 @@ <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: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:style="dropdown"/> <toolbar:toolbarseparator/> @@ -55,9 +58,9 @@ <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:toolbaritem xlink:href=".uno:SelectAll"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:style="radio"/> <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:style="radio"/> diff --git a/sw/uiconfig/swriter/toolbar/numobjectbar.xml b/sw/uiconfig/swriter/toolbar/numobjectbar.xml index 4a75abad2ca6..f5b49ee38c67 100644 --- a/sw/uiconfig/swriter/toolbar/numobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/numobjectbar.xml @@ -18,18 +18,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink"> - <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/> <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/> - <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/> + <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/> <toolbar:toolbaritem xlink:href=".uno:DecrementSubLevels" toolbar:helpid="20139"/> + <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph" toolbar:helpid="20136"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:MoveUp" toolbar:helpid="20134"/> <toolbar:toolbaritem xlink:href=".uno:MoveDown" toolbar:helpid="20135"/> - <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems" toolbar:helpid="20141"/> + <toolbar:toolbaritem xlink:href=".uno:MoveUp" toolbar:helpid="20134"/> <toolbar:toolbaritem xlink:href=".uno:MoveDownSubItems" toolbar:helpid="20142"/> + <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems" toolbar:helpid="20141"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph" toolbar:helpid="20136"/> <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/> - <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121" toolbar:visible="false"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml index dd0b6cbbd683..dc1cce5eafef 100644 --- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml @@ -18,7 +18,16 @@ * 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:helpid="5552"/> + <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/> + <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/> + <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:helpid="20563"/> + <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/> + <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/> + <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="20474"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="20475"/> <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="20477"/> @@ -28,20 +37,15 @@ <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="20480"/> <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="20479"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/> - <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/> - <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/> - <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/> - <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="20474"/> - <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/> + <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/> <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/> - <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="10187"/> <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="10200"/> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="10201"/> -</toolbar:toolbar>
\ No newline at end of file + <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456"/> +</toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/starshapes.xml b/sw/uiconfig/swriter/toolbar/starshapes.xml index cb7cf6d297e2..cc9cfd6968ee 100644 --- a/sw/uiconfig/swriter/toolbar/starshapes.xml +++ b/sw/uiconfig/swriter/toolbar/starshapes.xml @@ -24,7 +24,7 @@ <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8"/> <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12"/> <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24"/> - <toolbar:toolbarseparator/> + <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"/> diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml index 87476ebd0a61..d9c955d00ec1 100644 --- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml @@ -44,11 +44,20 @@ <toolbar:toolbaritem xlink:href=".uno:LineStyle"/> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/> <toolbar:toolbarseparator/> + <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:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog"/> <toolbar:toolbaritem xlink:href=".uno:TableSort"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:Protect" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:UnsetCellsReadOnly" toolbar:visible="false"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:AutoSum"/> <toolbar:toolbaritem xlink:href=".uno:InsertFormula"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:TableDialog"/> </toolbar:toolbar> |