diff options
7 files changed, 31 insertions, 26 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index 56ea073a810d..bf8306f07686 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -387,10 +387,10 @@ </node> <node oor:name="private:resource/toolbar/graphicobjectbar" oor:op="replace"> <prop oor:name="DockPos" oor:type="xs:string"> - <value>0,0</value> + <value>1,1</value> </prop> <prop oor:name="DockingArea" oor:type="xs:int"> - <value>1</value> + <value>0</value> </prop> <prop oor:name="Docked" oor:type="xs:boolean"> <value>true</value> diff --git a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml index fc21f10585c3..22ef28060a8a 100644 --- a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml @@ -27,7 +27,7 @@ <toolbar:toolbaritem xlink:href=".uno:Bold"/> <toolbar:toolbaritem xlink:href=".uno:Italic"/> <toolbar:toolbaritem xlink:href=".uno:Underline"/> - <toolbar:toolbaritem xlink:href=".uno:Strikeout" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:Strikeout"/> <toolbar:toolbaritem xlink:href=".uno:Overline" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:SuperScript"/> <toolbar:toolbaritem xlink:href=".uno:SubScript"/> @@ -41,14 +41,16 @@ <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:style="radio"/> <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:style="radio"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/> + <toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/> + <toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LineSpacing"/> <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:style="radio" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:style="radio" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:style="radio" toolbar:visible="false"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/> - <toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/> - <toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/> + <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"/> diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml index ce76e79da1c8..d2c48aa0d297 100644 --- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.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:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:StyleApply"/> + <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:style="dropdown"/> <toolbar:toolbarseparator/> @@ -53,5 +53,5 @@ <toolbar:toolbaritem xlink:href=".uno:ChainFrames"/> <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/> + <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458" toolbar:visible="false"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml index 6e7201c82042..daccb1461598 100644 --- a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml @@ -31,5 +31,5 @@ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/> <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/> + <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 2d77072194fe..88c28bdd98dc 100644 --- a/sw/uiconfig/swriter/toolbar/standardbar.xml +++ b/sw/uiconfig/swriter/toolbar/standardbar.xml @@ -29,8 +29,8 @@ <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/> - <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Print"/> + <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="5710"/> @@ -41,10 +41,10 @@ <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/> <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/> - <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:visible="false" toolbar:helpid="12021"/> <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/> <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/> + <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:visible="false" toolbar:helpid="12021"/> <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/> @@ -53,19 +53,22 @@ <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:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertPagebreak"/> <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl" toolbar:helpid="52824"/> <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="20328"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/> <toolbar:toolbaritem xlink:href=".uno:InsertFootnote" toolbar:helpid="20399"/> - <toolbar:toolbaritem xlink:href=".uno:InsertEndnote" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:InsertEndnote"/> <toolbar:toolbaritem xlink:href=".uno:InsertBookmark"/> <toolbar:toolbaritem xlink:href=".uno:InsertReferenceField" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="20329"/> + <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges"toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:TrackChanges"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/> <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/> diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml index 0da217fe60d6..7c4102774d35 100644 --- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml @@ -39,8 +39,8 @@ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:style="radio"/> <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:style="radio"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/> <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:style="dropdown"/> + <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/> <toolbar:toolbaritem xlink:href=".uno:LineStyle"/> diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml index 79ec59ec2963..6ed5ce8969a5 100644 --- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml @@ -43,28 +43,28 @@ <toolbar:toolbaritem xlink:href=".uno:BackColor"/> <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:visible="false"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:DefaultBullet"/> + <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:style="radio"/> <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:style="radio"/> <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:style="radio"/> <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:style="radio"/> <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:visible="false"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LineSpacing"/> + <toolbar:toolbaritem xlink:href=".uno:ParaspaceIncrease" toolbar:helpid="27346"/> + <toolbar:toolbaritem xlink:href=".uno:ParaspaceDecrease" toolbar:helpid="27347"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:DefaultBullet"/> - <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering"/> <toolbar:toolbaritem xlink:href=".uno:IncrementIndent"/> <toolbar:toolbaritem xlink:href=".uno:DecrementIndent"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ParaspaceIncrease" toolbar:helpid="27346"/> - <toolbar:toolbaritem xlink:href=".uno:ParaspaceDecrease" toolbar:helpid="27347"/> - <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:CellVertTop" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:visible="false"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:visible="false"/> |