sd/uiconfig/sdraw/toolbar/standardbar.xml | 6 ++++--
sd/uiconfig/sdraw/toolbar/toolbar.xml | 19 ++++++++++---------
2 files changed, 14 insertions(+), 11 deletions(-)
New commits:
commit 5be82d9765e5fc9bf072f588d02ffa4994ac0312
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Jul 9 04:37:30 2015 +0400
tdf#84909 Draw: Drawing toolbar exclusive to shapes
Change-Id: I0ac457840a1d9df6d075bdd4e8205c19c5055204
Reviewed-on: https://gerrit.libreoffice.org/16875
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 240d6c9fb84be66500136e3a2fb8e1ff309d2a54)
Reviewed-on: https://gerrit.libreoffice.org/16876
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml
b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index 5a6de30..5dcb170 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 ee1ef3d..79c1c7d 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"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
