uiconfig: remove obsolete helpid's and clean trailing whitespace.

Change-Id: Ic94ed52bbe0e5c612258fa56a970d61de0972eb3

uiconfig: remove obsolete helpid's and clean trailing whitespace.
Change-Id: Ic94ed52bbe0e5c612258fa56a970d61de0972eb3
88264523 · Michael Meeks · 0f7542a7 · 88264523 · 88264523 · 88264523
Kaydet (Commit) 88264523 authored Şub 03, 2014 tarafından Michael Meeks
26 changed files
--- a/basctl/uiconfig/basicide/toolbar/dialogbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/dialogbar.xml
@@ -18,9 +18,9 @@
 *   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:LibSelector" />
+ <toolbar:toolbaritem xlink:href=".uno:LibSelector"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ChooseControls" />
-  <toolbar:toolbaritem xlink:href=".uno:ImportDialog" />
-  <toolbar:toolbaritem xlink:href=".uno:ExportDialog" />
+ <toolbar:toolbaritem xlink:href=".uno:ChooseControls"/>
+  <toolbar:toolbaritem xlink:href=".uno:ImportDialog"/>
+  <toolbar:toolbaritem xlink:href=".uno:ExportDialog"/>
 </toolbar:toolbar>
\ No newline at end of file
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -107,10 +107,10 @@
    </menu:menu>
    <menu:menu menu:id=".uno:InsertMenu">
        <menu:menupopup>
-            <menu:menuitem menu:id=".uno:DBNewForm" menu:helpid="12305" menu:label="" />
-            <menu:menuitem menu:id=".uno:DBNewReport" menu:helpid="12316" menu:label="" />
-            <menu:menuitem menu:id=".uno:DBNewQuery" menu:helpid="38873" menu:label="" />
-            <menu:menuitem menu:id=".uno:DBNewQuerySql" menu:helpid="38841" menu:label="" />
+            <menu:menuitem menu:id=".uno:DBNewForm" menu:label=""/>
+            <menu:menuitem menu:id=".uno:DBNewReport" menu:label=""/>
+            <menu:menuitem menu:id=".uno:DBNewQuery" menu:label=""/>
+            <menu:menuitem menu:id=".uno:DBNewQuerySql" menu:label=""/>
            <menu:menuseparator/>
            <menu:menuitem menu:id=".uno:DBNewTable"/>
            <menu:menuitem menu:id=".uno:DBNewView"/>

--- a/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbquery/toolbar/toolbar.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:Save" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:text="" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:text="" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:text="" toolbar:style=""/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:text=""/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:text=""/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SbaExecuteSql" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBChangeDesignMode" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:SbaExecuteSql" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBChangeDesignMode" toolbar:text="" toolbar:style=""/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBClearQuery" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:DBClearQuery" toolbar:text=""/>
 </toolbar:toolbar>
\ No newline at end of file
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -183,13 +183,13 @@
                    <menu:menuseparator/>
                    <menu:menuitem menu:id=".uno:ControlProperties"/>
                    <menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:Label" />
-                    <menu:menuitem menu:id=".uno:Edit" />
-                    <menu:menuitem menu:id=".uno:ImageControl" />
+                    <menu:menuitem menu:id=".uno:Label"/>
+                    <menu:menuitem menu:id=".uno:Edit"/>
+                    <menu:menuitem menu:id=".uno:ImageControl"/>
                    <menu:menuitem menu:id=".uno:InsertObjectChart"  />
                    <menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:HFixedLine" />
-                    <menu:menuitem menu:id=".uno:VFixedLine" />
+                    <menu:menuitem menu:id=".uno:HFixedLine"/>
+                    <menu:menuitem menu:id=".uno:VFixedLine"/>
                </menu:menupopup>
            </menu:menu>

@@ -331,13 +331,13 @@

                    <menu:menu menu:id=".uno:CalloutShapesMenu" >
                        <menu:menupopup>
-                            <menu:menuitem menu:id=".uno:CalloutShapes.rectangular-callout" />
-                            <menu:menuitem menu:id=".uno:CalloutShapes.round-rectangular-callout" />
-                            <menu:menuitem menu:id=".uno:CalloutShapes.round-callout" />
-                            <menu:menuitem menu:id=".uno:CalloutShapes.cloud-callout" />
-                            <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-1" />
-                            <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-2" />
-                            <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-3" />
+                            <menu:menuitem menu:id=".uno:CalloutShapes.rectangular-callout"/>
+                            <menu:menuitem menu:id=".uno:CalloutShapes.round-rectangular-callout"/>
+                            <menu:menuitem menu:id=".uno:CalloutShapes.round-callout"/>
+                            <menu:menuitem menu:id=".uno:CalloutShapes.cloud-callout"/>
+                            <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-1"/>
+                            <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-2"/>
+                            <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-3"/>
                        </menu:menupopup>
                    </menu:menu>


--- a/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml
+++ b/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml
@@ -18,11 +18,11 @@
 *   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:CalloutShapes.rectangular-callout" />
