[Libreoffice-commits] core.git: basctl/uiconfig chart2/uiconfig dbaccess/uiconfig reportdesign/uiconfig sc/uiconfig sd/uiconfig starmath/uiconfig sw/uiconfig

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Wed May 23 13:44:49 UTC 2018


 basctl/uiconfig/basicide/toolbar/dialogbar.xml                 |    2 +-
 basctl/uiconfig/basicide/toolbar/findbar.xml                   |    2 +-
 basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml           |    2 +-
 basctl/uiconfig/basicide/toolbar/fullscreenbar.xml             |    2 +-
 basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml         |    2 +-
 basctl/uiconfig/basicide/toolbar/macrobar.xml                  |    2 +-
 basctl/uiconfig/basicide/toolbar/standardbar.xml               |    2 +-
 basctl/uiconfig/basicide/toolbar/translationbar.xml            |    2 +-
 chart2/uiconfig/toolbar/arrowshapes.xml                        |    2 +-
 chart2/uiconfig/toolbar/basicshapes.xml                        |    2 +-
 chart2/uiconfig/toolbar/calloutshapes.xml                      |    2 +-
 chart2/uiconfig/toolbar/flowchartshapes.xml                    |    2 +-
 chart2/uiconfig/toolbar/standardbar.xml                        |    2 +-
 chart2/uiconfig/toolbar/starshapes.xml                         |    2 +-
 chart2/uiconfig/toolbar/symbolshapes.xml                       |    2 +-
 chart2/uiconfig/toolbar/toolbar.xml                            |    2 +-
 dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml              |    2 +-
 dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml             |    2 +-
 dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml            |    2 +-
 dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml             |    2 +-
 dbaccess/uiconfig/dbapp/toolbar/toolbar.xml                    |    2 +-
 dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml                |    2 +-
 dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml          |    2 +-
 dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml             |    2 +-
 dbaccess/uiconfig/dbquery/toolbar/toolbar.xml                  |    2 +-
 dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml               |    2 +-
 dbaccess/uiconfig/dbtable/toolbar/toolbar.xml                  |    2 +-
 dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml                  |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml        |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml         |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml         |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml       |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/drawbar.xml             |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml     |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml      |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/resizebar.xml           |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml    |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/starshapes.xml          |    2 +-
 reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml        |    2 +-
 sc/uiconfig/scalc/toolbar/alignmentbar.xml                     |    2 +-
 sc/uiconfig/scalc/toolbar/arrowsbar.xml                        |    2 +-
 sc/uiconfig/scalc/toolbar/arrowshapes.xml                      |    2 +-
 sc/uiconfig/scalc/toolbar/basicshapes.xml                      |    2 +-
 sc/uiconfig/scalc/toolbar/calloutshapes.xml                    |    2 +-
 sc/uiconfig/scalc/toolbar/classificationbar.xml                |    2 +-
 sc/uiconfig/scalc/toolbar/colorbar.xml                         |    2 +-
 sc/uiconfig/scalc/toolbar/dataprovider.xml                     |    2 +-
 sc/uiconfig/scalc/toolbar/datastreams.xml                      |    2 +-
 sc/uiconfig/scalc/toolbar/findbar.xml                          |    2 +-
 sc/uiconfig/scalc/toolbar/flowchartshapes.xml                  |    2 +-
 sc/uiconfig/scalc/toolbar/fontworkobjectbar.xml                |    2 +-
 sc/uiconfig/scalc/toolbar/fontworkshapetype.xml                |    2 +-
 sc/uiconfig/scalc/toolbar/formatobjectbar.xml                  |    2 +-
 sc/uiconfig/scalc/toolbar/formcontrols.xml                     |    2 +-
 sc/uiconfig/scalc/toolbar/formdesign.xml                       |    2 +-
 sc/uiconfig/scalc/toolbar/formsfilterbar.xml                   |    2 +-
 sc/uiconfig/scalc/toolbar/formtextobjectbar.xml                |    2 +-
 sc/uiconfig/scalc/toolbar/fullscreenbar.xml                    |    2 +-
 sc/uiconfig/scalc/toolbar/graffilterbar.xml                    |    2 +-
 sc/uiconfig/scalc/toolbar/graphicobjectbar.xml                 |    2 +-
 sc/uiconfig/scalc/toolbar/insertbar.xml                        |    2 +-
 sc/uiconfig/scalc/toolbar/insertcellsbar.xml                   |    2 +-
 sc/uiconfig/scalc/toolbar/linesbar.xml                         |    2 +-
 sc/uiconfig/scalc/toolbar/mediaobjectbar.xml                   |    2 +-
 sc/uiconfig/scalc/toolbar/moreformcontrols.xml                 |    2 +-
 sc/uiconfig/scalc/toolbar/previewbar.xml                       |    2 +-
 sc/uiconfig/scalc/toolbar/starshapes.xml                       |    2 +-
 sc/uiconfig/scalc/toolbar/symbolshapes.xml                     |    2 +-
 sc/uiconfig/scalc/toolbar/textobjectbar.xml                    |    2 +-
 sc/uiconfig/scalc/toolbar/toolbar.xml                          |    2 +-
 sc/uiconfig/scalc/toolbar/viewerbar.xml                        |    2 +-
 sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml                     |    2 +-
 sd/uiconfig/sdraw/toolbar/alignmentbar.xml                     |    2 +-
 sd/uiconfig/sdraw/toolbar/arrowsbar.xml                        |    2 +-
 sd/uiconfig/sdraw/toolbar/arrowshapes.xml                      |    2 +-
 sd/uiconfig/sdraw/toolbar/basicshapes.xml                      |    2 +-
 sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml                  |    2 +-
 sd/uiconfig/sdraw/toolbar/calloutshapes.xml                    |    2 +-
 sd/uiconfig/sdraw/toolbar/choosemodebar.xml                    |    2 +-
 sd/uiconfig/sdraw/toolbar/colorbar.xml                         |    2 +-
 sd/uiconfig/sdraw/toolbar/commentsbar.xml                      |    2 +-
 sd/uiconfig/sdraw/toolbar/ellipsesbar.xml                      |    2 +-
 sd/uiconfig/sdraw/toolbar/findbar.xml                          |    2 +-
 sd/uiconfig/sdraw/toolbar/flowchartshapes.xml                  |    2 +-
 sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml                |    2 +-
 sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml                |    2 +-
 sd/uiconfig/sdraw/toolbar/formcontrols.xml                     |    2 +-
 sd/uiconfig/sdraw/toolbar/formdesign.xml                       |    2 +-
 sd/uiconfig/sdraw/toolbar/formsfilterbar.xml                   |    2 +-
 sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml                |    2 +-
 sd/uiconfig/sdraw/toolbar/fullscreenbar.xml                    |    2 +-
 sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml              |    2 +-
 sd/uiconfig/sdraw/toolbar/graffilterbar.xml                    |    2 +-
 sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml                 |    2 +-
 sd/uiconfig/sdraw/toolbar/insertbar.xml                        |    2 +-
 sd/uiconfig/sdraw/toolbar/linesbar.xml                         |    2 +-
 sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml                |    2 +-
 sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml                   |    2 +-
 sd/uiconfig/sdraw/toolbar/moreformcontrols.xml                 |    2 +-
 sd/uiconfig/sdraw/toolbar/optimizetablebar.xml                 |    2 +-
 sd/uiconfig/sdraw/toolbar/optionsbar.xml                       |    2 +-
 sd/uiconfig/sdraw/toolbar/positionbar.xml                      |    2 +-
 sd/uiconfig/sdraw/toolbar/rectanglesbar.xml                    |    2 +-
 sd/uiconfig/sdraw/toolbar/starshapes.xml                       |    2 +-
 sd/uiconfig/sdraw/toolbar/symbolshapes.xml                     |    2 +-
 sd/uiconfig/sdraw/toolbar/tableobjectbar.xml                   |    2 +-
 sd/uiconfig/sdraw/toolbar/textbar.xml                          |    2 +-
 sd/uiconfig/sdraw/toolbar/toolbar.xml                          |    2 +-
 sd/uiconfig/sdraw/toolbar/viewerbar.xml                        |    2 +-
 sd/uiconfig/simpress/toolbar/3dobjectsbar.xml                  |    2 +-
 sd/uiconfig/simpress/toolbar/alignmentbar.xml                  |    2 +-
 sd/uiconfig/simpress/toolbar/arrowsbar.xml                     |    2 +-
 sd/uiconfig/simpress/toolbar/arrowshapes.xml                   |    2 +-
 sd/uiconfig/simpress/toolbar/basicshapes.xml                   |    2 +-
 sd/uiconfig/simpress/toolbar/bezierobjectbar.xml               |    2 +-
 sd/uiconfig/simpress/toolbar/calloutshapes.xml                 |    2 +-
 sd/uiconfig/simpress/toolbar/choosemodebar.xml                 |    2 +-
 sd/uiconfig/simpress/toolbar/classificationbar.xml             |    2 +-
 sd/uiconfig/simpress/toolbar/colorbar.xml                      |    2 +-
 sd/uiconfig/simpress/toolbar/commentsbar.xml                   |    2 +-
 sd/uiconfig/simpress/toolbar/ellipsesbar.xml                   |    2 +-
 sd/uiconfig/simpress/toolbar/findbar.xml                       |    2 +-
 sd/uiconfig/simpress/toolbar/flowchartshapes.xml               |    2 +-
 sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml             |    2 +-
 sd/uiconfig/simpress/toolbar/fontworkshapetype.xml             |    2 +-
 sd/uiconfig/simpress/toolbar/formcontrols.xml                  |    2 +-
 sd/uiconfig/simpress/toolbar/formdesign.xml                    |    2 +-
 sd/uiconfig/simpress/toolbar/formsfilterbar.xml                |    2 +-
 sd/uiconfig/simpress/toolbar/formtextobjectbar.xml             |    2 +-
 sd/uiconfig/simpress/toolbar/fullscreenbar.xml                 |    2 +-
 sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml           |    2 +-
 sd/uiconfig/simpress/toolbar/graffilterbar.xml                 |    2 +-
 sd/uiconfig/simpress/toolbar/graphicobjectbar.xml              |    2 +-
 sd/uiconfig/simpress/toolbar/insertbar.xml                     |    2 +-
 sd/uiconfig/simpress/toolbar/linesbar.xml                      |    2 +-
 sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml             |    2 +-
 sd/uiconfig/simpress/toolbar/mediaobjectbar.xml                |    2 +-
 sd/uiconfig/simpress/toolbar/moreformcontrols.xml              |    2 +-
 sd/uiconfig/simpress/toolbar/optimizetablebar.xml              |    2 +-
 sd/uiconfig/simpress/toolbar/outlinetoolbar.xml                |    2 +-
 sd/uiconfig/simpress/toolbar/positionbar.xml                   |    2 +-
 sd/uiconfig/simpress/toolbar/rectanglesbar.xml                 |    2 +-
 sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml            |    2 +-
 sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml              |    2 +-
 sd/uiconfig/simpress/toolbar/standardbar.xml                   |    2 +-
 sd/uiconfig/simpress/toolbar/starshapes.xml                    |    2 +-
 sd/uiconfig/simpress/toolbar/symbolshapes.xml                  |    2 +-
 sd/uiconfig/simpress/toolbar/tableobjectbar.xml                |    2 +-
 sd/uiconfig/simpress/toolbar/textbar.xml                       |    2 +-
 sd/uiconfig/simpress/toolbar/toolbar.xml                       |    2 +-
 sd/uiconfig/simpress/toolbar/viewerbar.xml                     |    2 +-
 starmath/uiconfig/smath/toolbar/fullscreenbar.xml              |    2 +-
 starmath/uiconfig/smath/toolbar/standardbar.xml                |    2 +-
 starmath/uiconfig/smath/toolbar/toolbar.xml                    |    2 +-
 sw/uiconfig/sglobal/toolbar/alignmentbar.xml                   |    2 +-
 sw/uiconfig/sglobal/toolbar/arrowshapes.xml                    |    2 +-
 sw/uiconfig/sglobal/toolbar/basicshapes.xml                    |    2 +-
 sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml                |    2 +-
 sw/uiconfig/sglobal/toolbar/calloutshapes.xml                  |    2 +-
 sw/uiconfig/sglobal/toolbar/colorbar.xml                       |    2 +-
 sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml               |    2 +-
 sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml              |    2 +-
 sw/uiconfig/sglobal/toolbar/findbar.xml                        |    2 +-
 sw/uiconfig/sglobal/toolbar/flowchartshapes.xml                |    2 +-
 sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml              |    2 +-
 sw/uiconfig/sglobal/toolbar/fontworkshapetype.xml              |    2 +-
 sw/uiconfig/sglobal/toolbar/formcontrols.xml                   |    2 +-
 sw/uiconfig/sglobal/toolbar/formdesign.xml                     |    2 +-
 sw/uiconfig/sglobal/toolbar/formsfilterbar.xml                 |    2 +-
 sw/uiconfig/sglobal/toolbar/formtextobjectbar.xml              |    2 +-
 sw/uiconfig/sglobal/toolbar/frameobjectbar.xml                 |    2 +-
 sw/uiconfig/sglobal/toolbar/fullscreenbar.xml                  |    2 +-
 sw/uiconfig/sglobal/toolbar/graffilterbar.xml                  |    2 +-
 sw/uiconfig/sglobal/toolbar/insertobjectbar.xml                |    2 +-
 sw/uiconfig/sglobal/toolbar/mediaobjectbar.xml                 |    2 +-
 sw/uiconfig/sglobal/toolbar/moreformcontrols.xml               |    2 +-
 sw/uiconfig/sglobal/toolbar/optimizetablebar.xml               |    2 +-
 sw/uiconfig/sglobal/toolbar/starshapes.xml                     |    2 +-
 sw/uiconfig/sglobal/toolbar/symbolshapes.xml                   |    2 +-
 sw/uiconfig/sglobal/toolbar/tableobjectbar.xml                 |    2 +-
 sw/uiconfig/sglobal/toolbar/textobjectbar.xml                  |    2 +-
 sw/uiconfig/sglobal/toolbar/textstylebar.xml                   |    2 +-
 sw/uiconfig/sglobal/toolbar/viewerbar.xml                      |    2 +-
 sw/uiconfig/sweb/toolbar/arrowshapes.xml                       |    2 +-
 sw/uiconfig/sweb/toolbar/basicshapes.xml                       |    2 +-
 sw/uiconfig/sweb/toolbar/bezierobjectbar.xml                   |    2 +-
 sw/uiconfig/sweb/toolbar/calloutshapes.xml                     |    2 +-
 sw/uiconfig/sweb/toolbar/colorbar.xml                          |    2 +-
 sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml                 |    2 +-
 sw/uiconfig/sweb/toolbar/findbar.xml                           |    2 +-
 sw/uiconfig/sweb/toolbar/flowchartshapes.xml                   |    2 +-
 sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml                 |    2 +-
 sw/uiconfig/sweb/toolbar/fontworkshapetype.xml                 |    2 +-
 sw/uiconfig/sweb/toolbar/formcontrols.xml                      |    2 +-
 sw/uiconfig/sweb/toolbar/formdesign.xml                        |    2 +-
 sw/uiconfig/sweb/toolbar/formsfilterbar.xml                    |    2 +-
 sw/uiconfig/sweb/toolbar/formtextobjectbar.xml                 |    2 +-
 sw/uiconfig/sweb/toolbar/frameobjectbar.xml                    |    2 +-
 sw/uiconfig/sweb/toolbar/fullscreenbar.xml                     |    2 +-
 sw/uiconfig/sweb/toolbar/graffilterbar.xml                     |    2 +-
 sw/uiconfig/sweb/toolbar/mediaobjectbar.xml                    |    2 +-
 sw/uiconfig/sweb/toolbar/optimizetablebar.xml                  |    2 +-
 sw/uiconfig/sweb/toolbar/starshapes.xml                        |    2 +-
 sw/uiconfig/sweb/toolbar/symbolshapes.xml                      |    2 +-
 sw/uiconfig/sweb/toolbar/tableobjectbar.xml                    |    2 +-
 sw/uiconfig/sweb/toolbar/viewerbar.xml                         |    2 +-
 sw/uiconfig/swform/toolbar/alignmentbar.xml                    |    2 +-
 sw/uiconfig/swform/toolbar/arrowshapes.xml                     |    2 +-
 sw/uiconfig/swform/toolbar/basicshapes.xml                     |    2 +-
 sw/uiconfig/swform/toolbar/bezierobjectbar.xml                 |    2 +-
 sw/uiconfig/swform/toolbar/calloutshapes.xml                   |    2 +-
 sw/uiconfig/swform/toolbar/colorbar.xml                        |    2 +-
 sw/uiconfig/swform/toolbar/drawingobjectbar.xml                |    2 +-
 sw/uiconfig/swform/toolbar/drawtextobjectbar.xml               |    2 +-
 sw/uiconfig/swform/toolbar/flowchartshapes.xml                 |    2 +-
 sw/uiconfig/swform/toolbar/fontworkobjectbar.xml               |    2 +-
 sw/uiconfig/swform/toolbar/fontworkshapetype.xml               |    2 +-
 sw/uiconfig/swform/toolbar/formcontrols.xml                    |    2 +-
 sw/uiconfig/swform/toolbar/formdesign.xml                      |    2 +-
 sw/uiconfig/swform/toolbar/formsfilterbar.xml                  |    2 +-
 sw/uiconfig/swform/toolbar/formtextobjectbar.xml               |    2 +-
 sw/uiconfig/swform/toolbar/frameobjectbar.xml                  |    2 +-
 sw/uiconfig/swform/toolbar/fullscreenbar.xml                   |    2 +-
 sw/uiconfig/swform/toolbar/graffilterbar.xml                   |    2 +-
 sw/uiconfig/swform/toolbar/insertobjectbar.xml                 |    2 +-
 sw/uiconfig/swform/toolbar/mailmerge.xml                       |    2 +-
 sw/uiconfig/swform/toolbar/mediaobjectbar.xml                  |    2 +-
 sw/uiconfig/swform/toolbar/moreformcontrols.xml                |    2 +-
 sw/uiconfig/swform/toolbar/optimizetablebar.xml                |    2 +-
 sw/uiconfig/swform/toolbar/starshapes.xml                      |    2 +-
 sw/uiconfig/swform/toolbar/symbolshapes.xml                    |    2 +-
 sw/uiconfig/swform/toolbar/tableobjectbar.xml                  |    2 +-
 sw/uiconfig/swform/toolbar/textobjectbar.xml                   |    2 +-
 sw/uiconfig/swform/toolbar/viewerbar.xml                       |    2 +-
 sw/uiconfig/swreport/toolbar/alignmentbar.xml                  |    2 +-
 sw/uiconfig/swreport/toolbar/arrowshapes.xml                   |    2 +-
 sw/uiconfig/swreport/toolbar/basicshapes.xml                   |    2 +-
 sw/uiconfig/swreport/toolbar/bezierobjectbar.xml               |    2 +-
 sw/uiconfig/swreport/toolbar/calloutshapes.xml                 |    2 +-
 sw/uiconfig/swreport/toolbar/colorbar.xml                      |    2 +-
 sw/uiconfig/swreport/toolbar/drawingobjectbar.xml              |    2 +-
 sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml             |    2 +-
 sw/uiconfig/swreport/toolbar/flowchartshapes.xml               |    2 +-
 sw/uiconfig/swreport/toolbar/fontworkobjectbar.xml             |    2 +-
 sw/uiconfig/swreport/toolbar/fontworkshapetype.xml             |    2 +-
 sw/uiconfig/swreport/toolbar/formcontrols.xml                  |    2 +-
 sw/uiconfig/swreport/toolbar/formdesign.xml                    |    2 +-
 sw/uiconfig/swreport/toolbar/formsfilterbar.xml                |    2 +-
 sw/uiconfig/swreport/toolbar/formtextobjectbar.xml             |    2 +-
 sw/uiconfig/swreport/toolbar/frameobjectbar.xml                |    2 +-
 sw/uiconfig/swreport/toolbar/fullscreenbar.xml                 |    2 +-
 sw/uiconfig/swreport/toolbar/graffilterbar.xml                 |    2 +-
 sw/uiconfig/swreport/toolbar/insertobjectbar.xml               |    2 +-
 sw/uiconfig/swreport/toolbar/mailmerge.xml                     |    2 +-
 sw/uiconfig/swreport/toolbar/mediaobjectbar.xml                |    2 +-
 sw/uiconfig/swreport/toolbar/moreformcontrols.xml              |    2 +-
 sw/uiconfig/swreport/toolbar/optimizetablebar.xml              |    2 +-
 sw/uiconfig/swreport/toolbar/starshapes.xml                    |    2 +-
 sw/uiconfig/swreport/toolbar/symbolshapes.xml                  |    2 +-
 sw/uiconfig/swreport/toolbar/tableobjectbar.xml                |    2 +-
 sw/uiconfig/swreport/toolbar/textobjectbar.xml                 |    2 +-
 sw/uiconfig/swreport/toolbar/viewerbar.xml                     |    2 +-
 sw/uiconfig/swriter/toolbar/alignmentbar.xml                   |    2 +-
 sw/uiconfig/swriter/toolbar/arrowsbar.xml                      |    2 +-
 sw/uiconfig/swriter/toolbar/arrowshapes.xml                    |    2 +-
 sw/uiconfig/swriter/toolbar/basicshapes.xml                    |    2 +-
 sw/uiconfig/swriter/toolbar/bezierobjectbar.xml                |    2 +-
 sw/uiconfig/swriter/toolbar/calloutshapes.xml                  |    2 +-
 sw/uiconfig/swriter/toolbar/classificationbar.xml              |    2 +-
 sw/uiconfig/swriter/toolbar/colorbar.xml                       |    2 +-
 sw/uiconfig/swriter/toolbar/drawingobjectbar.xml               |    2 +-
 sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml              |    2 +-
 sw/uiconfig/swriter/toolbar/findbar.xml                        |    2 +-
 sw/uiconfig/swriter/toolbar/flowchartshapes.xml                |    2 +-
 sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml              |    2 +-
 sw/uiconfig/swriter/toolbar/fontworkshapetype.xml              |    2 +-
 sw/uiconfig/swriter/toolbar/formcontrols.xml                   |    2 +-
 sw/uiconfig/swriter/toolbar/formdesign.xml                     |    2 +-
 sw/uiconfig/swriter/toolbar/formsfilterbar.xml                 |    2 +-
 sw/uiconfig/swriter/toolbar/formtextobjectbar.xml              |    2 +-
 sw/uiconfig/swriter/toolbar/frameobjectbar.xml                 |    2 +-
 sw/uiconfig/swriter/toolbar/fullscreenbar.xml                  |    2 +-
 sw/uiconfig/swriter/toolbar/graffilterbar.xml                  |    2 +-
 sw/uiconfig/swriter/toolbar/linesbar.xml                       |    2 +-
 sw/uiconfig/swriter/toolbar/mailmerge.xml                      |    2 +-
 sw/uiconfig/swriter/toolbar/mediaobjectbar.xml                 |    2 +-
 sw/uiconfig/swriter/toolbar/moreformcontrols.xml               |    2 +-
 sw/uiconfig/swriter/toolbar/navigationobjectbar.xml            |    2 +-
 sw/uiconfig/swriter/toolbar/optimizetablebar.xml               |    2 +-
 sw/uiconfig/swriter/toolbar/starshapes.xml                     |    2 +-
 sw/uiconfig/swriter/toolbar/symbolshapes.xml                   |    2 +-
 sw/uiconfig/swriter/toolbar/tableobjectbar.xml                 |    2 +-
 sw/uiconfig/swriter/toolbar/textobjectbar.xml                  |    2 +-
 sw/uiconfig/swriter/toolbar/textstylebar.xml                   |    2 +-
 sw/uiconfig/swriter/toolbar/viewerbar.xml                      |    2 +-
 sw/uiconfig/swxform/toolbar/alignmentbar.xml                   |    2 +-
 sw/uiconfig/swxform/toolbar/arrowshapes.xml                    |    2 +-
 sw/uiconfig/swxform/toolbar/basicshapes.xml                    |    2 +-
 sw/uiconfig/swxform/toolbar/bezierobjectbar.xml                |    2 +-
 sw/uiconfig/swxform/toolbar/calloutshapes.xml                  |    2 +-
 sw/uiconfig/swxform/toolbar/colorbar.xml                       |    2 +-
 sw/uiconfig/swxform/toolbar/drawingobjectbar.xml               |    2 +-
 sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml              |    2 +-
 sw/uiconfig/swxform/toolbar/findbar.xml                        |    2 +-
 sw/uiconfig/swxform/toolbar/flowchartshapes.xml                |    2 +-
 sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml              |    2 +-
 sw/uiconfig/swxform/toolbar/fontworkshapetype.xml              |    2 +-
 sw/uiconfig/swxform/toolbar/formcontrols.xml                   |    2 +-
 sw/uiconfig/swxform/toolbar/formdesign.xml                     |    2 +-
 sw/uiconfig/swxform/toolbar/formsfilterbar.xml                 |    2 +-
 sw/uiconfig/swxform/toolbar/formtextobjectbar.xml              |    2 +-
 sw/uiconfig/swxform/toolbar/frameobjectbar.xml                 |    2 +-
 sw/uiconfig/swxform/toolbar/fullscreenbar.xml                  |    2 +-
 sw/uiconfig/swxform/toolbar/graffilterbar.xml                  |    2 +-
 sw/uiconfig/swxform/toolbar/insertobjectbar.xml                |    2 +-
 sw/uiconfig/swxform/toolbar/mailmerge.xml                      |    2 +-
 sw/uiconfig/swxform/toolbar/mediaobjectbar.xml                 |    2 +-
 sw/uiconfig/swxform/toolbar/moreformcontrols.xml               |    2 +-
 sw/uiconfig/swxform/toolbar/optimizetablebar.xml               |    2 +-
 sw/uiconfig/swxform/toolbar/starshapes.xml                     |    2 +-
 sw/uiconfig/swxform/toolbar/symbolshapes.xml                   |    2 +-
 sw/uiconfig/swxform/toolbar/tableobjectbar.xml                 |    2 +-
 sw/uiconfig/swxform/toolbar/textobjectbar.xml                  |    2 +-
 sw/uiconfig/swxform/toolbar/viewerbar.xml                      |    2 +-
 325 files changed, 325 insertions(+), 325 deletions(-)

