diff options
| -rw-r--r-- | icon-themes/galaxy/cmd/lc_resetattributes.png | bin | 0 -> 362 bytes | |||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 3 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/basicshapes.xml | 20 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/bezierobjectbar.xml | 11 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/calloutshapes.xml | 3 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/drawbar.xml | 39 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml | 6 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/graphicobjectbar.xml | 10 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/standardbar.xml | 3 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/tableobjectbar.xml | 4 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/textobjectbar.xml | 4 |
11 files changed, 63 insertions, 40 deletions
diff --git a/icon-themes/galaxy/cmd/lc_resetattributes.png b/icon-themes/galaxy/cmd/lc_resetattributes.png Binary files differnew file mode 100644 index 000000000000..13cf0ad73b43 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_resetattributes.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 87e92348329f..68c2e12ecd98 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -954,6 +954,9 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Clear ~Direct Formatting</value> </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>1</value> + </prop> </node> <node oor:name=".uno:WrapOff" 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 e0ff2140e960..17a56adbcbd1 100644 --- a/sw/uiconfig/swriter/toolbar/basicshapes.xml +++ b/sw/uiconfig/swriter/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.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.frame"/> -</toolbar:toolbar>
\ No newline at end of file + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/> +</toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml b/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml index 0a6024fe632c..1a5179cb9ebf 100644 --- a/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml +++ b/sw/uiconfig/swriter/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:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/> + <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:style="radio"/> <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:style="radio"/> - <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:style="radio"/> <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:style="radio"/> <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:style="radio"/> <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/swriter/toolbar/calloutshapes.xml b/sw/uiconfig/swriter/toolbar/calloutshapes.xml index 7bf475646a44..e894bc1fa748 100644 --- a/sw/uiconfig/swriter/toolbar/calloutshapes.xml +++ b/sw/uiconfig/swriter/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/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml index e3ab05ea26a6..4bce3dd48be8 100644 --- a/sw/uiconfig/swriter/toolbar/drawbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawbar.xml @@ -21,32 +21,43 @@ <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/> - <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/> - <toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="10906"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/> + <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="10397"/> + <toolbar:toolbaritem xlink:href=".uno:BezierFill" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="10395"/> - <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false" toolbar:helpid="10114"/> - <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false" toolbar:helpid="10112"/> - <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false" toolbar:helpid="10115"/> - <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false" toolbar:helpid="10465"/> + <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:visible="false"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/> + <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/> + <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:helpid="10114" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:helpid="10112" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:helpid="10115" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="11004"/> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="11005"/> - <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006"/> <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="11007"/> + <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/> + <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/> + <toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="10906"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="10977"/> + <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/> + <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/> <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="10977"/> + <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false" toolbar:helpid="10465"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml index 22ef28060a8a..23c2786e8734 100644 --- a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml @@ -52,13 +52,13 @@ <toolbar:toolbaritem xlink:href=".uno:ParaspaceIncrease"/> <toolbar:toolbaritem xlink:href=".uno:ParaspaceDecrease"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:style="radio"/> - <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:style="radio"/> - <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:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:style="radio"/> + <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:style="radio"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml index a41a1dffbf24..84b8be2d1768 100644 --- a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml @@ -22,15 +22,17 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="11016"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/> + <toolbar:toolbaritem xlink:href=".uno:Crop" toolbar:helpid=""/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/> <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/> <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/> <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/> - <toolbar:toolbaritem xlink:href=".uno:Crop" toolbar:helpid=""/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="11016"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:GraphicDialog" toolbar:visible="false"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml index 4910fb8de193..9366b92f513b 100644 --- a/sw/uiconfig/swriter/toolbar/standardbar.xml +++ b/sw/uiconfig/swriter/toolbar/standardbar.xml @@ -49,11 +49,10 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/> <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/> - <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"/> <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/> - <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/> + <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertPagebreak"/> <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl" toolbar:helpid="52824"/> diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml index 48fa5792b93c..ec8fcd605275 100644 --- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml @@ -18,8 +18,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:visible="false"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertRows"/> <toolbar:toolbaritem xlink:href=".uno:InsertColumns"/> <toolbar:toolbarseparator/> @@ -51,4 +49,6 @@ <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:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml index 6ed5ce8969a5..8b20a5330517 100644 --- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml @@ -38,6 +38,10 @@ <toolbar:toolbaritem xlink:href=".uno:SubScript"/> <toolbar:toolbaritem xlink:href=".uno:Shadowed"/> <toolbar:toolbaritem xlink:href=".uno:OutlineFont" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ChangeCaseToLower" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ChangeCaseToUpper" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FontColor"/> <toolbar:toolbaritem xlink:href=".uno:BackColor"/> |
