summaryrefslogtreecommitdiff
path: root/sd/uiconfig
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-11-20 11:41:34 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-11-20 11:42:50 +0100
commit4a27c2c7782de0aec0da9e74218c2a3d629edca5 (patch)
tree212bac6ff59dcace94b9d0a0c8e405ce55072df7 /sd/uiconfig
parentc79b7fd8d4e6e029cf8e6bfb2c7e10b52a4d5781 (diff)
Remove last redundant toolbar:style properties
Change-Id: I42fa834464fd4cd7f0c1f11e310c1145fb1f071b
Diffstat (limited to 'sd/uiconfig')
-rw-r--r--sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml5
-rw-r--r--sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml10
-rw-r--r--sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml6
-rw-r--r--sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml3
-rw-r--r--sd/uiconfig/sdraw/toolbar/standardbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/tableobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/commontaskbar.xml4
-rw-r--r--sd/uiconfig/simpress/toolbar/drawingobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml10
-rw-r--r--sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml6
-rw-r--r--sd/uiconfig/simpress/toolbar/insertbar.xml32
-rw-r--r--sd/uiconfig/simpress/toolbar/standardbar.xml4
-rw-r--r--sd/uiconfig/simpress/toolbar/tableobjectbar.xml2
13 files changed, 45 insertions, 43 deletions
diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
index 3f6495b2b795..1f4025c5d76c 100644
--- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
@@ -25,7 +25,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="10169"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown" toolbar:helpid="10172"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
@@ -35,10 +35,11 @@
<toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="10299"/>
<toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false" toolbar:helpid="10371"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:AdvancedMode"/>
<toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectPosition"/>
<toolbar:toolbaritem xlink:href=".uno:DistributeSelection"/>
</toolbar:toolbar>
+
diff --git a/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml b/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml
index 5f3d07abcc48..b495a8cb3a04 100644
--- a/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml
@@ -25,9 +25,9 @@
<toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
<toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml b/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml
index 52ff5bc935d3..3080c585f558 100644
--- a/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml
@@ -20,11 +20,11 @@
<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:FontworkGalleryFloater"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml
index fb1e51d87f0d..d394cbd25cd6 100644
--- a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml
@@ -32,9 +32,10 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Crop"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:AdvancedMode"/>
<toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectPosition"/>
</toolbar:toolbar>
+
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index 2dc78647aea9..90e21d6431d3 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -59,7 +59,7 @@
<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"/>
+ <toolbar:toolbaritem xlink:href=".uno:AdvancedMode"/>
<toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
diff --git a/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml b/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml
index 8194f339cdcd..d99c527594bb 100644
--- a/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml
@@ -28,7 +28,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:MergeCells"/>
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:OptimizeTable"/>
<toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>
diff --git a/sd/uiconfig/simpress/toolbar/commontaskbar.xml b/sd/uiconfig/simpress/toolbar/commontaskbar.xml
index 1d4644263cd5..7f0db6629534 100644
--- a/sd/uiconfig/simpress/toolbar/commontaskbar.xml
+++ b/sd/uiconfig/simpress/toolbar/commontaskbar.xml
@@ -18,12 +18,12 @@
* 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:InsertPage" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertPage"/>
<toolbar:toolbaritem xlink:href=".uno:DuplicatePage" toolbar:helpid="27342"/>
<toolbar:toolbaritem xlink:href=".uno:RenamePage" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:DeletePage"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AssignLayout" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:AssignLayout"/>
<toolbar:toolbaritem xlink:href=".uno:PresentationLayout" toolbar:visible="false" toolbar:helpid="27064"/>
<toolbar:toolbaritem xlink:href=".uno:ExpandPage" toolbar:visible="false" toolbar:helpid="27343"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
index b443c8c2ee25..9e5d729e7332 100644
--- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
@@ -27,7 +27,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown" toolbar:helpid="10172"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
<toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml b/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml
index 5f3d07abcc48..b495a8cb3a04 100644
--- a/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml
@@ -25,9 +25,9 @@
<toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
<toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml b/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml
index aa8fc8e49b6a..48802236b131 100644
--- a/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml
@@ -20,11 +20,11 @@
<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:FontworkGalleryFloater"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" />
+ <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/insertbar.xml b/sd/uiconfig/simpress/toolbar/insertbar.xml
index 24607f318e6e..6513e9fb4770 100644
--- a/sd/uiconfig/simpress/toolbar/insertbar.xml
+++ b/sd/uiconfig/simpress/toolbar/insertbar.xml
@@ -18,20 +18,20 @@
* 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:InsertPage" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertPage"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertMath"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
-</toolbar:toolbar> \ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertMath"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false"/>
+</toolbar:toolbar>
+
diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml
index b281061e3a98..4ab079c67be9 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
@@ -19,7 +19,7 @@
-->
<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:OpenUrl" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Open"/>
<toolbar:toolbaritem xlink:href=".uno:OpenRemote" toolbar:visible="false"/>
@@ -41,7 +41,7 @@
<toolbar:toolbaritem xlink:href=".uno:Undo"/>
<toolbar:toolbaritem xlink:href=".uno:Redo"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DisplayMode" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:DisplayMode"/>
<toolbar:toolbaritem xlink:href=".uno:ToggleTabBarVisibility" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
diff --git a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
index 484ab5bc1ca2..15813d6c8f7d 100644
--- a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
@@ -28,7 +28,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:MergeCells"/>
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:OptimizeTable"/>
<toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
<toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>