New commits:
commit dabca4c880d6c4aa60b09ddfee7958732e39bb19
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat May 19 21:59:07 2018 +0200

    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 at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/basctl/uiconfig/basicide/toolbar/dialogbar.xml b/basctl/uiconfig/basicide/toolbar/dialogbar.xml
index 1b6e6bdf21a0..fe15b8e38bfb 100644
--- a/basctl/uiconfig/basicide/toolbar/dialogbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/dialogbar.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:LibSelector"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ChooseControls"/>
diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml b/basctl/uiconfig/basicide/toolbar/findbar.xml
index 662f54e3f81e..35e61169626b 100644
--- a/basctl/uiconfig/basicide/toolbar/findbar.xml
+++ b/basctl/uiconfig/basicide/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/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml b/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
index 2e92277ed870..95e654969381 100644
--- a/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/formcontrolsbar.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:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:InsertFormRadio"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertFormCheck"/>
diff --git a/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml b/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml
index 564b52e835aa..bbb77f438629 100644
--- a/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml
@@ -17,6 +17,6 @@
  *   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:FullScreen"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml b/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml
index aec92a8868fa..9d3303f8be8d 100644
--- a/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.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:SelectMode"/>
  <toolbar:toolbaritem xlink:href=".uno:ManageLanguage"/>
  <toolbar:toolbarbreak/>
