summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2015-07-09 04:37:30 +0400
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-07-10 14:00:06 +0000
commitbf466946fd3d434aac4d2e9f284fa28b773358f2 (patch)
treed51e632d1a8c39b9d5c4cb14b4bc1e9ad012bf8a
parent9bcf4c4fb98536a72270094991ebfbf48048f638 (diff)
tdf#84909 Draw: Drawing toolbar exclusive to shapes
Change-Id: I0ac457840a1d9df6d075bdd4e8205c19c5055204 Reviewed-on: https://gerrit.libreoffice.org/16875 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit 240d6c9fb84be66500136e3a2fb8e1ff309d2a54) Reviewed-on: https://gerrit.libreoffice.org/16876 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 5be82d9765e5fc9bf072f588d02ffa4994ac0312) Reviewed-on: https://gerrit.libreoffice.org/16920 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--sd/uiconfig/sdraw/toolbar/standardbar.xml6
-rw-r--r--sd/uiconfig/sdraw/toolbar/toolbar.xml19
2 files changed, 14 insertions, 11 deletions
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index 5a6de30926da..5dcb170aaa94 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -49,10 +49,12 @@
<toolbar:toolbaritem xlink:href=".uno:GridVisible"/>
<toolbar:toolbaritem xlink:href=".uno:HelplinesMove"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
<toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:style="radio dropdown"/>
diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml
index ee1ef3d08388..79c1c7dbdeed 100644
--- a/sd/uiconfig/sdraw/toolbar/toolbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml
@@ -18,32 +18,33 @@
* 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:SelectObject" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomMode"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomObjects" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
<toolbar:toolbaritem xlink:href=".uno:FillColor"/>
<toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowsToolbox" toolbar:style="radio dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:style="radio" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:style="radio" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:LineToolbox" toolbar:style="radio dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorToolbox" toolbar:style="radio dropdown"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowsToolbox" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineToolbox" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorToolbox" toolbar:style="radio dropdown"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:style="radio dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:style="radio dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:style="radio dropdown"/>