summaryrefslogtreecommitdiff
path: root/sd
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 /sd
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 'sd')
-rw-r--r--sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/alignmentbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/arrowsbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/arrowshapes.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/basicshapes.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/calloutshapes.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/choosemodebar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/colorbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/commentsbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/ellipsesbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/findbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/flowchartshapes.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/formcontrols.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/formdesign.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/formsfilterbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/fullscreenbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/graffilterbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/insertbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/linesbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/moreformcontrols.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/optimizetablebar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/optionsbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/positionbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/rectanglesbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/starshapes.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/symbolshapes.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/tableobjectbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/textbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/toolbar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/viewerbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/3dobjectsbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/alignmentbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/arrowsbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/arrowshapes.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/basicshapes.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/bezierobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/calloutshapes.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/choosemodebar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/classificationbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/colorbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/commentsbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/ellipsesbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/findbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/flowchartshapes.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/fontworkshapetype.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/formcontrols.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/formdesign.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/formsfilterbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/formtextobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/fullscreenbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/graffilterbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/graphicobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/insertbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/linesbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/mediaobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/moreformcontrols.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/optimizetablebar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/outlinetoolbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/positionbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/rectanglesbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/standardbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/starshapes.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/symbolshapes.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/tableobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/textbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/toolbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/viewerbar.xml2
80 files changed, 80 insertions, 80 deletions
diff --git a/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml b/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml
index 05857756b9e4..bc0b6f81e7e1 100644
--- a/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/3dobjectsbar.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:Cube"/>
<toolbar:toolbaritem xlink:href=".uno:Sphere"/>
<toolbar:toolbaritem xlink:href=".uno:Cylinder"/>
diff --git a/sd/uiconfig/sdraw/toolbar/alignmentbar.xml b/sd/uiconfig/sdraw/toolbar/alignmentbar.xml
index 03ed5d129ce1..38d0340a3d15 100644
--- a/sd/uiconfig/sdraw/toolbar/alignmentbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/arrowsbar.xml b/sd/uiconfig/sdraw/toolbar/arrowsbar.xml
index ab20d53f5535..e0767e50fddc 100644
--- a/sd/uiconfig/sdraw/toolbar/arrowsbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/arrowshapes.xml b/sd/uiconfig/sdraw/toolbar/arrowshapes.xml
index 69c7d3311f45..e2171beab7c8 100644
--- a/sd/uiconfig/sdraw/toolbar/arrowshapes.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/basicshapes.xml b/sd/uiconfig/sdraw/toolbar/basicshapes.xml
index 17a56adbcbd1..8fced480a5a2 100644
--- a/sd/uiconfig/sdraw/toolbar/basicshapes.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml b/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml
index eb407c6c5e31..3d515667cae7 100644
--- a/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml
+++ b/sd/uiconfig/sdraw/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:BezierMove"/>
<toolbar:toolbaritem xlink:href=".uno:BezierInsert"/>
<toolbar:toolbaritem xlink:href=".uno:BezierDelete"/>
diff --git a/sd/uiconfig/sdraw/toolbar/calloutshapes.xml b/sd/uiconfig/sdraw/toolbar/calloutshapes.xml
index e894bc1fa748..04176302ccd1 100644
--- a/sd/uiconfig/sdraw/toolbar/calloutshapes.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/choosemodebar.xml b/sd/uiconfig/sdraw/toolbar/choosemodebar.xml
index 893ab7ccd98b..c8bda0762687 100644
--- a/sd/uiconfig/sdraw/toolbar/choosemodebar.xml
+++ b/sd/uiconfig/sdraw/toolbar/choosemodebar.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:ToggleObjectRotateMode"/>
<toolbar:toolbaritem xlink:href=".uno:Mirror"/>
<toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLathe"/>
diff --git a/sd/uiconfig/sdraw/toolbar/colorbar.xml b/sd/uiconfig/sdraw/toolbar/colorbar.xml
index 6bd656484f5a..879b6a64763f 100644
--- a/sd/uiconfig/sdraw/toolbar/colorbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/commentsbar.xml b/sd/uiconfig/sdraw/toolbar/commentsbar.xml
index f96bcd69aced..a2f6a6eac59c 100644
--- a/sd/uiconfig/sdraw/toolbar/commentsbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/commentsbar.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:InsertAnnotation"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PreviousAnnotation"/>
diff --git a/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml b/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml
index 45d284fb3fa3..35167b9c75d2 100644
--- a/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/ellipsesbar.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:Ellipse"/>
<toolbar:toolbaritem xlink:href=".uno:Circle"/>
<toolbar:toolbaritem xlink:href=".uno:Pie"/>
diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml b/sd/uiconfig/sdraw/toolbar/findbar.xml
index 990cc6a8e8ed..7c71a1ac2756 100644
--- a/sd/uiconfig/sdraw/toolbar/findbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml b/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml
index 526b972d4dc1..c1f676895813 100644
--- a/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml b/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml
index fb2e82772407..948ff1e6f0ba 100644
--- a/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml b/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml
index e89556b125f7..46a83209bd39 100644
--- a/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/formcontrols.xml b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
index f40d374ec59a..4c9387324255 100644
--- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/formdesign.xml b/sd/uiconfig/sdraw/toolbar/formdesign.xml
index 6005fd422fa9..b75fab75f376 100644
--- a/sd/uiconfig/sdraw/toolbar/formdesign.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml b/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml
index 95ec01e27e51..faae077f8888 100644
--- a/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml
+++ b/sd/uiconfig/sdraw/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:FormFilterNavigator"/>
<toolbar:toolbaritem xlink:href=".uno:FormFilterExecute"/>
<toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml b/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml
index 79d388b8984d..a055cba036b9 100644
--- a/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml b/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml
index 913634068d71..4162e396e5f2 100644
--- a/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml b/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml
index e05ec07c75c4..0183493e9b88 100644
--- a/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.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:GlueInsertPoint"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionLeft"/>
diff --git a/sd/uiconfig/sdraw/toolbar/graffilterbar.xml b/sd/uiconfig/sdraw/toolbar/graffilterbar.xml
index 1456db6201da..f820a8112a00 100644
--- a/sd/uiconfig/sdraw/toolbar/graffilterbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml
index d394cbd25cd6..06262907d3e1 100644
--- a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.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:GraphicFilterToolbox"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafMode"/>
diff --git a/sd/uiconfig/sdraw/toolbar/insertbar.xml b/sd/uiconfig/sdraw/toolbar/insertbar.xml
index 19ea9ce3d9b7..e3773a3a79af 100644
--- a/sd/uiconfig/sdraw/toolbar/insertbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/insertbar.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:InsertPage"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false"/>
diff --git a/sd/uiconfig/sdraw/toolbar/linesbar.xml b/sd/uiconfig/sdraw/toolbar/linesbar.xml
index e025a8d906c1..cdd4e030938d 100644
--- a/sd/uiconfig/sdraw/toolbar/linesbar.xml
+++ b/sd/uiconfig/sdraw/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:Freeline_Unfilled"/>
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled"/>
diff --git a/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml b/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml
index 79a0d2925291..79d269c0cc43 100644
--- a/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.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:InsertMasterPage"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteMasterPage"/>
<toolbar:toolbaritem xlink:href=".uno:RenameMasterPage"/>
diff --git a/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml b/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml
index fa7d68ba0951..6762534839e4 100644
--- a/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
index 14f2d133dc05..da114530b360 100644
--- a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
+++ b/sd/uiconfig/sdraw/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:NavigationBar"/>
<toolbar:toolbarbreak/>
diff --git a/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml b/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml
index 506466718388..b80ee906049a 100644
--- a/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml
+++ b/sd/uiconfig/sdraw/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:toolbar> \ No newline at end of file
diff --git a/sd/uiconfig/sdraw/toolbar/optionsbar.xml b/sd/uiconfig/sdraw/toolbar/optionsbar.xml
index af49d616ec42..b8be8a12f659 100644
--- a/sd/uiconfig/sdraw/toolbar/optionsbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/optionsbar.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:ClickChangeRotation"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GridVisible"/>
diff --git a/sd/uiconfig/sdraw/toolbar/positionbar.xml b/sd/uiconfig/sdraw/toolbar/positionbar.xml
index f348f7113814..5f91c67e8720 100644
--- a/sd/uiconfig/sdraw/toolbar/positionbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/positionbar.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:BringToFront"/>
<toolbar:toolbaritem xlink:href=".uno:Forward"/>
<toolbar:toolbaritem xlink:href=".uno:Backward"/>
diff --git a/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml b/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml
index 58ee3ae93139..2f03f49f1fd7 100644
--- a/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/rectanglesbar.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:Rect"/>
<toolbar:toolbaritem xlink:href=".uno:Square"/>
<toolbar:toolbaritem xlink:href=".uno:Rect_Rounded"/>
diff --git a/sd/uiconfig/sdraw/toolbar/starshapes.xml b/sd/uiconfig/sdraw/toolbar/starshapes.xml
index cc9cfd6968ee..cbc07fc70aaa 100644
--- a/sd/uiconfig/sdraw/toolbar/starshapes.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/symbolshapes.xml b/sd/uiconfig/sdraw/toolbar/symbolshapes.xml
index 1d4afe7927f1..d1a790def94e 100644
--- a/sd/uiconfig/sdraw/toolbar/symbolshapes.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml b/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml
index 29eef205e3f2..af2c3e6bcb45 100644
--- a/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml
+++ b/sd/uiconfig/sdraw/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:InsertTable"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
diff --git a/sd/uiconfig/sdraw/toolbar/textbar.xml b/sd/uiconfig/sdraw/toolbar/textbar.xml
index 25c904ae8fd1..8121a4eef4d2 100644
--- a/sd/uiconfig/sdraw/toolbar/textbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/textbar.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:Text"/>
<toolbar:toolbaritem xlink:href=".uno:TextFitToSizeTool"/>
<toolbar:toolbaritem xlink:href=".uno:DrawCaption"/>
diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml
index b4939ddcd6c7..c48f72223165 100644
--- a/sd/uiconfig/sdraw/toolbar/toolbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/toolbar.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:ZoomMode" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomObjects" toolbar:visible="false"/>
diff --git a/sd/uiconfig/sdraw/toolbar/viewerbar.xml b/sd/uiconfig/sdraw/toolbar/viewerbar.xml
index eeb4e8823ea9..4452a12e8dda 100644
--- a/sd/uiconfig/sdraw/toolbar/viewerbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/simpress/toolbar/3dobjectsbar.xml b/sd/uiconfig/simpress/toolbar/3dobjectsbar.xml
index 05857756b9e4..bc0b6f81e7e1 100644
--- a/sd/uiconfig/simpress/toolbar/3dobjectsbar.xml
+++ b/sd/uiconfig/simpress/toolbar/3dobjectsbar.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:Cube"/>
<toolbar:toolbaritem xlink:href=".uno:Sphere"/>
<toolbar:toolbaritem xlink:href=".uno:Cylinder"/>
diff --git a/sd/uiconfig/simpress/toolbar/alignmentbar.xml b/sd/uiconfig/simpress/toolbar/alignmentbar.xml
index 03ed5d129ce1..38d0340a3d15 100644
--- a/sd/uiconfig/simpress/toolbar/alignmentbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/arrowsbar.xml b/sd/uiconfig/simpress/toolbar/arrowsbar.xml
index c803aa44625b..1dc91fba096c 100644
--- a/sd/uiconfig/simpress/toolbar/arrowsbar.xml
+++ b/sd/uiconfig/simpress/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:Line"/>
<toolbar:toolbaritem xlink:href=".uno:LineArrowEnd"/>
<toolbar:toolbaritem xlink:href=".uno:LineArrowCircle"/>
diff --git a/sd/uiconfig/simpress/toolbar/arrowshapes.xml b/sd/uiconfig/simpress/toolbar/arrowshapes.xml
index 69c7d3311f45..e2171beab7c8 100644
--- a/sd/uiconfig/simpress/toolbar/arrowshapes.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/basicshapes.xml b/sd/uiconfig/simpress/toolbar/basicshapes.xml
index e0ff2140e960..5b7194408b0b 100644
--- a/sd/uiconfig/simpress/toolbar/basicshapes.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/bezierobjectbar.xml b/sd/uiconfig/simpress/toolbar/bezierobjectbar.xml
index 9596cf397415..b20e6e3643b8 100644
--- a/sd/uiconfig/simpress/toolbar/bezierobjectbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/calloutshapes.xml b/sd/uiconfig/simpress/toolbar/calloutshapes.xml
index 7bf475646a44..43872e2e3bd5 100644
--- a/sd/uiconfig/simpress/toolbar/calloutshapes.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/choosemodebar.xml b/sd/uiconfig/simpress/toolbar/choosemodebar.xml
index 893ab7ccd98b..c8bda0762687 100644
--- a/sd/uiconfig/simpress/toolbar/choosemodebar.xml
+++ b/sd/uiconfig/simpress/toolbar/choosemodebar.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:ToggleObjectRotateMode"/>
<toolbar:toolbaritem xlink:href=".uno:Mirror"/>
<toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLathe"/>
diff --git a/sd/uiconfig/simpress/toolbar/classificationbar.xml b/sd/uiconfig/simpress/toolbar/classificationbar.xml
index f176c094273a..e81fea06ea31 100644
--- a/sd/uiconfig/simpress/toolbar/classificationbar.xml
+++ b/sd/uiconfig/simpress/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:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/colorbar.xml b/sd/uiconfig/simpress/toolbar/colorbar.xml
index 6bd656484f5a..879b6a64763f 100644
--- a/sd/uiconfig/simpress/toolbar/colorbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/commentsbar.xml b/sd/uiconfig/simpress/toolbar/commentsbar.xml
index f96bcd69aced..a2f6a6eac59c 100644
--- a/sd/uiconfig/simpress/toolbar/commentsbar.xml
+++ b/sd/uiconfig/simpress/toolbar/commentsbar.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:InsertAnnotation"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PreviousAnnotation"/>
diff --git a/sd/uiconfig/simpress/toolbar/ellipsesbar.xml b/sd/uiconfig/simpress/toolbar/ellipsesbar.xml
index 45d284fb3fa3..35167b9c75d2 100644
--- a/sd/uiconfig/simpress/toolbar/ellipsesbar.xml
+++ b/sd/uiconfig/simpress/toolbar/ellipsesbar.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:Ellipse"/>
<toolbar:toolbaritem xlink:href=".uno:Circle"/>
<toolbar:toolbaritem xlink:href=".uno:Pie"/>
diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml b/sd/uiconfig/simpress/toolbar/findbar.xml
index 990cc6a8e8ed..7c71a1ac2756 100644
--- a/sd/uiconfig/simpress/toolbar/findbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/flowchartshapes.xml b/sd/uiconfig/simpress/toolbar/flowchartshapes.xml
index 526b972d4dc1..c1f676895813 100644
--- a/sd/uiconfig/simpress/toolbar/flowchartshapes.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml b/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml
index ee6a60b3c7ff..59ed0ecf7198 100644
--- a/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/fontworkshapetype.xml b/sd/uiconfig/simpress/toolbar/fontworkshapetype.xml
index e89556b125f7..46a83209bd39 100644
--- a/sd/uiconfig/simpress/toolbar/fontworkshapetype.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/formcontrols.xml b/sd/uiconfig/simpress/toolbar/formcontrols.xml
index f40d374ec59a..4c9387324255 100644
--- a/sd/uiconfig/simpress/toolbar/formcontrols.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/formdesign.xml b/sd/uiconfig/simpress/toolbar/formdesign.xml
index 6005fd422fa9..b75fab75f376 100644
--- a/sd/uiconfig/simpress/toolbar/formdesign.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/formsfilterbar.xml b/sd/uiconfig/simpress/toolbar/formsfilterbar.xml
index b19c522f02c7..c7c569501ba7 100644
--- a/sd/uiconfig/simpress/toolbar/formsfilterbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml b/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml
index 79d388b8984d..a055cba036b9 100644
--- a/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/fullscreenbar.xml b/sd/uiconfig/simpress/toolbar/fullscreenbar.xml
index 913634068d71..4162e396e5f2 100644
--- a/sd/uiconfig/simpress/toolbar/fullscreenbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml b/sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml
index e05ec07c75c4..0183493e9b88 100644
--- a/sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/gluepointsobjectbar.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:GlueInsertPoint"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionLeft"/>
diff --git a/sd/uiconfig/simpress/toolbar/graffilterbar.xml b/sd/uiconfig/simpress/toolbar/graffilterbar.xml
index 1456db6201da..f820a8112a00 100644
--- a/sd/uiconfig/simpress/toolbar/graffilterbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
index 8e6000c8b316..dec30dba8cae 100644
--- a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/graphicobjectbar.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:GraphicFilterToolbox"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafMode"/>
diff --git a/sd/uiconfig/simpress/toolbar/insertbar.xml b/sd/uiconfig/simpress/toolbar/insertbar.xml
index bb09b17e05e7..0917cae4377d 100644
--- a/sd/uiconfig/simpress/toolbar/insertbar.xml
+++ b/sd/uiconfig/simpress/toolbar/insertbar.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:InsertPage"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false"/>
diff --git a/sd/uiconfig/simpress/toolbar/linesbar.xml b/sd/uiconfig/simpress/toolbar/linesbar.xml
index c9c59dcb9922..542148678235 100644
--- a/sd/uiconfig/simpress/toolbar/linesbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml b/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml
index 56b4ffb5c6c2..ac5ee8f79635 100644
--- a/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml
+++ b/sd/uiconfig/simpress/toolbar/masterviewtoolbar.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:InsertMasterPage"/>
<toolbar:toolbaritem xlink:href=".uno:RenameMasterPage" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteMasterPage"/>
diff --git a/sd/uiconfig/simpress/toolbar/mediaobjectbar.xml b/sd/uiconfig/simpress/toolbar/mediaobjectbar.xml
index fa7d68ba0951..6762534839e4 100644
--- a/sd/uiconfig/simpress/toolbar/mediaobjectbar.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/moreformcontrols.xml b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
index 14f2d133dc05..da114530b360 100644
--- a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
+++ b/sd/uiconfig/simpress/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:NavigationBar"/>
<toolbar:toolbarbreak/>
diff --git a/sd/uiconfig/simpress/toolbar/optimizetablebar.xml b/sd/uiconfig/simpress/toolbar/optimizetablebar.xml
index 506466718388..b80ee906049a 100644
--- a/sd/uiconfig/simpress/toolbar/optimizetablebar.xml
+++ b/sd/uiconfig/simpress/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:toolbar> \ No newline at end of file
diff --git a/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml b/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml
index fd110a589947..20b43a2e3265 100644
--- a/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml
+++ b/sd/uiconfig/simpress/toolbar/outlinetoolbar.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:OutlineRight"/>
<toolbar:toolbaritem xlink:href=".uno:OutlineLeft"/>
<toolbar:toolbaritem xlink:href=".uno:OutlineDown"/>
diff --git a/sd/uiconfig/simpress/toolbar/positionbar.xml b/sd/uiconfig/simpress/toolbar/positionbar.xml
index f348f7113814..5f91c67e8720 100644
--- a/sd/uiconfig/simpress/toolbar/positionbar.xml
+++ b/sd/uiconfig/simpress/toolbar/positionbar.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:BringToFront"/>
<toolbar:toolbaritem xlink:href=".uno:Forward"/>
<toolbar:toolbaritem xlink:href=".uno:Backward"/>
diff --git a/sd/uiconfig/simpress/toolbar/rectanglesbar.xml b/sd/uiconfig/simpress/toolbar/rectanglesbar.xml
index 58ee3ae93139..2f03f49f1fd7 100644
--- a/sd/uiconfig/simpress/toolbar/rectanglesbar.xml
+++ b/sd/uiconfig/simpress/toolbar/rectanglesbar.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:Rect"/>
<toolbar:toolbaritem xlink:href=".uno:Square"/>
<toolbar:toolbaritem xlink:href=".uno:Rect_Rounded"/>
diff --git a/sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml b/sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml
index ac2d422997e0..15ef811a30cd 100644
--- a/sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/slideviewobjectbar.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:RehearseTimings"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ShowSlide"/>
diff --git a/sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml b/sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml
index 13e0144c3fe6..f620b7b04108 100644
--- a/sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml
+++ b/sd/uiconfig/simpress/toolbar/slideviewtoolbar.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:Presentation"/>
diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml
index 438cc320d8ed..9ed1baa8e94e 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.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:OpenUrl" toolbar:visible="false" />
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
diff --git a/sd/uiconfig/simpress/toolbar/starshapes.xml b/sd/uiconfig/simpress/toolbar/starshapes.xml
index 7168e3c0576a..95e333c23e10 100644
--- a/sd/uiconfig/simpress/toolbar/starshapes.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/symbolshapes.xml b/sd/uiconfig/simpress/toolbar/symbolshapes.xml
index 1d4afe7927f1..d1a790def94e 100644
--- a/sd/uiconfig/simpress/toolbar/symbolshapes.xml
+++ b/sd/uiconfig/simpress/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/sd/uiconfig/simpress/toolbar/tableobjectbar.xml b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
index d5c4be373330..e9676ad99635 100644
--- a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
+++ b/sd/uiconfig/simpress/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:InsertTable" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
diff --git a/sd/uiconfig/simpress/toolbar/textbar.xml b/sd/uiconfig/simpress/toolbar/textbar.xml
index 25c904ae8fd1..8121a4eef4d2 100644
--- a/sd/uiconfig/simpress/toolbar/textbar.xml
+++ b/sd/uiconfig/simpress/toolbar/textbar.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:Text"/>
<toolbar:toolbaritem xlink:href=".uno:TextFitToSizeTool"/>
<toolbar:toolbaritem xlink:href=".uno:DrawCaption"/>
diff --git a/sd/uiconfig/simpress/toolbar/toolbar.xml b/sd/uiconfig/simpress/toolbar/toolbar.xml
index 8d1de8d5b556..bc0958c5bf00 100644
--- a/sd/uiconfig/simpress/toolbar/toolbar.xml
+++ b/sd/uiconfig/simpress/toolbar/toolbar.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:ZoomMode"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:visible="false"/>
diff --git a/sd/uiconfig/simpress/toolbar/viewerbar.xml b/sd/uiconfig/simpress/toolbar/viewerbar.xml
index 67ab6c594d49..a29215f37d6a 100644
--- a/sd/uiconfig/simpress/toolbar/viewerbar.xml
+++ b/sd/uiconfig/simpress/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"/>