diff --git a/basctl/uiconfig/basicide/toolbar/macrobar.xml b/basctl/uiconfig/basicide/toolbar/macrobar.xml
index 5c3f374600a0..2959b2ad47a1 100644
--- a/basctl/uiconfig/basicide/toolbar/macrobar.xml
+++ b/basctl/uiconfig/basicide/toolbar/macrobar.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:LibSelector"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CompileBasic"/>
diff --git a/basctl/uiconfig/basicide/toolbar/standardbar.xml b/basctl/uiconfig/basicide/toolbar/standardbar.xml
index 3978aee0009c..41541aa91898 100644
--- a/basctl/uiconfig/basicide/toolbar/standardbar.xml
+++ b/basctl/uiconfig/basicide/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:Open"/>
diff --git a/basctl/uiconfig/basicide/toolbar/translationbar.xml b/basctl/uiconfig/basicide/toolbar/translationbar.xml
index dd37842994c3..99b5ed26fc33 100644
--- a/basctl/uiconfig/basicide/toolbar/translationbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/translationbar.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:CurrentLanguage"/>
  <toolbar:toolbaritem xlink:href=".uno:ManageLanguage"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/chart2/uiconfig/toolbar/arrowshapes.xml b/chart2/uiconfig/toolbar/arrowshapes.xml
