summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-05-19 21:59:07 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-05-23 15:44:24 +0200
commitdabca4c880d6c4aa60b09ddfee7958732e39bb19 (patch)
tree0442a9b7130b48dc0ec9a78f95373283797205b5 /sw
parent8adebf346e24c6131fe33165d1530319c959c352 (diff)
toolbar:id is not valid attribute of toolbar:toolbar
according to framework/dtd/toolbar.dtd – and having the same ID everywhere also is kinda pointless.. Change-Id: Ia7768be2f951886e39e24d78fc6d69b4f3c84235 Reviewed-on: https://gerrit.libreoffice.org/54665 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/uiconfig/sglobal/toolbar/alignmentbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/arrowshapes.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/basicshapes.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/calloutshapes.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/colorbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/findbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/flowchartshapes.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/fontworkshapetype.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/formcontrols.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/formdesign.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/formsfilterbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/frameobjectbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/fullscreenbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/graffilterbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/insertobjectbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/mediaobjectbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/moreformcontrols.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/optimizetablebar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/starshapes.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/symbolshapes.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/tableobjectbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/textobjectbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/textstylebar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/viewerbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/arrowshapes.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/basicshapes.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/bezierobjectbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/calloutshapes.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/colorbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/findbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/flowchartshapes.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/fontworkshapetype.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/formcontrols.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/formdesign.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/formsfilterbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/formtextobjectbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/frameobjectbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/fullscreenbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/graffilterbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/mediaobjectbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/optimizetablebar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/starshapes.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/symbolshapes.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/tableobjectbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/viewerbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/alignmentbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/arrowshapes.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/basicshapes.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/bezierobjectbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/calloutshapes.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/colorbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/drawingobjectbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/drawtextobjectbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/flowchartshapes.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/fontworkobjectbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/fontworkshapetype.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/formcontrols.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/formdesign.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/formsfilterbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/formtextobjectbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/frameobjectbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/fullscreenbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/graffilterbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/insertobjectbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/mailmerge.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/mediaobjectbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/moreformcontrols.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/optimizetablebar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/starshapes.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/symbolshapes.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/tableobjectbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/textobjectbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/viewerbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/alignmentbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/arrowshapes.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/basicshapes.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/bezierobjectbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/calloutshapes.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/colorbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/drawingobjectbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/flowchartshapes.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/fontworkobjectbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/fontworkshapetype.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/formcontrols.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/formdesign.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/formsfilterbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/formtextobjectbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/frameobjectbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/fullscreenbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/graffilterbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/insertobjectbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/mailmerge.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/mediaobjectbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/moreformcontrols.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/optimizetablebar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/starshapes.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/symbolshapes.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/tableobjectbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/textobjectbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/viewerbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/alignmentbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/arrowsbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/arrowshapes.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/basicshapes.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/bezierobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/calloutshapes.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/classificationbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/colorbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/drawingobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/findbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/flowchartshapes.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/fontworkshapetype.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/formcontrols.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/formdesign.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/formsfilterbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/formtextobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/frameobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/fullscreenbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/graffilterbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/linesbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/mailmerge.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/mediaobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/moreformcontrols.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/navigationobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/optimizetablebar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/starshapes.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/symbolshapes.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/tableobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/textobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/textstylebar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/viewerbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/alignmentbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/arrowshapes.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/basicshapes.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/bezierobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/calloutshapes.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/colorbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/drawingobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/findbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/flowchartshapes.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/fontworkshapetype.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/formcontrols.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/formdesign.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/formsfilterbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/formtextobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/frameobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/fullscreenbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/graffilterbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/insertobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/mailmerge.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/mediaobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/moreformcontrols.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/optimizetablebar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/starshapes.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/symbolshapes.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/tableobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/textobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/viewerbar.xml2
170 files changed, 170 insertions, 170 deletions
diff --git a/sw/uiconfig/sglobal/toolbar/alignmentbar.xml b/sw/uiconfig/sglobal/toolbar/alignmentbar.xml
index 03ed5d129ce1..38d0340a3d15 100644
--- a/sw/uiconfig/sglobal/toolbar/alignmentbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/alignmentbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
<toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
diff --git a/sw/uiconfig/sglobal/toolbar/arrowshapes.xml b/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
index 69c7d3311f45..e2171beab7c8 100644
--- a/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
diff --git a/sw/uiconfig/sglobal/toolbar/basicshapes.xml b/sw/uiconfig/sglobal/toolbar/basicshapes.xml
index e0ff2140e960..5b7194408b0b 100644
--- a/sw/uiconfig/sglobal/toolbar/basicshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/basicshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
diff --git a/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml b/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
index 9596cf397415..b20e6e3643b8 100644
--- a/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierMove"/>
diff --git a/sw/uiconfig/sglobal/toolbar/calloutshapes.xml b/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
index 7bf475646a44..43872e2e3bd5 100644
--- a/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<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"/>
diff --git a/sw/uiconfig/sglobal/toolbar/colorbar.xml b/sw/uiconfig/sglobal/toolbar/colorbar.xml
index 6bd656484f5a..879b6a64763f 100644
--- a/sw/uiconfig/sglobal/toolbar/colorbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/colorbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GrafRed"/>
<toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:GrafGreen"/>
diff --git a/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml b/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
index 23309456e433..f39fb0164480 100644
--- a/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
diff --git a/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
index c16aed329996..835c6b9364a3 100644
--- a/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/sglobal/toolbar/findbar.xml b/sw/uiconfig/sglobal/toolbar/findbar.xml
index 990cc6a8e8ed..7c71a1ac2756 100644
--- a/sw/uiconfig/sglobal/toolbar/findbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/findbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ExitSearch"/>
<toolbar:toolbaritem xlink:href=".uno:FindText"/>
<toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
diff --git a/sw/uiconfig/sglobal/toolbar/flowchartshapes.xml b/sw/uiconfig/sglobal/toolbar/flowchartshapes.xml
index 526b972d4dc1..c1f676895813 100644
--- a/sw/uiconfig/sglobal/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/flowchartshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision"/>
diff --git a/sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml b/sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml
index fb2e82772407..948ff1e6f0ba 100644
--- a/sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType"/>
diff --git a/sw/uiconfig/sglobal/toolbar/fontworkshapetype.xml b/sw/uiconfig/sglobal/toolbar/fontworkshapetype.xml
index e89556b125f7..46a83209bd39 100644
--- a/sw/uiconfig/sglobal/toolbar/fontworkshapetype.xml
+++ b/sw/uiconfig/sglobal/toolbar/fontworkshapetype.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate"/>
diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
index f40d374ec59a..4c9387324255 100644
--- a/sw/uiconfig/sglobal/toolbar/formcontrols.xml
+++ b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/sglobal/toolbar/formdesign.xml b/sw/uiconfig/sglobal/toolbar/formdesign.xml
index 6ed098f0e34c..0af765ded677 100644
--- a/sw/uiconfig/sglobal/toolbar/formdesign.xml
+++ b/sw/uiconfig/sglobal/toolbar/formdesign.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
diff --git a/sw/uiconfig/sglobal/toolbar/formsfilterbar.xml b/sw/uiconfig/sglobal/toolbar/formsfilterbar.xml
index b19c522f02c7..c7c569501ba7 100644
--- a/sw/uiconfig/sglobal/toolbar/formsfilterbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/formsfilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FormFilterExecute"/>
<toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml b/sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml
index 79d388b8984d..a055cba036b9 100644
--- a/sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml
index 46a6e39fa1cc..7403ad15b88b 100644
--- a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
diff --git a/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml b/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml
index 913634068d71..4162e396e5f2 100644
--- a/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sglobal/toolbar/graffilterbar.xml b/sw/uiconfig/sglobal/toolbar/graffilterbar.xml
index 1456db6201da..f820a8112a00 100644
--- a/sw/uiconfig/sglobal/toolbar/graffilterbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/graffilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterInvert"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen"/>
diff --git a/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml b/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml
index 7d821372f2e2..966fe03ee96f 100644
--- a/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sglobal/toolbar/mediaobjectbar.xml b/sw/uiconfig/sglobal/toolbar/mediaobjectbar.xml
index fa7d68ba0951..6762534839e4 100644
--- a/sw/uiconfig/sglobal/toolbar/mediaobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/mediaobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox"/>
diff --git a/sw/uiconfig/sglobal/toolbar/moreformcontrols.xml b/sw/uiconfig/sglobal/toolbar/moreformcontrols.xml
index bb170f6ed9bc..36fa7f5bfc9f 100644
--- a/sw/uiconfig/sglobal/toolbar/moreformcontrols.xml
+++ b/sw/uiconfig/sglobal/toolbar/moreformcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:TimeField"/>
<toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/sglobal/toolbar/optimizetablebar.xml b/sw/uiconfig/sglobal/toolbar/optimizetablebar.xml
index 575f7da214bf..21c5e2757bbe 100644
--- a/sw/uiconfig/sglobal/toolbar/optimizetablebar.xml
+++ b/sw/uiconfig/sglobal/toolbar/optimizetablebar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DistributeColumns"/>
<toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
<toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight"/>
diff --git a/sw/uiconfig/sglobal/toolbar/starshapes.xml b/sw/uiconfig/sglobal/toolbar/starshapes.xml
index 7168e3c0576a..95e333c23e10 100644
--- a/sw/uiconfig/sglobal/toolbar/starshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/starshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star4"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star5"/>
diff --git a/sw/uiconfig/sglobal/toolbar/symbolshapes.xml b/sw/uiconfig/sglobal/toolbar/symbolshapes.xml
index 1d4afe7927f1..d1a790def94e 100644
--- a/sw/uiconfig/sglobal/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/symbolshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.smiley"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon"/>
diff --git a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
index 5bf2c48b3fa0..ff7aceb27a4a 100644
--- a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sglobal/toolbar/textobjectbar.xml b/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
index 0b7f76b3b825..db0125357778 100644
--- a/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
diff --git a/sw/uiconfig/sglobal/toolbar/textstylebar.xml b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
index 7aa997f75984..07d63cb1ae26 100644
--- a/sw/uiconfig/sglobal/toolbar/textstylebar.xml
+++ b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DesignerDialog"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
diff --git a/sw/uiconfig/sglobal/toolbar/viewerbar.xml b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
index 369a7023efe6..d1a0b59d662b 100644
--- a/sw/uiconfig/sglobal/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
diff --git a/sw/uiconfig/sweb/toolbar/arrowshapes.xml b/sw/uiconfig/sweb/toolbar/arrowshapes.xml
index 69c7d3311f45..e2171beab7c8 100644
--- a/sw/uiconfig/sweb/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/sweb/toolbar/arrowshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
diff --git a/sw/uiconfig/sweb/toolbar/basicshapes.xml b/sw/uiconfig/sweb/toolbar/basicshapes.xml
index e0ff2140e960..5b7194408b0b 100644
--- a/sw/uiconfig/sweb/toolbar/basicshapes.xml
+++ b/sw/uiconfig/sweb/toolbar/basicshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
diff --git a/sw/uiconfig/sweb/toolbar/bezierobjectbar.xml b/sw/uiconfig/sweb/toolbar/bezierobjectbar.xml
index 9596cf397415..b20e6e3643b8 100644
--- a/sw/uiconfig/sweb/toolbar/bezierobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/bezierobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierMove"/>
diff --git a/sw/uiconfig/sweb/toolbar/calloutshapes.xml b/sw/uiconfig/sweb/toolbar/calloutshapes.xml
index 7bf475646a44..43872e2e3bd5 100644
--- a/sw/uiconfig/sweb/toolbar/calloutshapes.xml
+++ b/sw/uiconfig/sweb/toolbar/calloutshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<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"/>
diff --git a/sw/uiconfig/sweb/toolbar/colorbar.xml b/sw/uiconfig/sweb/toolbar/colorbar.xml
index f6421ab3e271..a605d476f12a 100644
--- a/sw/uiconfig/sweb/toolbar/colorbar.xml
+++ b/sw/uiconfig/sweb/toolbar/colorbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GrafRed"/>
<toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:GrafGreen"/>
diff --git a/sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml b/sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml
index c16aed329996..835c6b9364a3 100644
--- a/sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/sweb/toolbar/findbar.xml b/sw/uiconfig/sweb/toolbar/findbar.xml
index 990cc6a8e8ed..7c71a1ac2756 100644
--- a/sw/uiconfig/sweb/toolbar/findbar.xml
+++ b/sw/uiconfig/sweb/toolbar/findbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ExitSearch"/>
<toolbar:toolbaritem xlink:href=".uno:FindText"/>
<toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
diff --git a/sw/uiconfig/sweb/toolbar/flowchartshapes.xml b/sw/uiconfig/sweb/toolbar/flowchartshapes.xml
index 526b972d4dc1..c1f676895813 100644
--- a/sw/uiconfig/sweb/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/sweb/toolbar/flowchartshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision"/>
diff --git a/sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml b/sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml
index fb2e82772407..948ff1e6f0ba 100644
--- a/sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType"/>
diff --git a/sw/uiconfig/sweb/toolbar/fontworkshapetype.xml b/sw/uiconfig/sweb/toolbar/fontworkshapetype.xml
index e89556b125f7..46a83209bd39 100644
--- a/sw/uiconfig/sweb/toolbar/fontworkshapetype.xml
+++ b/sw/uiconfig/sweb/toolbar/fontworkshapetype.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate"/>
diff --git a/sw/uiconfig/sweb/toolbar/formcontrols.xml b/sw/uiconfig/sweb/toolbar/formcontrols.xml
index 9d9c7026e30e..6456f6a2103b 100644
--- a/sw/uiconfig/sweb/toolbar/formcontrols.xml
+++ b/sw/uiconfig/sweb/toolbar/formcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/sweb/toolbar/formdesign.xml b/sw/uiconfig/sweb/toolbar/formdesign.xml
index 6ed098f0e34c..0af765ded677 100644
--- a/sw/uiconfig/sweb/toolbar/formdesign.xml
+++ b/sw/uiconfig/sweb/toolbar/formdesign.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
diff --git a/sw/uiconfig/sweb/toolbar/formsfilterbar.xml b/sw/uiconfig/sweb/toolbar/formsfilterbar.xml
index b19c522f02c7..c7c569501ba7 100644
--- a/sw/uiconfig/sweb/toolbar/formsfilterbar.xml
+++ b/sw/uiconfig/sweb/toolbar/formsfilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FormFilterExecute"/>
<toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sweb/toolbar/formtextobjectbar.xml b/sw/uiconfig/sweb/toolbar/formtextobjectbar.xml
index 79d388b8984d..a055cba036b9 100644
--- a/sw/uiconfig/sweb/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/formtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/sweb/toolbar/frameobjectbar.xml b/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
index 3127de1317ba..a119d4a6bf5d 100644
--- a/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:WrapOff"/>
diff --git a/sw/uiconfig/sweb/toolbar/fullscreenbar.xml b/sw/uiconfig/sweb/toolbar/fullscreenbar.xml
index 913634068d71..4162e396e5f2 100644
--- a/sw/uiconfig/sweb/toolbar/fullscreenbar.xml
+++ b/sw/uiconfig/sweb/toolbar/fullscreenbar.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sweb/toolbar/graffilterbar.xml b/sw/uiconfig/sweb/toolbar/graffilterbar.xml
index 1456db6201da..f820a8112a00 100644
--- a/sw/uiconfig/sweb/toolbar/graffilterbar.xml
+++ b/sw/uiconfig/sweb/toolbar/graffilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterInvert"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen"/>
diff --git a/sw/uiconfig/sweb/toolbar/mediaobjectbar.xml b/sw/uiconfig/sweb/toolbar/mediaobjectbar.xml
index fa7d68ba0951..6762534839e4 100644
--- a/sw/uiconfig/sweb/toolbar/mediaobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/mediaobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox"/>
diff --git a/sw/uiconfig/sweb/toolbar/optimizetablebar.xml b/sw/uiconfig/sweb/toolbar/optimizetablebar.xml
index 575f7da214bf..21c5e2757bbe 100644
--- a/sw/uiconfig/sweb/toolbar/optimizetablebar.xml
+++ b/sw/uiconfig/sweb/toolbar/optimizetablebar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DistributeColumns"/>
<toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
<toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight"/>
diff --git a/sw/uiconfig/sweb/toolbar/starshapes.xml b/sw/uiconfig/sweb/toolbar/starshapes.xml
index 7168e3c0576a..95e333c23e10 100644
--- a/sw/uiconfig/sweb/toolbar/starshapes.xml
+++ b/sw/uiconfig/sweb/toolbar/starshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star4"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star5"/>
diff --git a/sw/uiconfig/sweb/toolbar/symbolshapes.xml b/sw/uiconfig/sweb/toolbar/symbolshapes.xml
index 1d4afe7927f1..d1a790def94e 100644
--- a/sw/uiconfig/sweb/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/sweb/toolbar/symbolshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.smiley"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon"/>
diff --git a/sw/uiconfig/sweb/toolbar/tableobjectbar.xml b/sw/uiconfig/sweb/toolbar/tableobjectbar.xml
index 5bf2c48b3fa0..ff7aceb27a4a 100644
--- a/sw/uiconfig/sweb/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/tableobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sweb/toolbar/viewerbar.xml b/sw/uiconfig/sweb/toolbar/viewerbar.xml
index 369a7023efe6..d1a0b59d662b 100644
--- a/sw/uiconfig/sweb/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sweb/toolbar/viewerbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swform/toolbar/alignmentbar.xml b/sw/uiconfig/swform/toolbar/alignmentbar.xml
index 03ed5d129ce1..38d0340a3d15 100644
--- a/sw/uiconfig/swform/toolbar/alignmentbar.xml
+++ b/sw/uiconfig/swform/toolbar/alignmentbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
<toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
diff --git a/sw/uiconfig/swform/toolbar/arrowshapes.xml b/sw/uiconfig/swform/toolbar/arrowshapes.xml
index 69c7d3311f45..e2171beab7c8 100644
--- a/sw/uiconfig/swform/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/swform/toolbar/arrowshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
diff --git a/sw/uiconfig/swform/toolbar/basicshapes.xml b/sw/uiconfig/swform/toolbar/basicshapes.xml
index e0ff2140e960..5b7194408b0b 100644
--- a/sw/uiconfig/swform/toolbar/basicshapes.xml
+++ b/sw/uiconfig/swform/toolbar/basicshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
diff --git a/sw/uiconfig/swform/toolbar/bezierobjectbar.xml b/sw/uiconfig/swform/toolbar/bezierobjectbar.xml
index 9596cf397415..b20e6e3643b8 100644
--- a/sw/uiconfig/swform/toolbar/bezierobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/bezierobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierMove"/>
diff --git a/sw/uiconfig/swform/toolbar/calloutshapes.xml b/sw/uiconfig/swform/toolbar/calloutshapes.xml
index 7bf475646a44..43872e2e3bd5 100644
--- a/sw/uiconfig/swform/toolbar/calloutshapes.xml
+++ b/sw/uiconfig/swform/toolbar/calloutshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<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"/>
diff --git a/sw/uiconfig/swform/toolbar/colorbar.xml b/sw/uiconfig/swform/toolbar/colorbar.xml
index 6bd656484f5a..879b6a64763f 100644
--- a/sw/uiconfig/swform/toolbar/colorbar.xml
+++ b/sw/uiconfig/swform/toolbar/colorbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GrafRed"/>
<toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:GrafGreen"/>
diff --git a/sw/uiconfig/swform/toolbar/drawingobjectbar.xml b/sw/uiconfig/swform/toolbar/drawingobjectbar.xml
index 7b5a3f8feb86..8cd2cc67c8f0 100644
--- a/sw/uiconfig/swform/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/drawingobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FormatLine"/>
<toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swform/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swform/toolbar/drawtextobjectbar.xml
index c16aed329996..835c6b9364a3 100644
--- a/sw/uiconfig/swform/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/drawtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/swform/toolbar/flowchartshapes.xml b/sw/uiconfig/swform/toolbar/flowchartshapes.xml
index 526b972d4dc1..c1f676895813 100644
--- a/sw/uiconfig/swform/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/swform/toolbar/flowchartshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision"/>
diff --git a/sw/uiconfig/swform/toolbar/fontworkobjectbar.xml b/sw/uiconfig/swform/toolbar/fontworkobjectbar.xml
index fb2e82772407..948ff1e6f0ba 100644
--- a/sw/uiconfig/swform/toolbar/fontworkobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/fontworkobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType"/>
diff --git a/sw/uiconfig/swform/toolbar/fontworkshapetype.xml b/sw/uiconfig/swform/toolbar/fontworkshapetype.xml
index e89556b125f7..46a83209bd39 100644
--- a/sw/uiconfig/swform/toolbar/fontworkshapetype.xml
+++ b/sw/uiconfig/swform/toolbar/fontworkshapetype.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate"/>
diff --git a/sw/uiconfig/swform/toolbar/formcontrols.xml b/sw/uiconfig/swform/toolbar/formcontrols.xml
index f40d374ec59a..4c9387324255 100644
--- a/sw/uiconfig/swform/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swform/toolbar/formcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/swform/toolbar/formdesign.xml b/sw/uiconfig/swform/toolbar/formdesign.xml
index 2e831322cc69..6f4325be1281 100644
--- a/sw/uiconfig/swform/toolbar/formdesign.xml
+++ b/sw/uiconfig/swform/toolbar/formdesign.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swform/toolbar/formsfilterbar.xml b/sw/uiconfig/swform/toolbar/formsfilterbar.xml
index b19c522f02c7..c7c569501ba7 100644
--- a/sw/uiconfig/swform/toolbar/formsfilterbar.xml
+++ b/sw/uiconfig/swform/toolbar/formsfilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FormFilterExecute"/>
<toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swform/toolbar/formtextobjectbar.xml b/sw/uiconfig/swform/toolbar/formtextobjectbar.xml
index 79d388b8984d..a055cba036b9 100644
--- a/sw/uiconfig/swform/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/formtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/swform/toolbar/frameobjectbar.xml b/sw/uiconfig/swform/toolbar/frameobjectbar.xml
index 3127de1317ba..a119d4a6bf5d 100644
--- a/sw/uiconfig/swform/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/frameobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:WrapOff"/>
diff --git a/sw/uiconfig/swform/toolbar/fullscreenbar.xml b/sw/uiconfig/swform/toolbar/fullscreenbar.xml
index 913634068d71..4162e396e5f2 100644
--- a/sw/uiconfig/swform/toolbar/fullscreenbar.xml
+++ b/sw/uiconfig/swform/toolbar/fullscreenbar.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swform/toolbar/graffilterbar.xml b/sw/uiconfig/swform/toolbar/graffilterbar.xml
index 1456db6201da..f820a8112a00 100644
--- a/sw/uiconfig/swform/toolbar/graffilterbar.xml
+++ b/sw/uiconfig/swform/toolbar/graffilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterInvert"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen"/>
diff --git a/sw/uiconfig/swform/toolbar/insertobjectbar.xml b/sw/uiconfig/swform/toolbar/insertobjectbar.xml
index 7d821372f2e2..966fe03ee96f 100644
--- a/sw/uiconfig/swform/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/insertobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swform/toolbar/mailmerge.xml b/sw/uiconfig/swform/toolbar/mailmerge.xml
index 8ae9c2f40b27..4119cb01a30b 100644
--- a/sw/uiconfig/swform/toolbar/mailmerge.xml
+++ b/sw/uiconfig/swform/toolbar/mailmerge.xml
@@ -8,7 +8,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:MailMergeWizard"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:MailMergeFirstEntry"/>
diff --git a/sw/uiconfig/swform/toolbar/mediaobjectbar.xml b/sw/uiconfig/swform/toolbar/mediaobjectbar.xml
index fa7d68ba0951..6762534839e4 100644
--- a/sw/uiconfig/swform/toolbar/mediaobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/mediaobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox"/>
diff --git a/sw/uiconfig/swform/toolbar/moreformcontrols.xml b/sw/uiconfig/swform/toolbar/moreformcontrols.xml
index e0e1fbba4085..a099956e3e83 100644
--- a/sw/uiconfig/swform/toolbar/moreformcontrols.xml
+++ b/sw/uiconfig/swform/toolbar/moreformcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:TimeField"/>
<toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/swform/toolbar/optimizetablebar.xml b/sw/uiconfig/swform/toolbar/optimizetablebar.xml
index 575f7da214bf..21c5e2757bbe 100644
--- a/sw/uiconfig/swform/toolbar/optimizetablebar.xml
+++ b/sw/uiconfig/swform/toolbar/optimizetablebar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DistributeColumns"/>
<toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
<toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight"/>
diff --git a/sw/uiconfig/swform/toolbar/starshapes.xml b/sw/uiconfig/swform/toolbar/starshapes.xml
index 7168e3c0576a..95e333c23e10 100644
--- a/sw/uiconfig/swform/toolbar/starshapes.xml
+++ b/sw/uiconfig/swform/toolbar/starshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star4"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star5"/>
diff --git a/sw/uiconfig/swform/toolbar/symbolshapes.xml b/sw/uiconfig/swform/toolbar/symbolshapes.xml
index 1d4afe7927f1..d1a790def94e 100644
--- a/sw/uiconfig/swform/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/swform/toolbar/symbolshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.smiley"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon"/>
diff --git a/sw/uiconfig/swform/toolbar/tableobjectbar.xml b/sw/uiconfig/swform/toolbar/tableobjectbar.xml
index 5bf2c48b3fa0..ff7aceb27a4a 100644
--- a/sw/uiconfig/swform/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/tableobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swform/toolbar/textobjectbar.xml b/sw/uiconfig/swform/toolbar/textobjectbar.xml
index 9a89cbc6dbe5..0ab6010431b8 100644
--- a/sw/uiconfig/swform/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/textobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
diff --git a/sw/uiconfig/swform/toolbar/viewerbar.xml b/sw/uiconfig/swform/toolbar/viewerbar.xml
index 369a7023efe6..d1a0b59d662b 100644
--- a/sw/uiconfig/swform/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swform/toolbar/viewerbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swreport/toolbar/alignmentbar.xml b/sw/uiconfig/swreport/toolbar/alignmentbar.xml
index 03ed5d129ce1..38d0340a3d15 100644
--- a/sw/uiconfig/swreport/toolbar/alignmentbar.xml
+++ b/sw/uiconfig/swreport/toolbar/alignmentbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
<toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
diff --git a/sw/uiconfig/swreport/toolbar/arrowshapes.xml b/sw/uiconfig/swreport/toolbar/arrowshapes.xml
index 69c7d3311f45..e2171beab7c8 100644
--- a/sw/uiconfig/swreport/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/swreport/toolbar/arrowshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
diff --git a/sw/uiconfig/swreport/toolbar/basicshapes.xml b/sw/uiconfig/swreport/toolbar/basicshapes.xml
index e0ff2140e960..5b7194408b0b 100644
--- a/sw/uiconfig/swreport/toolbar/basicshapes.xml
+++ b/sw/uiconfig/swreport/toolbar/basicshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
diff --git a/sw/uiconfig/swreport/toolbar/bezierobjectbar.xml b/sw/uiconfig/swreport/toolbar/bezierobjectbar.xml
index 9596cf397415..b20e6e3643b8 100644
--- a/sw/uiconfig/swreport/toolbar/bezierobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/bezierobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierMove"/>
diff --git a/sw/uiconfig/swreport/toolbar/calloutshapes.xml b/sw/uiconfig/swreport/toolbar/calloutshapes.xml
index 7bf475646a44..43872e2e3bd5 100644
--- a/sw/uiconfig/swreport/toolbar/calloutshapes.xml
+++ b/sw/uiconfig/swreport/toolbar/calloutshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<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"/>
diff --git a/sw/uiconfig/swreport/toolbar/colorbar.xml b/sw/uiconfig/swreport/toolbar/colorbar.xml
index 6bd656484f5a..879b6a64763f 100644
--- a/sw/uiconfig/swreport/toolbar/colorbar.xml
+++ b/sw/uiconfig/swreport/toolbar/colorbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GrafRed"/>
<toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:GrafGreen"/>
diff --git a/sw/uiconfig/swreport/toolbar/drawingobjectbar.xml b/sw/uiconfig/swreport/toolbar/drawingobjectbar.xml
index 7b5a3f8feb86..8cd2cc67c8f0 100644
--- a/sw/uiconfig/swreport/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/drawingobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FormatLine"/>
<toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml
index c16aed329996..835c6b9364a3 100644
--- a/sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/swreport/toolbar/flowchartshapes.xml b/sw/uiconfig/swreport/toolbar/flowchartshapes.xml
index 526b972d4dc1..c1f676895813 100644
--- a/sw/uiconfig/swreport/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/swreport/toolbar/flowchartshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision"/>
diff --git a/sw/uiconfig/swreport/toolbar/fontworkobjectbar.xml b/sw/uiconfig/swreport/toolbar/fontworkobjectbar.xml
index 23460719f673..e6fbd66b2760 100644
--- a/sw/uiconfig/swreport/toolbar/fontworkobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/fontworkobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType"/>
diff --git a/sw/uiconfig/swreport/toolbar/fontworkshapetype.xml b/sw/uiconfig/swreport/toolbar/fontworkshapetype.xml
index e89556b125f7..46a83209bd39 100644
--- a/sw/uiconfig/swreport/toolbar/fontworkshapetype.xml
+++ b/sw/uiconfig/swreport/toolbar/fontworkshapetype.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate"/>
diff --git a/sw/uiconfig/swreport/toolbar/formcontrols.xml b/sw/uiconfig/swreport/toolbar/formcontrols.xml
index f40d374ec59a..4c9387324255 100644
--- a/sw/uiconfig/swreport/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swreport/toolbar/formcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/swreport/toolbar/formdesign.xml b/sw/uiconfig/swreport/toolbar/formdesign.xml
index b00b25188be0..758a8a8603cb 100644
--- a/sw/uiconfig/swreport/toolbar/formdesign.xml
+++ b/sw/uiconfig/swreport/toolbar/formdesign.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swreport/toolbar/formsfilterbar.xml b/sw/uiconfig/swreport/toolbar/formsfilterbar.xml
index b19c522f02c7..c7c569501ba7 100644
--- a/sw/uiconfig/swreport/toolbar/formsfilterbar.xml
+++ b/sw/uiconfig/swreport/toolbar/formsfilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FormFilterExecute"/>
<toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swreport/toolbar/formtextobjectbar.xml b/sw/uiconfig/swreport/toolbar/formtextobjectbar.xml
index 79d388b8984d..a055cba036b9 100644
--- a/sw/uiconfig/swreport/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/formtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/swreport/toolbar/frameobjectbar.xml b/sw/uiconfig/swreport/toolbar/frameobjectbar.xml
index 3127de1317ba..a119d4a6bf5d 100644
--- a/sw/uiconfig/swreport/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/frameobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:WrapOff"/>
diff --git a/sw/uiconfig/swreport/toolbar/fullscreenbar.xml b/sw/uiconfig/swreport/toolbar/fullscreenbar.xml
index 913634068d71..4162e396e5f2 100644
--- a/sw/uiconfig/swreport/toolbar/fullscreenbar.xml
+++ b/sw/uiconfig/swreport/toolbar/fullscreenbar.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swreport/toolbar/graffilterbar.xml b/sw/uiconfig/swreport/toolbar/graffilterbar.xml
index 1456db6201da..f820a8112a00 100644
--- a/sw/uiconfig/swreport/toolbar/graffilterbar.xml
+++ b/sw/uiconfig/swreport/toolbar/graffilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterInvert"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen"/>
diff --git a/sw/uiconfig/swreport/toolbar/insertobjectbar.xml b/sw/uiconfig/swreport/toolbar/insertobjectbar.xml
index 7d821372f2e2..966fe03ee96f 100644
--- a/sw/uiconfig/swreport/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/insertobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swreport/toolbar/mailmerge.xml b/sw/uiconfig/swreport/toolbar/mailmerge.xml
index 8ae9c2f40b27..4119cb01a30b 100644
--- a/sw/uiconfig/swreport/toolbar/mailmerge.xml
+++ b/sw/uiconfig/swreport/toolbar/mailmerge.xml
@@ -8,7 +8,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:MailMergeWizard"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:MailMergeFirstEntry"/>
diff --git a/sw/uiconfig/swreport/toolbar/mediaobjectbar.xml b/sw/uiconfig/swreport/toolbar/mediaobjectbar.xml
index fa7d68ba0951..6762534839e4 100644
--- a/sw/uiconfig/swreport/toolbar/mediaobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/mediaobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox"/>
diff --git a/sw/uiconfig/swreport/toolbar/moreformcontrols.xml b/sw/uiconfig/swreport/toolbar/moreformcontrols.xml
index bb170f6ed9bc..36fa7f5bfc9f 100644
--- a/sw/uiconfig/swreport/toolbar/moreformcontrols.xml
+++ b/sw/uiconfig/swreport/toolbar/moreformcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:TimeField"/>
<toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/swreport/toolbar/optimizetablebar.xml b/sw/uiconfig/swreport/toolbar/optimizetablebar.xml
index 575f7da214bf..21c5e2757bbe 100644
--- a/sw/uiconfig/swreport/toolbar/optimizetablebar.xml
+++ b/sw/uiconfig/swreport/toolbar/optimizetablebar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DistributeColumns"/>
<toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
<toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight"/>
diff --git a/sw/uiconfig/swreport/toolbar/starshapes.xml b/sw/uiconfig/swreport/toolbar/starshapes.xml
index 7168e3c0576a..95e333c23e10 100644
--- a/sw/uiconfig/swreport/toolbar/starshapes.xml
+++ b/sw/uiconfig/swreport/toolbar/starshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star4"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star5"/>
diff --git a/sw/uiconfig/swreport/toolbar/symbolshapes.xml b/sw/uiconfig/swreport/toolbar/symbolshapes.xml
index 1d4afe7927f1..d1a790def94e 100644
--- a/sw/uiconfig/swreport/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/swreport/toolbar/symbolshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.smiley"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon"/>
diff --git a/sw/uiconfig/swreport/toolbar/tableobjectbar.xml b/sw/uiconfig/swreport/toolbar/tableobjectbar.xml
index 5bf2c48b3fa0..ff7aceb27a4a 100644
--- a/sw/uiconfig/swreport/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/tableobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swreport/toolbar/textobjectbar.xml b/sw/uiconfig/swreport/toolbar/textobjectbar.xml
index 9a89cbc6dbe5..0ab6010431b8 100644
--- a/sw/uiconfig/swreport/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/textobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
diff --git a/sw/uiconfig/swreport/toolbar/viewerbar.xml b/sw/uiconfig/swreport/toolbar/viewerbar.xml
index 369a7023efe6..d1a0b59d662b 100644
--- a/sw/uiconfig/swreport/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swreport/toolbar/viewerbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swriter/toolbar/alignmentbar.xml b/sw/uiconfig/swriter/toolbar/alignmentbar.xml
index 03ed5d129ce1..38d0340a3d15 100644
--- a/sw/uiconfig/swriter/toolbar/alignmentbar.xml
+++ b/sw/uiconfig/swriter/toolbar/alignmentbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
<toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
diff --git a/sw/uiconfig/swriter/toolbar/arrowsbar.xml b/sw/uiconfig/swriter/toolbar/arrowsbar.xml
index 40d7238daf82..4e947f2b36a6 100644
--- a/sw/uiconfig/swriter/toolbar/arrowsbar.xml
+++ b/sw/uiconfig/swriter/toolbar/arrowsbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:LineArrowEnd"/>
<toolbar:toolbaritem xlink:href=".uno:LineCircleArrow"/>
<toolbar:toolbaritem xlink:href=".uno:LineSquareArrow"/>
diff --git a/sw/uiconfig/swriter/toolbar/arrowshapes.xml b/sw/uiconfig/swriter/toolbar/arrowshapes.xml
index b17a7e6a6eec..3f74148c7da9 100644
--- a/sw/uiconfig/swriter/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/arrowshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow"/>
diff --git a/sw/uiconfig/swriter/toolbar/basicshapes.xml b/sw/uiconfig/swriter/toolbar/basicshapes.xml
index f7e73cdad2fc..148245f66672 100644
--- a/sw/uiconfig/swriter/toolbar/basicshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/basicshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
diff --git a/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml b/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml
index f533c3493ad0..c42f57ec6e93 100644
--- a/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierMove"/>
diff --git a/sw/uiconfig/swriter/toolbar/calloutshapes.xml b/sw/uiconfig/swriter/toolbar/calloutshapes.xml
index e894bc1fa748..04176302ccd1 100644
--- a/sw/uiconfig/swriter/toolbar/calloutshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/calloutshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<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"/>
diff --git a/sw/uiconfig/swriter/toolbar/classificationbar.xml b/sw/uiconfig/swriter/toolbar/classificationbar.xml
index b1ec27a87cf6..59478cf86f9e 100644
--- a/sw/uiconfig/swriter/toolbar/classificationbar.xml
+++ b/sw/uiconfig/swriter/toolbar/classificationbar.xml
@@ -7,7 +7,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ClassificationApply"/>
<toolbar:toolbaritem xlink:href=".uno:ClassificationDialog"/>
<toolbar:toolbaritem xlink:href=".uno:ParagraphClassificationDialog"/>
diff --git a/sw/uiconfig/swriter/toolbar/colorbar.xml b/sw/uiconfig/swriter/toolbar/colorbar.xml
index 6bd656484f5a..879b6a64763f 100644
--- a/sw/uiconfig/swriter/toolbar/colorbar.xml
+++ b/sw/uiconfig/swriter/toolbar/colorbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GrafRed"/>
<toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:GrafGreen"/>
diff --git a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
index e8eaf7f82c7a..ec235029eda6 100644
--- a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
diff --git a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
index 5899e3f132ff..018cd278ad5b 100644
--- a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/swriter/toolbar/findbar.xml b/sw/uiconfig/swriter/toolbar/findbar.xml
index 733055ba688e..15a29ac85162 100644
--- a/sw/uiconfig/swriter/toolbar/findbar.xml
+++ b/sw/uiconfig/swriter/toolbar/findbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ExitSearch"/>
<toolbar:toolbaritem xlink:href=".uno:FindText"/>
<toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
diff --git a/sw/uiconfig/swriter/toolbar/flowchartshapes.xml b/sw/uiconfig/swriter/toolbar/flowchartshapes.xml
index 526b972d4dc1..c1f676895813 100644
--- a/sw/uiconfig/swriter/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/flowchartshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision"/>
diff --git a/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml b/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml
index fb2e82772407..948ff1e6f0ba 100644
--- a/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType"/>
diff --git a/sw/uiconfig/swriter/toolbar/fontworkshapetype.xml b/sw/uiconfig/swriter/toolbar/fontworkshapetype.xml
index e89556b125f7..46a83209bd39 100644
--- a/sw/uiconfig/swriter/toolbar/fontworkshapetype.xml
+++ b/sw/uiconfig/swriter/toolbar/fontworkshapetype.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate"/>
diff --git a/sw/uiconfig/swriter/toolbar/formcontrols.xml b/sw/uiconfig/swriter/toolbar/formcontrols.xml
index f40d374ec59a..4c9387324255 100644
--- a/sw/uiconfig/swriter/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swriter/toolbar/formcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/swriter/toolbar/formdesign.xml b/sw/uiconfig/swriter/toolbar/formdesign.xml
index 2e831322cc69..6f4325be1281 100644
--- a/sw/uiconfig/swriter/toolbar/formdesign.xml
+++ b/sw/uiconfig/swriter/toolbar/formdesign.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swriter/toolbar/formsfilterbar.xml b/sw/uiconfig/swriter/toolbar/formsfilterbar.xml
index b19c522f02c7..c7c569501ba7 100644
--- a/sw/uiconfig/swriter/toolbar/formsfilterbar.xml
+++ b/sw/uiconfig/swriter/toolbar/formsfilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FormFilterExecute"/>
<toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml b/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml
index 79d388b8984d..a055cba036b9 100644
--- a/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
index 46a6e39fa1cc..7403ad15b88b 100644
--- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
diff --git a/sw/uiconfig/swriter/toolbar/fullscreenbar.xml b/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
index 913634068d71..4162e396e5f2 100644
--- a/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
+++ b/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swriter/toolbar/graffilterbar.xml b/sw/uiconfig/swriter/toolbar/graffilterbar.xml
index 1456db6201da..f820a8112a00 100644
--- a/sw/uiconfig/swriter/toolbar/graffilterbar.xml
+++ b/sw/uiconfig/swriter/toolbar/graffilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterInvert"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen"/>
diff --git a/sw/uiconfig/swriter/toolbar/linesbar.xml b/sw/uiconfig/swriter/toolbar/linesbar.xml
index 212bb71a1be6..5e29f23a7099 100644
--- a/sw/uiconfig/swriter/toolbar/linesbar.xml
+++ b/sw/uiconfig/swriter/toolbar/linesbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:BezierFill"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal"/>
diff --git a/sw/uiconfig/swriter/toolbar/mailmerge.xml b/sw/uiconfig/swriter/toolbar/mailmerge.xml
index 8ae9c2f40b27..4119cb01a30b 100644
--- a/sw/uiconfig/swriter/toolbar/mailmerge.xml
+++ b/sw/uiconfig/swriter/toolbar/mailmerge.xml
@@ -8,7 +8,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:MailMergeWizard"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:MailMergeFirstEntry"/>
diff --git a/sw/uiconfig/swriter/toolbar/mediaobjectbar.xml b/sw/uiconfig/swriter/toolbar/mediaobjectbar.xml
index fa7d68ba0951..6762534839e4 100644
--- a/sw/uiconfig/swriter/toolbar/mediaobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/mediaobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox"/>
diff --git a/sw/uiconfig/swriter/toolbar/moreformcontrols.xml b/sw/uiconfig/swriter/toolbar/moreformcontrols.xml
index bb170f6ed9bc..36fa7f5bfc9f 100644
--- a/sw/uiconfig/swriter/toolbar/moreformcontrols.xml
+++ b/sw/uiconfig/swriter/toolbar/moreformcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:TimeField"/>
<toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/swriter/toolbar/navigationobjectbar.xml b/sw/uiconfig/swriter/toolbar/navigationobjectbar.xml
index 6c42eaa470cf..04ed4f6ede87 100644
--- a/sw/uiconfig/swriter/toolbar/navigationobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/navigationobjectbar.xml
@@ -8,7 +8,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
-->
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:NavigateBack"/>
<toolbar:toolbaritem xlink:href=".uno:NavigateForward"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/optimizetablebar.xml b/sw/uiconfig/swriter/toolbar/optimizetablebar.xml
index 575f7da214bf..21c5e2757bbe 100644
--- a/sw/uiconfig/swriter/toolbar/optimizetablebar.xml
+++ b/sw/uiconfig/swriter/toolbar/optimizetablebar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DistributeColumns"/>
<toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
<toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight"/>
diff --git a/sw/uiconfig/swriter/toolbar/starshapes.xml b/sw/uiconfig/swriter/toolbar/starshapes.xml
index cc9cfd6968ee..cbc07fc70aaa 100644
--- a/sw/uiconfig/swriter/toolbar/starshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/starshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star4"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star5"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star6"/>
diff --git a/sw/uiconfig/swriter/toolbar/symbolshapes.xml b/sw/uiconfig/swriter/toolbar/symbolshapes.xml
index b206982447f8..9ba9f22e0c06 100644
--- a/sw/uiconfig/swriter/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/symbolshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.smiley"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun"/>
diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
index 51abbde7cb8d..75efbade4479 100644
--- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertRowsBefore"/>
<toolbar:toolbaritem xlink:href=".uno:InsertRowsAfter"/>
<toolbar:toolbaritem xlink:href=".uno:InsertColumnsBefore"/>
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 0b7f76b3b825..db0125357778 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 8b1706705b27..19cc6a8ca3de 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DesignerDialog"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
diff --git a/sw/uiconfig/swriter/toolbar/viewerbar.xml b/sw/uiconfig/swriter/toolbar/viewerbar.xml
index 98bbea29a426..85099a7b5f46 100644
--- a/sw/uiconfig/swriter/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swriter/toolbar/viewerbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swxform/toolbar/alignmentbar.xml b/sw/uiconfig/swxform/toolbar/alignmentbar.xml
index 03ed5d129ce1..38d0340a3d15 100644
--- a/sw/uiconfig/swxform/toolbar/alignmentbar.xml
+++ b/sw/uiconfig/swxform/toolbar/alignmentbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
<toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
diff --git a/sw/uiconfig/swxform/toolbar/arrowshapes.xml b/sw/uiconfig/swxform/toolbar/arrowshapes.xml
index 69c7d3311f45..e2171beab7c8 100644
--- a/sw/uiconfig/swxform/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/swxform/toolbar/arrowshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
diff --git a/sw/uiconfig/swxform/toolbar/basicshapes.xml b/sw/uiconfig/swxform/toolbar/basicshapes.xml
index e0ff2140e960..5b7194408b0b 100644
--- a/sw/uiconfig/swxform/toolbar/basicshapes.xml
+++ b/sw/uiconfig/swxform/toolbar/basicshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
diff --git a/sw/uiconfig/swxform/toolbar/bezierobjectbar.xml b/sw/uiconfig/swxform/toolbar/bezierobjectbar.xml
index 9596cf397415..b20e6e3643b8 100644
--- a/sw/uiconfig/swxform/toolbar/bezierobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/bezierobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierMove"/>
diff --git a/sw/uiconfig/swxform/toolbar/calloutshapes.xml b/sw/uiconfig/swxform/toolbar/calloutshapes.xml
index 7bf475646a44..43872e2e3bd5 100644
--- a/sw/uiconfig/swxform/toolbar/calloutshapes.xml
+++ b/sw/uiconfig/swxform/toolbar/calloutshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<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"/>
diff --git a/sw/uiconfig/swxform/toolbar/colorbar.xml b/sw/uiconfig/swxform/toolbar/colorbar.xml
index 6bd656484f5a..879b6a64763f 100644
--- a/sw/uiconfig/swxform/toolbar/colorbar.xml
+++ b/sw/uiconfig/swxform/toolbar/colorbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GrafRed"/>
<toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:GrafGreen"/>
diff --git a/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml b/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml
index 7b5a3f8feb86..8cd2cc67c8f0 100644
--- a/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FormatLine"/>
<toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml
index c16aed329996..835c6b9364a3 100644
--- a/sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/swxform/toolbar/findbar.xml b/sw/uiconfig/swxform/toolbar/findbar.xml
index 990cc6a8e8ed..7c71a1ac2756 100644
--- a/sw/uiconfig/swxform/toolbar/findbar.xml
+++ b/sw/uiconfig/swxform/toolbar/findbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:ExitSearch"/>
<toolbar:toolbaritem xlink:href=".uno:FindText"/>
<toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
diff --git a/sw/uiconfig/swxform/toolbar/flowchartshapes.xml b/sw/uiconfig/swxform/toolbar/flowchartshapes.xml
index 526b972d4dc1..c1f676895813 100644
--- a/sw/uiconfig/swxform/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/swxform/toolbar/flowchartshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision"/>
diff --git a/sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml b/sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml
index fb2e82772407..948ff1e6f0ba 100644
--- a/sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType"/>
diff --git a/sw/uiconfig/swxform/toolbar/fontworkshapetype.xml b/sw/uiconfig/swxform/toolbar/fontworkshapetype.xml
index e89556b125f7..46a83209bd39 100644
--- a/sw/uiconfig/swxform/toolbar/fontworkshapetype.xml
+++ b/sw/uiconfig/swxform/toolbar/fontworkshapetype.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave"/>
<toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate"/>
diff --git a/sw/uiconfig/swxform/toolbar/formcontrols.xml b/sw/uiconfig/swxform/toolbar/formcontrols.xml
index f40d374ec59a..4c9387324255 100644
--- a/sw/uiconfig/swxform/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swxform/toolbar/formcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/swxform/toolbar/formdesign.xml b/sw/uiconfig/swxform/toolbar/formdesign.xml
index 744dc8a83a1a..7a1efcd993ea 100644
--- a/sw/uiconfig/swxform/toolbar/formdesign.xml
+++ b/sw/uiconfig/swxform/toolbar/formdesign.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
<toolbar:toolbaritem xlink:href=".uno:SwitchXFormsDesignMode"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swxform/toolbar/formsfilterbar.xml b/sw/uiconfig/swxform/toolbar/formsfilterbar.xml
index b19c522f02c7..c7c569501ba7 100644
--- a/sw/uiconfig/swxform/toolbar/formsfilterbar.xml
+++ b/sw/uiconfig/swxform/toolbar/formsfilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FormFilterExecute"/>
<toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swxform/toolbar/formtextobjectbar.xml b/sw/uiconfig/swxform/toolbar/formtextobjectbar.xml
index 79d388b8984d..a055cba036b9 100644
--- a/sw/uiconfig/swxform/toolbar/formtextobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/formtextobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sw/uiconfig/swxform/toolbar/frameobjectbar.xml b/sw/uiconfig/swxform/toolbar/frameobjectbar.xml
index 3127de1317ba..a119d4a6bf5d 100644
--- a/sw/uiconfig/swxform/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/frameobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:WrapOff"/>
diff --git a/sw/uiconfig/swxform/toolbar/fullscreenbar.xml b/sw/uiconfig/swxform/toolbar/fullscreenbar.xml
index 913634068d71..4162e396e5f2 100644
--- a/sw/uiconfig/swxform/toolbar/fullscreenbar.xml
+++ b/sw/uiconfig/swxform/toolbar/fullscreenbar.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swxform/toolbar/graffilterbar.xml b/sw/uiconfig/swxform/toolbar/graffilterbar.xml
index 1456db6201da..f820a8112a00 100644
--- a/sw/uiconfig/swxform/toolbar/graffilterbar.xml
+++ b/sw/uiconfig/swxform/toolbar/graffilterbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterInvert"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth"/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen"/>
diff --git a/sw/uiconfig/swxform/toolbar/insertobjectbar.xml b/sw/uiconfig/swxform/toolbar/insertobjectbar.xml
index 7d821372f2e2..966fe03ee96f 100644
--- a/sw/uiconfig/swxform/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/insertobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swxform/toolbar/mailmerge.xml b/sw/uiconfig/swxform/toolbar/mailmerge.xml
index 8ae9c2f40b27..4119cb01a30b 100644
--- a/sw/uiconfig/swxform/toolbar/mailmerge.xml
+++ b/sw/uiconfig/swxform/toolbar/mailmerge.xml
@@ -8,7 +8,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
-<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:MailMergeWizard"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:MailMergeFirstEntry"/>
diff --git a/sw/uiconfig/swxform/toolbar/mediaobjectbar.xml b/sw/uiconfig/swxform/toolbar/mediaobjectbar.xml
index fa7d68ba0951..6762534839e4 100644
--- a/sw/uiconfig/swxform/toolbar/mediaobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/mediaobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox"/>
diff --git a/sw/uiconfig/swxform/toolbar/moreformcontrols.xml b/sw/uiconfig/swxform/toolbar/moreformcontrols.xml
index bb170f6ed9bc..36fa7f5bfc9f 100644
--- a/sw/uiconfig/swxform/toolbar/moreformcontrols.xml
+++ b/sw/uiconfig/swxform/toolbar/moreformcontrols.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:TimeField"/>
<toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
<toolbar:toolbarbreak/>
diff --git a/sw/uiconfig/swxform/toolbar/optimizetablebar.xml b/sw/uiconfig/swxform/toolbar/optimizetablebar.xml
index 575f7da214bf..21c5e2757bbe 100644
--- a/sw/uiconfig/swxform/toolbar/optimizetablebar.xml
+++ b/sw/uiconfig/swxform/toolbar/optimizetablebar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DistributeColumns"/>
<toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
<toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight"/>
diff --git a/sw/uiconfig/swxform/toolbar/starshapes.xml b/sw/uiconfig/swxform/toolbar/starshapes.xml
index 7168e3c0576a..95e333c23e10 100644
--- a/sw/uiconfig/swxform/toolbar/starshapes.xml
+++ b/sw/uiconfig/swxform/toolbar/starshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star4"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star5"/>
diff --git a/sw/uiconfig/swxform/toolbar/symbolshapes.xml b/sw/uiconfig/swxform/toolbar/symbolshapes.xml
index 1d4afe7927f1..d1a790def94e 100644
--- a/sw/uiconfig/swxform/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/swxform/toolbar/symbolshapes.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.smiley"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon"/>
diff --git a/sw/uiconfig/swxform/toolbar/tableobjectbar.xml b/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
index 5bf2c48b3fa0..ff7aceb27a4a 100644
--- a/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swxform/toolbar/textobjectbar.xml b/sw/uiconfig/swxform/toolbar/textobjectbar.xml
index 9a89cbc6dbe5..0ab6010431b8 100644
--- a/sw/uiconfig/swxform/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/textobjectbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
diff --git a/sw/uiconfig/swxform/toolbar/viewerbar.xml b/sw/uiconfig/swxform/toolbar/viewerbar.xml
index 369a7023efe6..d1a0b59d662b 100644
--- a/sw/uiconfig/swxform/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swxform/toolbar/viewerbar.xml
@@ -17,7 +17,7 @@
* except in compliance with the License. You may obtain a copy of
* 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:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>