- <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: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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout"/>
+ <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: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
--- a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml
+++ b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml
@@ -18,17 +18,17 @@
 *   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 auto" />
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:style="radio auto"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:style="radio auto" />
+ <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:style="radio auto"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:style="radio"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="radio auto" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false"/>

--- a/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml
+++ b/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml
@@ -18,22 +18,22 @@
 *   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:Save" />
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" />
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:text="" toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:text="" toolbar:style="dropdown"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" />
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ReportNavigator" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:DbSortingAndGrouping" />
- <toolbar:toolbaritem xlink:href=".uno:ExecuteReport" />
+ <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:ReportNavigator" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:DbSortingAndGrouping"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExecuteReport"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" />
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
 </toolbar:toolbar>
--- a/sc/uiconfig/scalc/toolbar/extrusionobjectbar.xml
+++ b/sc/uiconfig/scalc/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:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
+ <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="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file
--- 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:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
+ <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="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -21,7 +21,7 @@
 <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
 <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
 <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
 <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
 <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>

--- a/sd/uiconfig/simpress/toolbar/commontaskbar.xml
+++ b/sd/uiconfig/simpress/toolbar/commontaskbar.xml
@@ -18,8 +18,8 @@
 *   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:helpid="27014" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:AssignLayout" toolbar:helpid="27435" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertPage" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:AssignLayout" toolbar:style="dropdownonly"/>
 <toolbar:toolbaritem xlink:href=".uno:PresentationLayout" toolbar:helpid="27064"/>
 <toolbar:toolbaritem xlink:href=".uno:DuplicatePage" toolbar:visible="false" toolbar:helpid="27342"/>
 <toolbar:toolbaritem xlink:href=".uno:ExpandPage" toolbar:visible="false" toolbar:helpid="27343"/>

--- 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:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
+ <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="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
@@ -33,7 +33,7 @@
 <toolbar:toolbaritem xlink:href=".uno:Print"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:SpellDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021"  />
+ <toolbar:toolbaritem xlink:href=".uno:SpellOnline"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:Cut"/>
 <toolbar:toolbaritem xlink:href=".uno:Copy"/>
@@ -43,9 +43,9 @@
 <toolbar:toolbaritem xlink:href=".uno:Undo"/>
 <toolbar:toolbaritem xlink:href=".uno:Redo"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"  />
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
 <toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"  />
+ <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="auto"/>
 <toolbar:toolbarseparator/>

--- a/sw/uiconfig/sglobal/toolbar/extrusionobjectbar.xml
+++ b/sw/uiconfig/sglobal/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:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
+ <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="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file
--- a/sw/uiconfig/sglobal/toolbar/standardbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/standardbar.xml
@@ -21,7 +21,7 @@
 <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
 <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
 <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
 <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
 <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
@@ -48,12 +48,12 @@
 <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
 <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
 <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
 <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
 <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
 <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>

--- a/sw/uiconfig/sweb/toolbar/extrusionobjectbar.xml
+++ b/sw/uiconfig/sweb/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:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
+ <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="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file
--- a/sw/uiconfig/sweb/toolbar/standardbar.xml
+++ b/sw/uiconfig/sweb/toolbar/standardbar.xml
@@ -21,7 +21,7 @@
 <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
 <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
 <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
 <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
 <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
@@ -51,12 +51,12 @@
 <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
 <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:helpid="10593"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
 <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
 <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
 <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
 <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>

--- a/sw/uiconfig/swform/toolbar/extrusionobjectbar.xml
+++ b/sw/uiconfig/swform/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:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
+ <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="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file
--- a/sw/uiconfig/swform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swform/toolbar/standardbar.xml
@@ -21,7 +21,7 @@
 <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
 <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
 <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
 <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
 <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
@@ -48,12 +48,12 @@
 <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
 <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
 <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
 <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
 <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
 <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>

--- a/sw/uiconfig/swreport/toolbar/extrusionobjectbar.xml
+++ b/sw/uiconfig/swreport/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:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
+ <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="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file
--- a/sw/uiconfig/swreport/toolbar/standardbar.xml
+++ b/sw/uiconfig/swreport/toolbar/standardbar.xml
@@ -21,7 +21,7 @@
 <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
 <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
 <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
 <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
 <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
@@ -48,12 +48,12 @@
 <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
 <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
 <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
 <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
 <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
 <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>

--- a/sw/uiconfig/swriter/toolbar/extrusionobjectbar.xml
+++ b/sw/uiconfig/swriter/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:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
+ <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="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -21,7 +21,7 @@
 <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
 <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:OpenFromWriter" toolbar:helpid="5501" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:OpenFromWriter" toolbar:style="dropdown"/>
 <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
 <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
 <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
@@ -48,12 +48,12 @@
 <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
 <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
 <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
 <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
 <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
 <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>

--- a/sw/uiconfig/swxform/toolbar/extrusionobjectbar.xml
+++ b/sw/uiconfig/swxform/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:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
+ <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="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file
--- a/sw/uiconfig/swxform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swxform/toolbar/standardbar.xml
@@ -21,7 +21,7 @@
 <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
 <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
 <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
 <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
 <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
@@ -48,12 +48,12 @@
 <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
 <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
 <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
 <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
 <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
 <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>