index 442fb1095ab4..ac9d31ffd555 100644
--- a/chart2/uiconfig/toolbar/arrowshapes.xml
+++ b/chart2/uiconfig/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/chart2/uiconfig/toolbar/basicshapes.xml b/chart2/uiconfig/toolbar/basicshapes.xml
index 0d37be099cf9..4bd60977eb41 100644
--- a/chart2/uiconfig/toolbar/basicshapes.xml
+++ b/chart2/uiconfig/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/chart2/uiconfig/toolbar/calloutshapes.xml b/chart2/uiconfig/toolbar/calloutshapes.xml
index 6b9ee6cebd17..4769ebbb5161 100644
--- a/chart2/uiconfig/toolbar/calloutshapes.xml
+++ b/chart2/uiconfig/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/chart2/uiconfig/toolbar/flowchartshapes.xml b/chart2/uiconfig/toolbar/flowchartshapes.xml
index 11998f275b9e..5c114092b455 100644
--- a/chart2/uiconfig/toolbar/flowchartshapes.xml
+++ b/chart2/uiconfig/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/chart2/uiconfig/toolbar/standardbar.xml b/chart2/uiconfig/toolbar/standardbar.xml
index de52c53e4a1c..34674446ae51 100644
--- a/chart2/uiconfig/toolbar/standardbar.xml
+++ b/chart2/uiconfig/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:AddDirect" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:visible="false"/>
diff --git a/chart2/uiconfig/toolbar/starshapes.xml b/chart2/uiconfig/toolbar/starshapes.xml
index ba860b469145..00beaa104538 100644
--- a/chart2/uiconfig/toolbar/starshapes.xml
+++ b/chart2/uiconfig/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/chart2/uiconfig/toolbar/symbolshapes.xml b/chart2/uiconfig/toolbar/symbolshapes.xml
index deeeab639f3d..4e4716b39149 100644
--- a/chart2/uiconfig/toolbar/symbolshapes.xml
+++ b/chart2/uiconfig/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/chart2/uiconfig/toolbar/toolbar.xml b/chart2/uiconfig/toolbar/toolbar.xml
index faa72bccda13..809174ba206d 100644
--- a/chart2/uiconfig/toolbar/toolbar.xml
+++ b/chart2/uiconfig/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:ChartElementSelector"/>
  <toolbar:toolbaritem xlink:href=".uno:FormatSelection"/>
  <toolbar:toolbarseparator/>
diff --git a/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml b/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
index 79964527a866..6b6293fe805b 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
+++ b/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.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:DBFormOpen"/>
  <toolbar:toolbaritem xlink:href=".uno:DBFormEdit"/>
  <toolbar:toolbaritem xlink:href=".uno:DBFormDelete"/>
diff --git a/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml b/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml
index 4ce2ca09569c..d9730a16757d 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml
+++ b/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.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:DBQueryOpen"/>
  <toolbar:toolbaritem xlink:href=".uno:DBQueryEdit"/>
  <toolbar:toolbaritem xlink:href=".uno:DBQueryDelete"/>
diff --git a/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml b/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml
index ab8a3336085e..4e5b1e1c6c0c 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml
+++ b/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.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:DBReportOpen"/>
  <toolbar:toolbaritem xlink:href=".uno:DBReportEdit"/>
  <toolbar:toolbaritem xlink:href=".uno:DBReportDelete"/>
diff --git a/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml b/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml
index 4adc7f96e24d..be25101f4cf0 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml
+++ b/dbaccess/uiconfig/dbapp/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:DBTableOpen"/>
  <toolbar:toolbaritem xlink:href=".uno:DBTableEdit"/>
  <toolbar:toolbaritem xlink:href=".uno:DBTableDelete"/>
diff --git a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
index ef440f37a4a4..62c48f1c4a8f 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbapp/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:OpenUrl" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
  <toolbar:toolbaritem xlink:href=".uno:Open"/>
diff --git a/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml b/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml
index d8eecd1022da..3f73d9a5868b 100644
--- a/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbbrowser/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:RecSave"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc"/>
diff --git a/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml b/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
index 89dc52090efe..af8b850d4ae8 100644
--- a/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
+++ b/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.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:AddTable"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:DBViewFunctions"/>
diff --git a/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml b/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml
index a2edbceffe68..c6898fd265b8 100644
--- a/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml
+++ b/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml
@@ -17,6 +17,6 @@
  *   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:SbaNativeSql"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml b/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml
index 718b61ffe231..cca4f84b3854 100644
--- a/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbquery/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:Save"/>
  <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
diff --git a/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml b/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml
index 78790fcc7da1..eae58642f751 100644
--- a/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbrelation/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:Save"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
diff --git a/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml b/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml
index 059e7d4b2a65..ff19d07e0b2d 100644
--- a/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbtable/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:Save"/>
  <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
diff --git a/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml b/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml
index 9919ea7e96b9..56328695e1bf 100644
--- a/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbtdata/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:RecSave"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc"/>
diff --git a/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml b/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml
index 49466fc35a17..51b2df4cdb49 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml
+++ b/reportdesign/uiconfig/dbreport/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/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml
index 442fb1095ab4..ac9d31ffd555 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml
+++ b/reportdesign/uiconfig/dbreport/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/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml
index 0d37be099cf9..4bd60977eb41 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml
+++ b/reportdesign/uiconfig/dbreport/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/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml
index 6b9ee6cebd17..4769ebbb5161 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml
+++ b/reportdesign/uiconfig/dbreport/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/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml b/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml
index 1bb3d47878bf..af7afbe1e89c 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml
+++ b/reportdesign/uiconfig/dbreport/toolbar/drawbar.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"/>
  <toolbar:toolbaritem xlink:href=".uno:SymbolShapes"/>
  <toolbar:toolbaritem xlink:href=".uno:ArrowShapes"/>
diff --git a/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml
index 11998f275b9e..5c114092b455 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml
+++ b/reportdesign/uiconfig/dbreport/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/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml
index e8a0d69684a0..2d4f0c7bd711 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml
+++ b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.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/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml b/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml
index 886e7ff0df86..988455a8bbf5 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml
+++ b/reportdesign/uiconfig/dbreport/toolbar/resizebar.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:SmallestWidth"/>
  <toolbar:toolbaritem xlink:href=".uno:GreatestWidth"/>
  <toolbar:toolbarbreak/>
diff --git a/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml b/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml
index 6caba27aa39f..56b3cf6e5c3b 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml
+++ b/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.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:SectionAlignLeft"/>
  <toolbar:toolbaritem xlink:href=".uno:SectionAlignRight"/>
  <toolbar:toolbarbreak/>
diff --git a/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml b/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml
index de02e1b6ee28..ae90862fee4d 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml
+++ b/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.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:SectionShrink"/>
  <toolbar:toolbaritem xlink:href=".uno:SectionShrinkTop"/>
  <toolbar:toolbaritem xlink:href=".uno:SectionShrinkBottom"/>
diff --git a/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml
index ba860b469145..00beaa104538 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml
+++ b/reportdesign/uiconfig/dbreport/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/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml
index deeeab639f3d..4e4716b39149 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml
+++ b/reportdesign/uiconfig/dbreport/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/sc/uiconfig/scalc/toolbar/alignmentbar.xml b/sc/uiconfig/scalc/toolbar/alignmentbar.xml
index 03ed5d129ce1..38d0340a3d15 100644
--- a/sc/uiconfig/scalc/toolbar/alignmentbar.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/arrowsbar.xml b/sc/uiconfig/scalc/toolbar/arrowsbar.xml
index 40d7238daf82..4e947f2b36a6 100644
--- a/sc/uiconfig/scalc/toolbar/arrowsbar.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/arrowshapes.xml b/sc/uiconfig/scalc/toolbar/arrowshapes.xml
index b17a7e6a6eec..3f74148c7da9 100644
--- a/sc/uiconfig/scalc/toolbar/arrowshapes.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/basicshapes.xml b/sc/uiconfig/scalc/toolbar/basicshapes.xml
index f7e73cdad2fc..148245f66672 100644
--- a/sc/uiconfig/scalc/toolbar/basicshapes.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/calloutshapes.xml b/sc/uiconfig/scalc/toolbar/calloutshapes.xml
index e894bc1fa748..04176302ccd1 100644
--- a/sc/uiconfig/scalc/toolbar/calloutshapes.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/classificationbar.xml b/sc/uiconfig/scalc/toolbar/classificationbar.xml
index 3ee34071e040..eefe6501e0fe 100644
--- a/sc/uiconfig/scalc/toolbar/classificationbar.xml
+++ b/sc/uiconfig/scalc/toolbar/classificationbar.xml
@@ -7,6 +7,6 @@
  * 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:toolbar>
diff --git a/sc/uiconfig/scalc/toolbar/colorbar.xml b/sc/uiconfig/scalc/toolbar/colorbar.xml
index 6bd656484f5a..879b6a64763f 100644
--- a/sc/uiconfig/scalc/toolbar/colorbar.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/dataprovider.xml b/sc/uiconfig/scalc/toolbar/dataprovider.xml
index 3bf23017beb4..fbd284973ad9 100644
--- a/sc/uiconfig/scalc/toolbar/dataprovider.xml
+++ b/sc/uiconfig/scalc/toolbar/dataprovider.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:DataProviderPlay"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:DataProviderStop"/>
diff --git a/sc/uiconfig/scalc/toolbar/datastreams.xml b/sc/uiconfig/scalc/toolbar/datastreams.xml
index dd3a5e4a1e96..32ccaa9bf68c 100644
--- a/sc/uiconfig/scalc/toolbar/datastreams.xml
+++ b/sc/uiconfig/scalc/toolbar/datastreams.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:DataStreamsPlay"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:DataStreamsStop"/>
diff --git a/sc/uiconfig/scalc/toolbar/findbar.xml b/sc/uiconfig/scalc/toolbar/findbar.xml
index 0eac979e0afb..41660109687a 100644
--- a/sc/uiconfig/scalc/toolbar/findbar.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/flowchartshapes.xml b/sc/uiconfig/scalc/toolbar/flowchartshapes.xml
index 526b972d4dc1..c1f676895813 100644
--- a/sc/uiconfig/scalc/toolbar/flowchartshapes.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/fontworkobjectbar.xml b/sc/uiconfig/scalc/toolbar/fontworkobjectbar.xml
index fb2e82772407..948ff1e6f0ba 100644
--- a/sc/uiconfig/scalc/toolbar/fontworkobjectbar.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/fontworkshapetype.xml b/sc/uiconfig/scalc/toolbar/fontworkshapetype.xml
index e89556b125f7..46a83209bd39 100644
--- a/sc/uiconfig/scalc/toolbar/fontworkshapetype.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 2529c84dbd47..39edc3981fb7 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.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:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml b/sc/uiconfig/scalc/toolbar/formcontrols.xml
index 70b962a73894..4fb5eecc6950 100644
--- a/sc/uiconfig/scalc/toolbar/formcontrols.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/formdesign.xml b/sc/uiconfig/scalc/toolbar/formdesign.xml
index 5804f06448c4..551153b6a353 100644
--- a/sc/uiconfig/scalc/toolbar/formdesign.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/formsfilterbar.xml b/sc/uiconfig/scalc/toolbar/formsfilterbar.xml
index ce9fe790f347..c5e89318ff82 100644
--- a/sc/uiconfig/scalc/toolbar/formsfilterbar.xml
+++ b/sc/uiconfig/scalc/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:toolbaritem xlink:href=".uno:FormFilterExit"/>
diff --git a/sc/uiconfig/scalc/toolbar/formtextobjectbar.xml b/sc/uiconfig/scalc/toolbar/formtextobjectbar.xml
index 79d388b8984d..a055cba036b9 100644
--- a/sc/uiconfig/scalc/toolbar/formtextobjectbar.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/fullscreenbar.xml b/sc/uiconfig/scalc/toolbar/fullscreenbar.xml
index d7f7c1706f94..4b97912ac4ea 100644
--- a/sc/uiconfig/scalc/toolbar/fullscreenbar.xml
+++ b/sc/uiconfig/scalc/toolbar/fullscreenbar.xml
@@ -17,6 +17,6 @@
  *   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:FullScreen"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/sc/uiconfig/scalc/toolbar/graffilterbar.xml b/sc/uiconfig/scalc/toolbar/graffilterbar.xml
index 1456db6201da..f820a8112a00 100644
--- a/sc/uiconfig/scalc/toolbar/graffilterbar.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
index ddc508fad1a9..3c4556964b82 100644
--- a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/insertbar.xml b/sc/uiconfig/scalc/toolbar/insertbar.xml
index 98cb2b818955..9941a8e142e0 100644
--- a/sc/uiconfig/scalc/toolbar/insertbar.xml
+++ b/sc/uiconfig/scalc/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:InsertObjectFloatingFrame"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertSymbol"/>
diff --git a/sc/uiconfig/scalc/toolbar/insertcellsbar.xml b/sc/uiconfig/scalc/toolbar/insertcellsbar.xml
index f7e6866f1236..9266b7ce14d7 100644
--- a/sc/uiconfig/scalc/toolbar/insertcellsbar.xml
+++ b/sc/uiconfig/scalc/toolbar/insertcellsbar.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:InsertCellsDown"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertCellsRight"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertRowsBefore"/>
diff --git a/sc/uiconfig/scalc/toolbar/linesbar.xml b/sc/uiconfig/scalc/toolbar/linesbar.xml
index 212bb71a1be6..5e29f23a7099 100644
--- a/sc/uiconfig/scalc/toolbar/linesbar.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/mediaobjectbar.xml b/sc/uiconfig/scalc/toolbar/mediaobjectbar.xml
index fa7d68ba0951..6762534839e4 100644
--- a/sc/uiconfig/scalc/toolbar/mediaobjectbar.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/moreformcontrols.xml b/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
index 70bd84f6db41..8c0f42d623a2 100644
--- a/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
+++ b/sc/uiconfig/scalc/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:DateField"/>
  <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
  <toolbar:toolbarbreak/>
diff --git a/sc/uiconfig/scalc/toolbar/previewbar.xml b/sc/uiconfig/scalc/toolbar/previewbar.xml
index aa81f1b9eb04..70f4fa79f844 100644
--- a/sc/uiconfig/scalc/toolbar/previewbar.xml
+++ b/sc/uiconfig/scalc/toolbar/previewbar.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:PreviousPage"/>
  <toolbar:toolbaritem xlink:href=".uno:NextPage"/>
  <toolbar:toolbarseparator/>
diff --git a/sc/uiconfig/scalc/toolbar/starshapes.xml b/sc/uiconfig/scalc/toolbar/starshapes.xml
index cc9cfd6968ee..cbc07fc70aaa 100644
--- a/sc/uiconfig/scalc/toolbar/starshapes.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/symbolshapes.xml b/sc/uiconfig/scalc/toolbar/symbolshapes.xml
index b206982447f8..9ba9f22e0c06 100644
--- a/sc/uiconfig/scalc/toolbar/symbolshapes.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/textobjectbar.xml b/sc/uiconfig/scalc/toolbar/textobjectbar.xml
index d84a5e4f1914..76a26cd36dab 100644
--- a/sc/uiconfig/scalc/toolbar/textobjectbar.xml
+++ b/sc/uiconfig/scalc/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:CharFontName"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
diff --git a/sc/uiconfig/scalc/toolbar/toolbar.xml b/sc/uiconfig/scalc/toolbar/toolbar.xml
index 54653e634a74..d2d1708b28cc 100644
--- a/sc/uiconfig/scalc/toolbar/toolbar.xml
+++ b/sc/uiconfig/scalc/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:InsertCtrl"/>
  <toolbar:toolbaritem xlink:href=".uno:InsCellsCtrl"/>
  <toolbar:toolbaritem xlink:href=".uno:Config"/>
diff --git a/sc/uiconfig/scalc/toolbar/viewerbar.xml b/sc/uiconfig/scalc/toolbar/viewerbar.xml
index 154b84808ca7..4747cad792cd 100644
--- a/sc/uiconfig/scalc/toolbar/viewerbar.xml
+++ b/sc/uiconfig/scalc/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/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">

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list