summaryrefslogtreecommitdiff
path: root/test/user-template/user/config/soffice.cfg/modules
diff options
context:
space:
mode:
Diffstat (limited to 'test/user-template/user/config/soffice.cfg/modules')
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/BasicIDE/menubar/menubar.xml91
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/BasicIDE/statusbar/statusbar.xml10
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/dialogbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/findbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/insertcontrolsbar.xml43
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/macrobar.xml22
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/standardbar.xml25
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/translationbar.xml6
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/StartModule/menubar/menubar.xml83
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/StartModule/statusbar/statusbar.xml4
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/StartModule/toolbar/standardbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbapp/menubar/menubar.xml143
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbapp/statusbar/statusbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/formobjectbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/queryobjectbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/reportobjectbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/tableobjectbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/toolbar.xml19
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbbrowser/menubar/compat.xml1
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbbrowser/toolbar/toolbar.xml33
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbquery/menubar/menubar.xml84
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/designobjectbar.xml10
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/sqlobjectbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/toolbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbrelation/menubar/menubar.xml67
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbrelation/toolbar/toolbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/menubar/menubar.xml422
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/statusbar/statusbar.xml6
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/Formatting.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/alignmentbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/drawbar.xml10
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/reportcontrols.xml19
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/resizebar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/sectionalignmentbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/sectionshrinkbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/toolbar.xml22
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbtable/menubar/menubar.xml68
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbtable/toolbar/toolbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbtdata/menubar/menubar.xml76
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/dbtdata/toolbar/toolbar.xml27
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/empty_directory0
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sbibliography/menubar/menubar.xml92
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/layout/insert-sheet.xml57
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/layout/move-copy-sheet.xml21
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/layout/sort-options.xml40
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/layout/string-input.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/menubar/menubar.xml456
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/statusbar/statusbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/alignmentbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/colorbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/drawbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/drawobjectbar.xml30
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/extrusionobjectbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/findbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fontworkobjectbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fontworkshapetype.xml38
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formatobjectbar.xml55
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formcontrols.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formdesign.xml32
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formsfilterbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formsnavigationbar.xml33
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formtextobjectbar.xml28
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/graffilterbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/graphicobjectbar.xml32
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/insertbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/insertcellsbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/mediaobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/moreformcontrols.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/previewbar.xml22
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/standardbar.xml44
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/textobjectbar.xml35
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/toolbar.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/viewerbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/menubar/menubar.xml156
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/statusbar/statusbar.xml6
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/toolbar/drawbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/toolbar/standardbar.xml22
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/schart/toolbar/toolbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/menubar/menubar.xml331
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/statusbar/statusbar.xml12
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/3dobjectsbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/alignmentbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/arrowsbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/bezierobjectbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/choosemodebar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/colorbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/commentsbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/connectorsbar.xml35
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/drawingobjectbar.xml21
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/ellipsesbar.xml19
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/extrusionobjectbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/findbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fontworkobjectbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fontworkshapetype.xml38
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formcontrols.xml26
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formdesign.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formsfilterbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formsnavigationbar.xml32
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formtextobjectbar.xml28
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/gluepointsobjectbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/graffilterbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/graphicobjectbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/insertbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/linesbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/masterviewtoolbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/mediaobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/moreformcontrols.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optimizetablebar.xml6
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/positionbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/rectanglesbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/standardbar.xml37
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/tableobjectbar.xml31
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/textbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/textobjectbar.xml40
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/toolbar.xml45
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/viewerbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/zoombar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/menubar/menubar.xml459
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/statusbar/statusbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/alignmentbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/bezierobjectbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/colorbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawingobjectbar.xml40
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawtextobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/extrusionobjectbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/findbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fontworkobjectbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fontworkshapetype.xml38
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formcontrols.xml26
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formdesign.xml31
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formsfilterbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formsnavigationbar.xml32
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formtextobjectbar.xml28
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/frameobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/graffilterbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/graphicobjectbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/insertbar.xml30
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/insertobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/mediaobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/moreformcontrols.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/numobjectbar.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/oleobjectbar.xml30
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/optimizetablebar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/previewobjectbar.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/standardbar.xml42
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/tableobjectbar.xml35
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/textobjectbar.xml44
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/toolbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/viewerbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/menubar/menubar.xml307
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/statusbar/statusbar.xml12
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/3dobjectsbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/alignmentbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/arrowsbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/bezierobjectbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/choosemodebar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/colorbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/commentsbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/commontaskbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/connectorsbar.xml35
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/drawingobjectbar.xml21
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/ellipsesbar.xml19
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/extrusionobjectbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/findbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fontworkobjectbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fontworkshapetype.xml38
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formcontrols.xml26
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formdesign.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formsfilterbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formsnavigationbar.xml32
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formtextobjectbar.xml28
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/gluepointsobjectbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/graffilterbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/graphicobjectbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/insertbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/linesbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/masterviewtoolbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/mediaobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/moreformcontrols.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optimizetablebar.xml6
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/outlinetoolbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/positionbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/rectanglesbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/slideviewobjectbar.xml10
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/slideviewtoolbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/standardbar.xml39
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/tableobjectbar.xml31
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/textbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/textobjectbar.xml45
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/toolbar.xml49
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/viewerbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/zoombar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/smath/menubar/menubar.xml121
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/smath/statusbar/statusbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/smath/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/smath/toolbar/standardbar.xml26
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/smath/toolbar/toolbar.xml12
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/menubar/menubar.xml389
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/statusbar/statusbar.xml14
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/bezierobjectbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/colorbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/drawingobjectbar.xml39
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/drawtextobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/extrusionobjectbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/findbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fontworkobjectbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fontworkshapetype.xml38
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formcontrols.xml25
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formdesign.xml31
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formsfilterbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formsnavigationbar.xml32
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formtextobjectbar.xml28
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/frameobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/graffilterbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/graphicobjectbar.xml26
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/insertbar.xml25
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/mediaobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/numobjectbar.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/oleobjectbar.xml30
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/optimizetablebar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/previewobjectbar.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/standardbar.xml45
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/tableobjectbar.xml35
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/textobjectbar.xml44
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/toolbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/viewerbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/menubar/menubar.xml454
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/statusbar/statusbar.xml14
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/alignmentbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/bezierobjectbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/colorbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawingobjectbar.xml40
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawtextobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/extrusionobjectbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fontworkobjectbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fontworkshapetype.xml38
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formcontrols.xml26
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formdesign.xml33
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formsfilterbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formsnavigationbar.xml33
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formtextobjectbar.xml28
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/frameobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/graffilterbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/graphicobjectbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/insertbar.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/insertobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/mediaobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/moreformcontrols.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/numobjectbar.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/oleobjectbar.xml30
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/optimizetablebar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/previewobjectbar.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/standardbar.xml42
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/tableobjectbar.xml35
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/textobjectbar.xml44
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/toolbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swform/toolbar/viewerbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/menubar/menubar.xml454
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/statusbar/statusbar.xml14
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/alignmentbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/bezierobjectbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/colorbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawingobjectbar.xml40
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawtextobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/extrusionobjectbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fontworkobjectbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fontworkshapetype.xml38
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formcontrols.xml26
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formdesign.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formsfilterbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formsnavigationbar.xml32
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formtextobjectbar.xml28
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/frameobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/graffilterbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/graphicobjectbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/insertbar.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/insertobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/mediaobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/moreformcontrols.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/numobjectbar.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/oleobjectbar.xml30
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/optimizetablebar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/previewobjectbar.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/standardbar.xml42
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/tableobjectbar.xml35
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/textobjectbar.xml44
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/toolbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/viewerbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/menubar/menubar.xml463
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/statusbar/statusbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/alignmentbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/bezierobjectbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/colorbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawingobjectbar.xml40
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawtextobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/extrusionobjectbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/findbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fontworkobjectbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fontworkshapetype.xml38
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formcontrols.xml26
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formdesign.xml33
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formsfilterbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formsnavigationbar.xml33
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formtextobjectbar.xml28
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/frameobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/graffilterbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/graphicobjectbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/insertbar.xml31
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/mediaobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/moreformcontrols.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/navigationobjectbar.xml6
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/numobjectbar.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/oleobjectbar.xml30
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/optimizetablebar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/previewobjectbar.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/standardbar.xml42
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/tableobjectbar.xml35
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/textobjectbar.xml44
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/toolbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/viewerbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/menubar/menubar.xml455
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/statusbar/statusbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/alignmentbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/arrowshapes.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/basicshapes.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/bezierobjectbar.xml20
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/calloutshapes.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/colorbar.xml15
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawingobjectbar.xml40
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawtextobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/extrusionobjectbar.xml16
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/findbar.xml9
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/flowchartshapes.xml36
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fontworkobjectbar.xml11
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fontworkshapetype.xml38
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formcontrols.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formdesign.xml33
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formsfilterbar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formsnavigationbar.xml33
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formtextobjectbar.xml28
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/frameobjectbar.xml34
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fullscreenbar.xml5
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/graffilterbar.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/graphicobjectbar.xml18
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/insertbar.xml29
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/insertobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/mediaobjectbar.xml7
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/moreformcontrols.xml12
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/numobjectbar.xml23
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/oleobjectbar.xml30
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/optimizetablebar.xml8
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/previewobjectbar.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/standardbar.xml42
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/starshapes.xml17
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/symbolshapes.xml24
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/tableobjectbar.xml35
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/textobjectbar.xml44
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/toolbar.xml13
-rw-r--r--test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/viewerbar.xml18
435 files changed, 0 insertions, 14097 deletions
diff --git a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/BasicIDE/menubar/menubar.xml
deleted file mode 100644
index 4583ca294dc0..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/menubar/menubar.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Signature"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
- <menu:menuitem menu:id=".uno:SearchDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FullScreen"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuseparator/>
-
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
-
diff --git a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/BasicIDE/statusbar/statusbar.xml
deleted file mode 100644
index 37766aeb58ed..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/statusbar/statusbar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatusGetTitle" statusbar:align="left" statusbar:autosize="true" statusbar:width="240" statusbar:helpid="helpid:30808"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:StatusGetPosition" statusbar:align="left" statusbar:width="120" statusbar:helpid="helpid:30806"/>
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="41" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="160" statusbar:helpid="helpid:10224"/>
-</statusbar:statusbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/dialogbar.xml b/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/dialogbar.xml
deleted file mode 100644
index 91b9a925fa60..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/dialogbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:LibSelector" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ChooseControls" />
- <toolbar:toolbaritem xlink:href=".uno:ImportDialog" />
- <toolbar:toolbaritem xlink:href=".uno:ExportDialog" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/findbar.xml b/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/findbar.xml
deleted file mode 100644
index 49e483e178a3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/findbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FindText"/>
- <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
- <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/fullscreenbar.xml
deleted file mode 100644
index 5aecdda4fb04..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/insertcontrolsbar.xml b/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/insertcontrolsbar.xml
deleted file mode 100644
index fe0edf689bba..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/insertcontrolsbar.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectMode" toolbar:helpid="helpid:10198" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ManageLanguage" toolbar:helpid="helpid:30820" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:TestMode" toolbar:helpid="helpid:10199" />
- <toolbar:toolbaritem xlink:href=".uno:ShowPropBrowser" toolbar:helpid="helpid:10943" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertPushbutton" toolbar:helpid="helpid:10146" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertImageControl" toolbar:helpid="helpid:10926" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Checkbox" toolbar:helpid="helpid:10148" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Radiobutton" toolbar:helpid="helpid:10147" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFixedText" toolbar:helpid="helpid:10188" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertEdit" toolbar:helpid="helpid:10190" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertListbox" toolbar:helpid="helpid:10191" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Combobox" toolbar:helpid="helpid:10192" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:HScrollbar" toolbar:helpid="helpid:10194" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VScrollbar" toolbar:helpid="helpid:10195" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Groupbox" toolbar:helpid="helpid:10189" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ProgressBar" toolbar:helpid="helpid:10927" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:helpid="helpid:10928" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:helpid="helpid:10929" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AddDateField" toolbar:helpid="helpid:10936" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertTimeField" toolbar:helpid="helpid:10937" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertNumericField" toolbar:helpid="helpid:10938" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertCurrencyField" toolbar:helpid="helpid:10939" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFormattedField" toolbar:helpid="helpid:10940" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPatternField" toolbar:helpid="helpid:10941" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFileControl" toolbar:helpid="helpid:10942" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertTreeControl" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/macrobar.xml b/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/macrobar.xml
deleted file mode 100644
index 6e22bff09baf..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/macrobar.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:LibSelector" toolbar:helpid="helpid:30787" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CompileBasic" toolbar:helpid="helpid:5954" />
- <toolbar:toolbaritem xlink:href=".uno:RunBasic" toolbar:helpid="helpid:5955" />
- <toolbar:toolbaritem xlink:href=".uno:BasicStop" toolbar:helpid="helpid:5958" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BasicStepOver" toolbar:helpid="helpid:5957" />
- <toolbar:toolbaritem xlink:href=".uno:BasicStepInto" toolbar:helpid="helpid:5956" />
- <toolbar:toolbaritem xlink:href=".uno:BasicStepOut" toolbar:helpid="helpid:5963" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleBreakPoint" toolbar:helpid="helpid:30768" />
- <toolbar:toolbaritem xlink:href=".uno:ManageBreakPoints" toolbar:helpid="helpid:30810" />
- <toolbar:toolbaritem xlink:href=".uno:AddWatch" toolbar:helpid="helpid:30769" />
- <toolbar:toolbaritem xlink:href=".uno:MatchGroup" toolbar:helpid="helpid:30782" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LoadBasic" toolbar:helpid="helpid:5951" />
- <toolbar:toolbaritem xlink:href=".uno:SaveBasicAs" toolbar:helpid="helpid:5953" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ImportDialog" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/standardbar.xml
deleted file mode 100644
index 3e685264b75b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/standardbar.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501" />
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectCatalog" toolbar:helpid="helpid:30774" />
- <toolbar:toolbaritem xlink:href=".uno:ChooseMacro" toolbar:helpid="helpid:30770" />
- <toolbar:toolbaritem xlink:href=".uno:ModuleDialog" toolbar:helpid="helpid:30773" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" />
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/translationbar.xml b/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/translationbar.xml
deleted file mode 100644
index 0402e9ba38c6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/BasicIDE/toolbar/translationbar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CurrentLanguage" toolbar:helpid="helpid:30821" />
- <toolbar:toolbaritem xlink:href=".uno:ManageLanguage" toolbar:helpid="helpid:30820" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/StartModule/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/StartModule/menubar/menubar.xml
deleted file mode 100644
index 5ac4c3eb4b7c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/StartModule/menubar/menubar.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/StartModule/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/StartModule/statusbar/statusbar.xml
deleted file mode 100644
index 7b15360f9775..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/StartModule/statusbar/statusbar.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
-</statusbar:statusbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/StartModule/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/StartModule/toolbar/standardbar.xml
deleted file mode 100644
index 4d50afc6576a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/StartModule/toolbar/standardbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:helpid="helpid:5500" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbapp/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/dbapp/menubar/menubar.xml
deleted file mode 100644
index a76fda58c575..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbapp/menubar/menubar.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menu menu:id=".uno:SendToMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:DBSendReportAsMail"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DBSendReportToWriter"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteSpecial"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DBDelete"/>
- <menu:menuitem menu:id=".uno:DBRename"/>
- <menu:menuitem menu:id=".uno:DBEdit"/>
- <menu:menuitem menu:id=".uno:DBEditSqlView"/>
- <menu:menuitem menu:id=".uno:DBOpen"/>
- <menu:menuitem menu:id=".uno:DBConvertToView"/>
- <menu:menuitem menu:id=".uno:DBNewFormAutoPilotWithPreSelection"/>
- <menu:menuitem menu:id=".uno:DBNewReportAutoPilotWithPreSelection"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:DBDatabasePropertiesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DBDSProperties"/>
- <menu:menuitem menu:id=".uno:DBDSConnectionType"/>
- <menu:menuitem menu:id=".uno:DBDSAdvancedSettings"/>
- </menu:menupopup>
- </menu:menu>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:DBDatabaseObjectsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DBViewTables" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:DBViewQueries" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:DBViewForms" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:DBViewReports" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menu menu:id=".uno:DBPreview">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DBDisablePreview" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:DBShowDocInfoPreview" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:DBShowDocPreview" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:DBSort">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Sortup"/>
- <menu:menuitem menu:id=".uno:SortDown"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:DBRefreshTables"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DBNewForm" menu:helpid="12305" menu:label="" />
- <menu:menuitem menu:id=".uno:DBNewReport" menu:helpid="12316" menu:label="" />
- <menu:menuitem menu:id=".uno:DBNewQuery" menu:helpid="38873" menu:label="" />
- <menu:menuitem menu:id=".uno:DBNewQuerySql" menu:helpid="38841" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DBNewTable"/>
- <menu:menuitem menu:id=".uno:DBNewView"/>
- <menu:menuitem menu:id=".uno:DBNewViewSQL"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DBNewFolder"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DBRelationDesign"/>
- <menu:menuitem menu:id=".uno:DBUserAdmin"/>
- <menu:menuitem menu:id=".uno:DBTableFilter"/>
- <menu:menuitem menu:id=".uno:DBDirectSQL"/>
- <menu:menuitem menu:id=".uno:DBMigrateScripts"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
-
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbapp/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbapp/statusbar/statusbar.xml
deleted file mode 100644
index ca0ad5fbdaa6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbapp/statusbar/statusbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:DBStatusType" statusbar:align="left" statusbar:autosize="true" statusbar:width="50" statusbar:helpid="helpid:12308"/>
- <statusbar:statusbaritem xlink:href=".uno:DBStatusDBName" statusbar:align="left" statusbar:autosize="true" statusbar:width="70" statusbar:helpid="helpid:12309"/>
- <statusbar:statusbaritem xlink:href=".uno:DBStatusUserName" statusbar:align="left" statusbar:autosize="true" statusbar:width="70" statusbar:helpid="helpid:12310"/>
- <statusbar:statusbaritem xlink:href=".uno:DBStatusHostName" statusbar:align="left" statusbar:autosize="true" statusbar:width="70" statusbar:helpid="helpid:12311"/>
-</statusbar:statusbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/formobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/formobjectbar.xml
deleted file mode 100644
index b8f555a80d8c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/formobjectbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DBFormOpen" toolbar:helpid="helpid:12286" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBFormEdit" toolbar:helpid="helpid:12285" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBFormDelete" toolbar:helpid="helpid:12283" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBFormRename" toolbar:helpid="helpid:12284" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/queryobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/queryobjectbar.xml
deleted file mode 100644
index ad67b7c4d3e6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/queryobjectbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DBQueryOpen" toolbar:helpid="helpid:12282" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBQueryEdit" toolbar:helpid="helpid:12281" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBQueryDelete" toolbar:helpid="helpid:12279" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBQueryRename" toolbar:helpid="helpid:12280" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/reportobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/reportobjectbar.xml
deleted file mode 100644
index d9fb154df0c2..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/reportobjectbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DBReportOpen" toolbar:helpid="helpid:12290" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBReportEdit" toolbar:helpid="helpid:12289" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBReportDelete" toolbar:helpid="helpid:12287" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBReportRename" toolbar:helpid="helpid:12288" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/tableobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/tableobjectbar.xml
deleted file mode 100644
index 66a2dd4cca98..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/tableobjectbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DBTableOpen" toolbar:helpid="helpid:12278" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBTableEdit" toolbar:helpid="helpid:12277" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBTableDelete" toolbar:helpid="helpid:12275" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBTableRename" toolbar:helpid="helpid:12276" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/toolbar.xml
deleted file mode 100644
index ad003449cedd..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbapp/toolbar/toolbar.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="helpid:10712" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="helpid:10713" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBNewForm" toolbar:helpid="helpid:5500" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" toolbar:helpid="helpid:5411" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbbrowser/menubar/compat.xml b/test/user-template/user/config/soffice.cfg/modules/dbbrowser/menubar/compat.xml
deleted file mode 100644
index 1e224627c50f..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbbrowser/menubar/compat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<compat/>
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbbrowser/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbbrowser/toolbar/toolbar.xml
deleted file mode 100644
index 54bfcda90988..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbbrowser/toolbar/toolbar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="helpid:38991" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="helpid:38992" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="helpid:10725" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="helpid:10724" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="helpid:10714" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="helpid:10712" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="helpid:10713" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="helpid:10716" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="helpid:10723" toolbar:text="" toolbar:style="" />
- <toolbar:toolbaritem xlink:href=".uno:FilterCrit" toolbar:helpid="helpid:10715" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="helpid:10711" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DSBInsertColumns" toolbar:helpid="helpid:12202" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DSBInsertContent" toolbar:helpid="helpid:12201" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DSBFormLetter" toolbar:helpid="helpid:12203" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DSBDocumentDataSource" toolbar:helpid="helpid:12252" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DSBrowserExplorer" toolbar:helpid="helpid:10764" toolbar:text="" toolbar:style="" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbquery/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/dbquery/menubar/menubar.xml
deleted file mode 100644
index 2d6ec8d05abc..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbquery/menubar/menubar.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DBDistinctValues"/>
- <menu:menuitem menu:id=".uno:SbaNativeSql"/>
- <menu:menuitem menu:id=".uno:DBClearQuery"/>
- <menu:menuitem menu:id=".uno:SbaExecuteSql"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DBViewFunctions"/>
- <menu:menuitem menu:id=".uno:DBViewTableNames"/>
- <menu:menuitem menu:id=".uno:DBViewAliases"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DBChangeDesignMode"/>
- <menu:menuitem menu:id=".uno:DBQueryPreview"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DBAddRelation"/>
- <menu:menuitem menu:id=".uno:AddTable"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
-
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/designobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/designobjectbar.xml
deleted file mode 100644
index 894e725fde7e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/designobjectbar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:AddTable" toolbar:helpid="helpid:10722" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBViewFunctions" toolbar:helpid="helpid:12297" toolbar:text="" toolbar:style="" />
- <toolbar:toolbaritem xlink:href=".uno:DBViewTableNames" toolbar:helpid="helpid:12298" toolbar:text="" toolbar:style="" />
- <toolbar:toolbaritem xlink:href=".uno:DBViewAliases" toolbar:helpid="helpid:12299" toolbar:text="" toolbar:style="" />
- <toolbar:toolbaritem xlink:href=".uno:DBDistinctValues" toolbar:helpid="helpid:12300" toolbar:text="" toolbar:style="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/sqlobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/sqlobjectbar.xml
deleted file mode 100644
index 27b4825e5539..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/sqlobjectbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SbaNativeSql" toolbar:helpid="helpid:10720" toolbar:text="" toolbar:style="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/toolbar.xml
deleted file mode 100644
index 790ee57c6b53..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbquery/toolbar/toolbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Save" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:text="" toolbar:style="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SbaExecuteSql" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBChangeDesignMode" toolbar:text="" toolbar:style="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBClearQuery" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbrelation/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/dbrelation/menubar/menubar.xml
deleted file mode 100644
index b7460a447e54..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbrelation/menubar/menubar.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DBAddRelation"/>
- <menu:menuitem menu:id=".uno:AddTable"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
-
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbrelation/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbrelation/toolbar/toolbar.xml
deleted file mode 100644
index f7f79fff538d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbrelation/toolbar/toolbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AddTable" toolbar:helpid="helpid:10722" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBAddRelation" toolbar:helpid="helpid:12296" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/menubar/menubar.xml
deleted file mode 100644
index 9993288d8601..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/menubar/menubar.xml
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ExportReportTo">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TextDocument"/>
- <menu:menuitem menu:id=".uno:Spreadsheet"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menu menu:id=".uno:Select">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuitem menu:id=".uno:SelectAllLabels"/>
- <menu:menuitem menu:id=".uno:SelectAllEdits"/>
- <menu:menuitem menu:id=".uno:SelectReport"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Delete"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PageHeaderFooter"/>
- <menu:menuitem menu:id=".uno:ReportHeaderFooter"/>
- <menu:menuitem menu:id=".uno:ColumnHeaderFooter"/>
- <menu:menuseparator/>
-
- <menu:menu menu:id=".uno:EditShapeMenu">
- <menu:menupopup>
- <!--
- <menu:menu menu:id=".uno:ArrangeMenu">
- <menu:menupopup>
--->
- <menu:menuitem menu:id=".uno:BringToFront"/>
- <menu:menuitem menu:id=".uno:ObjectBackOne"/>
- <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
- <menu:menuitem menu:id=".uno:SendToBack"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
- <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
- <!--
- </menu:menupopup>
- </menu:menu>
--->
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:EditControlMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:ObjectAlign" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
- <menu:menuitem menu:id=".uno:AlignCenter"/>
- <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AlignUp"/>
- <menu:menuitem menu:id=".uno:AlignMiddle"/>
- <menu:menuitem menu:id=".uno:AlignDown"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:ObjectResize" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SmallestWidth"/>
- <menu:menuitem menu:id=".uno:GreatestWidth"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SmallestHeight"/>
- <menu:menuitem menu:id=".uno:GreatestHeight"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:SectionAlignmentMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SectionAlignLeft"/>
- <menu:menuitem menu:id=".uno:SectionAlignRight"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SectionAlignTop"/>
- <menu:menuitem menu:id=".uno:SectionAlignBottom"/>
- </menu:menupopup>
- </menu:menu>
-
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:SectionShrinkMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SectionShrink"/>
- <menu:menuitem menu:id=".uno:SectionShrinkTop"/>
- <menu:menuitem menu:id=".uno:SectionShrinkBottom"/>
- </menu:menupopup>
- </menu:menu>
-
-
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExecuteReport"/>
- </menu:menupopup>
- </menu:menu>
-
-
- <menu:menu menu:id=".uno:ViewMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SwitchControlDesignMode"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ControlProperties"/>
- <menu:menuitem menu:id=".uno:AddField"/>
- <menu:menuitem menu:id=".uno:DbSortingAndGrouping"/>
- <menu:menuitem menu:id=".uno:ReportNavigator"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowRuler"/>
- <menu:menu menu:id=".uno:GridMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:GridVisible"/>
- <menu:menuitem menu:id=".uno:GridUse"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:SnapLinesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelplinesMove"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertDateTimeField"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ReportControlMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectObject"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ControlProperties"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Label" />
- <menu:menuitem menu:id=".uno:Edit" />
- <menu:menuitem menu:id=".uno:ImageControl" />
- <menu:menuitem menu:id=".uno:InsertObjectChart" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HFixedLine" />
- <menu:menuitem menu:id=".uno:VFixedLine" />
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:GraphicMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertGraphic"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:ShapesMenu" >
- <menu:menupopup>
-
- <menu:menu menu:id=".uno:BasicShapesMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:BasicShapes.rectangle"/>
- <menu:menuitem menu:id=".uno:BasicShapes.round-rectangle"/>
- <menu:menuitem menu:id=".uno:BasicShapes.quadrat"/>
- <menu:menuitem menu:id=".uno:BasicShapes.round-quadrat"/>
- <menu:menuitem menu:id=".uno:BasicShapes.circle"/>
- <menu:menuitem menu:id=".uno:BasicShapes.ellipse"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:BasicShapes.circle-pie"/>
- <menu:menuitem menu:id=".uno:BasicShapes.isosceles-triangle"/>
- <menu:menuitem menu:id=".uno:BasicShapes.right-triangle"/>
- <menu:menuitem menu:id=".uno:BasicShapes.trapezoid"/>
- <menu:menuitem menu:id=".uno:BasicShapes.diamond"/>
- <menu:menuitem menu:id=".uno:BasicShapes.parallelogram"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:BasicShapes.pentagon"/>
- <menu:menuitem menu:id=".uno:BasicShapes.hexagon"/>
- <menu:menuitem menu:id=".uno:BasicShapes.octagon"/>
- <menu:menuitem menu:id=".uno:BasicShapes.cross"/>
- <menu:menuitem menu:id=".uno:BasicShapes.ring"/>
- <menu:menuitem menu:id=".uno:BasicShapes.block-arc"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:BasicShapes.can"/>
- <menu:menuitem menu:id=".uno:BasicShapes.cube"/>
- <menu:menuitem menu:id=".uno:BasicShapes.paper"/>
- <menu:menuitem menu:id=".uno:BasicShapes.frame"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:SymbolShapesMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SymbolShapes.smiley"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.sun"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.moon"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.lightning"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.heart"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.flower"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SymbolShapes.cloud"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.forbidden"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.puzzle"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.bracket-pair"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.left-bracket"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.right-bracket"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SymbolShapes.brace-pair"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.left-brace"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.right-brace"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.quad-bevel"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.octagon-bevel"/>
- <menu:menuitem menu:id=".uno:SymbolShapes.diamond-bevel"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:ArrowShapesMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ArrowShapes.left-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.right-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.up-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.down-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.left-right-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.up-down-arrow"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ArrowShapes.up-right-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.up-right-down-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.quad-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.corner-right-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.split-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.striped-right-arrow"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ArrowShapes.notched-right-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.pentagon-right"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.chevron"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.right-arrow-callout"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.left-arrow-callout"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.up-arrow-callout"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ArrowShapes.down-arrow-callout"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.left-right-arrow-callout"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.up-down-arrow-callout"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.up-right-arrow-callout"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.quad-arrow-callout"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.circular-arrow"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ArrowShapes.split-round-arrow"/>
- <menu:menuitem menu:id=".uno:ArrowShapes.s-sharped-arrow"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:FlowChartShapesMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-process"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-alternate-process"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-decision"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-data"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-predefined-process"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-internal-storage"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-document"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-multidocument"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-terminator"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-preparation"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-manual-input"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-manual-operation"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-connector"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-off-page-connector"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-card"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-punched-tape"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-summing-junction"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-or"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-collate"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-sort"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-extract"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-merge"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-stored-data"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-delay"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-sequential-access"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-magnetic-disk"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-direct-access-storage"/>
- <menu:menuitem menu:id=".uno:FlowChartShapes.flowchart-display"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:CalloutShapesMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CalloutShapes.rectangular-callout" />
- <menu:menuitem menu:id=".uno:CalloutShapes.round-rectangular-callout" />
- <menu:menuitem menu:id=".uno:CalloutShapes.round-callout" />
- <menu:menuitem menu:id=".uno:CalloutShapes.cloud-callout" />
- <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-1" />
- <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-2" />
- <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-3" />
- </menu:menupopup>
- </menu:menu>
-
- <menu:menu menu:id=".uno:StarShapesMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:StarShapes.bang"/>
- <menu:menuitem menu:id=".uno:StarShapes.star4"/>
- <menu:menuitem menu:id=".uno:StarShapes.star5"/>
- <menu:menuitem menu:id=".uno:StarShapes.star6"/>
- <menu:menuitem menu:id=".uno:StarShapes.star8"/>
- <menu:menuitem menu:id=".uno:StarShapes.star12"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:StarShapes.star24"/>
- <menu:menuitem menu:id=".uno:StarShapes.concave-star6"/>
- <menu:menuitem menu:id=".uno:StarShapes.vertical-scroll"/>
- <menu:menuitem menu:id=".uno:StarShapes.horizontal-scroll"/>
- <menu:menuitem menu:id=".uno:StarShapes.signet"/>
- <menu:menuitem menu:id=".uno:StarShapes.doorplate"/>
- </menu:menupopup>
- </menu:menu>
-
- </menu:menupopup>
- </menu:menu>
-
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ConditionalFormatting"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ArrangeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:BringToFront"/>
- <menu:menuitem menu:id=".uno:ObjectBackOne"/>
- <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
- <menu:menuitem menu:id=".uno:SendToBack"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
- <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectAlign" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
- <menu:menuitem menu:id=".uno:AlignCenter"/>
- <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AlignUp"/>
- <menu:menuitem menu:id=".uno:AlignMiddle"/>
- <menu:menuitem menu:id=".uno:AlignDown"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectResize" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SmallestWidth"/>
- <menu:menuitem menu:id=".uno:GreatestWidth"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SmallestHeight"/>
- <menu:menuitem menu:id=".uno:GreatestHeight"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Distribution"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu" >
- <menu:menupopup>
- <menu:menu menu:id=".uno:MacrosMenu" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuitem menu:id=".uno:MacroSignature"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuitem menu:id=".uno:HelpTip"/>
- <menu:menuitem menu:id=".uno:ActiveHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelperDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/statusbar/statusbar.xml
deleted file mode 100644
index 7e50780b633d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/statusbar/statusbar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35" statusbar:helpid="helpid:10000"/>
-</statusbar:statusbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/Formatting.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/Formatting.xml
deleted file mode 100644
index 2fc8494938d4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/Formatting.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CharFontName" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/alignmentbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/alignmentbar.xml
deleted file mode 100644
index 1c4a05228a07..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/alignmentbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignDown"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/arrowshapes.xml
deleted file mode 100644
index 62f2e5e2d534..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/basicshapes.xml
deleted file mode 100644
index e26df54f29ab..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/calloutshapes.xml
deleted file mode 100644
index 5a37c8de0301..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/drawbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/drawbar.xml
deleted file mode 100644
index 07778059053a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/drawbar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:style="dropdown"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/flowchartshapes.xml
deleted file mode 100644
index d3e649930942..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/reportcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/reportcontrols.xml
deleted file mode 100644
index ac460a3ba77c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/reportcontrols.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:style="radio auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:style="radio auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="radio auto" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/resizebar.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/resizebar.xml
deleted file mode 100644
index 864f588b976b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/resizebar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SmallestWidth"/>
- <toolbar:toolbaritem xlink:href=".uno:GreatestWidth"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SmallestHeight"/>
- <toolbar:toolbaritem xlink:href=".uno:GreatestHeight"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/sectionalignmentbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/sectionalignmentbar.xml
deleted file mode 100644
index fc21516735a5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/sectionalignmentbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SectionAlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:SectionAlignRight"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SectionAlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:SectionAlignBottom"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/sectionshrinkbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/sectionshrinkbar.xml
deleted file mode 100644
index 0064ce8501b3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/sectionshrinkbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SectionShrink"/>
- <toolbar:toolbaritem xlink:href=".uno:SectionShrinkTop"/>
- <toolbar:toolbaritem xlink:href=".uno:SectionShrinkBottom"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/starshapes.xml
deleted file mode 100644
index 820e9c07434d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/symbolshapes.xml
deleted file mode 100644
index 4269c1d42e08..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/toolbar.xml
deleted file mode 100644
index 55d77cb75f97..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbreport/toolbar/toolbar.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Save" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ReportNavigator" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:DbSortingAndGrouping" />
- <toolbar:toolbaritem xlink:href=".uno:ExecuteReport" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" />
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbtable/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/dbtable/menubar/menubar.xml
deleted file mode 100644
index ede5eed2c224..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbtable/menubar/menubar.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DBIndexDesign"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
-
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbtable/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbtable/toolbar/toolbar.xml
deleted file mode 100644
index f601211ca3d2..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbtable/toolbar/toolbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBIndexDesign" toolbar:helpid="helpid:12251" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbtdata/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/dbtdata/menubar/menubar.xml
deleted file mode 100644
index 79fe68a2d7d8..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbtdata/menubar/menubar.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormSlots/undoRecord"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FormSlots/saveRecord"/>
- <menu:menuitem menu:id=".uno:FormSlots/deleteRecord"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DSBEditDoc"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormSlots/insertRecord"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
-
diff --git a/test/user-template/user/config/soffice.cfg/modules/dbtdata/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/dbtdata/toolbar/toolbar.xml
deleted file mode 100644
index 09b143b04c1d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/dbtdata/toolbar/toolbar.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="helpid:38991" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="helpid:38992" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="helpid:10725" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="helpid:10724" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="helpid:10714" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="helpid:10712" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="helpid:10713" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="helpid:10716" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="helpid:10723" toolbar:text="" toolbar:style="" />
- <toolbar:toolbaritem xlink:href=".uno:FilterCrit" toolbar:helpid="helpid:10715" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="helpid:10711" toolbar:text="" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/empty_directory b/test/user-template/user/config/soffice.cfg/modules/empty_directory
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/test/user-template/user/config/soffice.cfg/modules/empty_directory
diff --git a/test/user-template/user/config/soffice.cfg/modules/sbibliography/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/sbibliography/menubar/menubar.xml
deleted file mode 100644
index 817473af0e73..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sbibliography/menubar/menubar.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuitem menu:id=".uno:VersionDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SendToMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PrintPreview"/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Bib/Mapping"/>
- <menu:menuitem menu:id=".uno:Bib/sdbsource"/>
- <menu:menuitem menu:id=".uno:Bib/DeleteRecord"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Bib/InsertRecord"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Bib/standardFilter"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/layout/insert-sheet.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/layout/insert-sheet.xml
deleted file mode 100644
index 35a55e405e7a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/layout/insert-sheet.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is a template. i18n translation is not performed in-place;
- i18n translated XML files are generated from this template by
- transex3/layout/tralay. !-->
-
-<modaldialog sizeable="true" closeable="true" moveable="true" output-size="true" id="RID_SCDLG_INSERT_TABLE" sv-look="true" _title="Insert Sheet" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
- <vbox spacing="5" border="5">
- <fixedline id="FL_POSITION" _text="Position"/>
- <hbox>
- <vbox cnt:padding="13" spacing="5">
- <radiobutton radiogroup="insert-sheet-position" id="RB_BEFORE" tabstop="true" _label="B~efore current sheet"/>
- <radiobutton radiogroup="insert-sheet-position" id="RB_BEHIND" tabstop="true" _label="~After current sheet"/>
- </vbox>
- </hbox>
- <fixedline id="FL_TABLE" _text="Sheet"/>
- <hbox>
- <vbox cnt:padding="13" spacing="5">
- <radiobutton radiogroup="insert-sheet-source" id="RB_NEW" _label="~New sheet"/>
- <hbox>
- <vbox cnt:padding="13" spacing="5" cnt:fill="false" cnt:expand="false">
- <fixedtext id="FT_COUNT" _label="N~o. of sheets"/>
- <fixedtext id="FT_NAME" _label="Na~me"/>
- </vbox>
- <vbox>
- <hbox>
- <numericfield has_border="true" maximum="256" minimum="1" repeat="true" id="NF_COUNT" spin="true" spin-size="1" tabstop="true" value="1" cnt:fill="true" cnt:expand="true"/>
- </hbox>
- <edit has_border="true" id="ED_TABNAME" cnt:fill="true" cnt:expand="true"/>
- </vbox>
- </hbox>
- </vbox>
- </hbox>
- <hbox>
- <vbox cnt:padding="13" spacing="5">
- <radiobutton radiogroup="insert-sheet-source" id="RB_FROMFILE" _label="~From file"/>
- <hbox>
- <vbox cnt:padding="13" spacing="5">
- <hbox>
- <multilistbox auto-hscroll="true" has_border="true" id="LB_TABLES" simple-mode="true" string-item-list=" : : : : " cnt:fill="true" cnt:expand="true"/>
- <vbox cnt:fill="false" cnt:expand="false" spacing="5">
- <pushbutton id="BTN_BROWSE" _label="~Browse..." cnt:expand="false"/>
- <checkbox id="CB_LINK" _label="Lin~k" cnt:expand="false"/>
- <flow/>
- </vbox>
- </hbox>
- <fixedtext id="FT_PATH" label="FT-PATH"/>
- </vbox>
- </hbox>
- </vbox>
- </hbox>
- <dialogbuttonhbox border="5" spacing="5">
- <okbutton defbutton="true" id="BTN_OK"/>
- <cancelbutton id="BTN_CANCEL"/>
- <helpbutton id="BTN_HELP"/>
- </dialogbuttonhbox>
- </vbox>
-</modaldialog>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/layout/move-copy-sheet.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/layout/move-copy-sheet.xml
deleted file mode 100644
index 3d26db1aa73d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/layout/move-copy-sheet.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is a template. i18n translation is not performed in-place;
- i18n translated XML files are generated from this template by
- transex3/layout/tralay. !-->
-
-<modaldialog sizeable="true" closeable="true" help-id="FID_TAB_MOVE" moveable="true" output-size="true" id="RID_SCDLG_MOVETAB" sv-look="true" _title="Move/Copy Sheet" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
- <vbox spacing="5" border="5">
- <string id="STR_NEWDOC" _text="- new document -"/>
- <fixedtext id="FT_DEST" _label="To ~document"/>
- <listbox has_border="true" dropdown="true" id="LB_DEST" tabstop="true"/>
- <fixedtext id="FT_INSERT" _label="~Insert before"/>
- <listbox has_border="true" id="LB_INSERT" tabstop="true" string-item-list=" : : : : " />
- <checkbox id="BTN_COPY" tabstop="true" _label="~Copy"/>
- <dialogbuttonhbox border="5" spacing="5">
- <flow/>
- <cancelbutton id="BTN_CANCEL" tabstop="true"/>
- <helpbutton id="BTN_HELP" tabstop="true"/>
- <okbutton defbutton="true" id="BTN_OK" tabstop="true"/>
- </dialogbuttonhbox>
- </vbox>
-</modaldialog>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/layout/sort-options.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/layout/sort-options.xml
deleted file mode 100644
index a409ac2d530a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/layout/sort-options.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is a template. i18n translation is not performed in-place;
- i18n translated XML files are generated from this template by
- transex3/layout/tralay. !-->
-
-<tabpage help-id="HID_SCPAGE_SORT_OPTIONS"
- id="RID_SCPAGE_SORT_OPTIONS"
- sv-look="true" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container"
- optimumsize="true"
- sizeable="true" moveable="true">
- <vbox spacing="4" border="5">
- <string id="STR_COL_LABEL" _text="Range contains column la~bels"/>
- <string id="STR_ROW_LABEL" _text="Range contains ~row labels"/>
- <string id="SCSTR_UNDEFINED" _text="- undefined -"/>
- <vbox spacing="4" border="5">
- <checkbox id="BTN_CASESENSITIVE" tabstop="true" _label="Case ~sensitive"/>
- <checkbox id="BTN_LABEL" tabstop="true"/>
- <checkbox id="BTN_FORMATS" tabstop="true" _label="Include ~formats"/>
- <checkbox id="BTN_NATURALSORT" tabstop="true" _label="Enable ~natural sort"/>
- <checkbox id="BTN_COPYRESULT" tabstop="true" _label="~Copy sort results to:"/>
- <hbox>
- <listbox has_border="true" dropdown="true" id="LB_OUTAREA" tabstop="true"/>
- <edit has_border="true" disable="true" id="ED_OUTAREA" tabstop="true"/>
- </hbox>
- <checkbox id="BTN_SORT_USER" tabstop="true" _label="Custom sort ~order"/>
- <listbox has_border="true" disable="true" dropdown="true" id="LB_SORT_USER" tabstop="true"/>
- <hbox>
- <fixedtext id="FT_LANGUAGE" _label="~Language"/>
- <fixedtext id="FT_ALGORITHM" _label="O~ptions"/>
- </hbox>
- <hbox>
- <svxlanguagebox has_border="true" dropdown="true" id="LB_LANGUAGE" sort="true" tabstop="true" _string-item-list="Default"/>
- <listbox has_border="true" dropdown="true" id="LB_ALGORITHM" tabstop="true"/>
- </hbox>
- <fixedline id="FL_DIRECTION" _text="Direction"/>
- <radiobutton id="BTN_TOP_DOWN" radiogroup="sort-options" tabstop="true" _label="~Top to bottom (sort rows)"/>
- <radiobutton id="BTN_LEFT_RIGHT" radiogroup="sort-options" tabstop="true" _label="L~eft to right (sort columns)"/>
- </vbox>
- </vbox>
-</tabpage>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/layout/string-input.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/layout/string-input.xml
deleted file mode 100644
index b1aed5197c17..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/layout/string-input.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is a template. i18n translation is not performed in-place;
- i18n translated XML files are generated from this template by
- transex3/layout/tralay. !-->
-
-<modaldialog sizeable="true" closeable="false" moveable="true" output-size="true" id="RID_SCDLG_STRINPUT" sv-look="true" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container" title="Insert String">
- <vbox spacing="5" border="5">
- <fixedtext id="FT_LABEL" label="FT-LABEL"/>
- <edit has_border="true" id="ED_INPUT" tabstop="true"/>
- <dialogbuttonhbox border="5" spacing="5">
- <okbutton defbutton="true" id="BTN_OK" tabstop="true"/>
- <cancelbutton id="BTN_CANCEL" tabstop="true"/>
- <helpbutton id="BTN_HELP" tabstop="true"/>
- </dialogbuttonhbox>
- </vbox>
-</modaldialog>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/menubar/menubar.xml
deleted file mode 100644
index f59549918e9a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/menubar/menubar.xml
+++ /dev/null
@@ -1,456 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuitem menu:id=".uno:VersionDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menuitem menu:id=".uno:ExportToPDF"/>
- <menu:menu menu:id=".uno:SendTo">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsOOo"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsMS"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menuitem menu:id=".uno:Signature"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WebHtml"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PrintPreview"/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuitem menu:id=".uno:Repeat"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteSpecial"/>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ChangesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TraceChangeMode"/>
- <menu:menuitem menu:id=".uno:ProtectTraceChangeMode"/>
- <menu:menuitem menu:id=".uno:ShowChanges"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AcceptChanges"/>
- <menu:menuitem menu:id=".uno:CommentChange"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:CompareDocuments"/>
- <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
- <menu:menuitem menu:id=".uno:SearchDialog"/>
- <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:FillCellsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FillDown"/>
- <menu:menuitem menu:id=".uno:FillRight"/>
- <menu:menuitem menu:id=".uno:FillUp"/>
- <menu:menuitem menu:id=".uno:FillLeft"/>
- <menu:menuitem menu:id=".uno:FillTable"/>
- <menu:menuitem menu:id=".uno:FillSeries"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:Delete"/>
- <menu:menuitem menu:id=".uno:DeleteCell"/>
- <menu:menu menu:id=".uno:EditSheetMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Move"/>
- <menu:menuitem menu:id=".uno:SelectTables"/>
- <menu:menuitem menu:id=".uno:Remove"/>
- <menu:menuitem menu:id=".uno:TableEvents"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:DelBreakMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DeleteRowbreak"/>
- <menu:menuitem menu:id=".uno:DeleteColumnbreak"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:EditLinks"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
- <menu:menuitem menu:id=".uno:ImageMapDialog"/>
- <menu:menuitem menu:id=".uno:ObjectMenue"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NormalViewMode" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:PagebreakMode" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:InputLineVisible"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewRowColumnHeaders"/>
- <menu:menuitem menu:id=".uno:ViewValueHighlighting"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
- <menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:InsertBreakMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertRowBreak"/>
- <menu:menuitem menu:id=".uno:InsertColumnBreak"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertCell"/>
- <menu:menuitem menu:id=".uno:InsertRows"/>
- <menu:menuitem menu:id=".uno:InsertColumns"/>
- <menu:menuitem menu:id=".uno:Insert"/>
- <menu:menuitem menu:id=".uno:InsertSheetFromFile"/>
- <menu:menuitem menu:id=".uno:InsertExternalDataSource"/>
- <menu:menuitem menu:id=".uno:InsertSymbol"/>
- <menu:menu menu:id=".uno:FormattingMarkMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
- <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
- <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
- <menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
- <menu:menuitem menu:id=".uno:InsertLRM"/>
- <menu:menuitem menu:id=".uno:InsertRLM"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FunctionDialog"/>
- <menu:menuitem menu:id=".uno:FunctionBox"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:NamesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DefineName"/>
- <menu:menuitem menu:id=".uno:InsertName"/>
- <menu:menuitem menu:id=".uno:CreateNames"/>
- <menu:menuitem menu:id=".uno:DefineLabelRange"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:GraphicMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertGraphic"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertAVMedia"/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertObject"/>
- <menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertSound"/>
- <menu:menuitem menu:id=".uno:InsertVideo"/>
- <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertObjectChart"/>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FormatCellDialog"/>
- <menu:menu menu:id=".uno:RowMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:RowHeight"/>
- <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
- <menu:menuitem menu:id=".uno:HideRow"/>
- <menu:menuitem menu:id=".uno:ShowRow"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ColumnMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:HideColumn"/>
- <menu:menuitem menu:id=".uno:ShowColumn"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:SheetMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:RenameTable"/>
- <menu:menuitem menu:id=".uno:Hide"/>
- <menu:menuitem menu:id=".uno:Show"/>
- <menu:menuitem menu:id=".uno:SheetRightToLeft"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetTabBgColor"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:MergeCellsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ToggleMergeCells"/>
- <menu:menuitem menu:id=".uno:MergeCells"/>
- <menu:menuitem menu:id=".uno:SplitCell"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PageFormatDialog"/>
- <menu:menu menu:id=".uno:PrintRangesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DefinePrintArea"/>
- <menu:menuitem menu:id=".uno:AddPrintArea"/>
- <menu:menuitem menu:id=".uno:DeletePrintArea"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:EditPrintArea"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menu menu:id=".uno:TransliterateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:DesignerDialog"/>
- <menu:menuitem menu:id=".uno:AutoFormat"/>
- <menu:menuitem menu:id=".uno:ConditionalFormatDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:AnchorMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToCell" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectAlign">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CommonAlignHorizontalDefault" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ArrangeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:BringToFront"/>
- <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
- <menu:menuitem menu:id=".uno:ObjectBackOne"/>
- <menu:menuitem menu:id=".uno:SendToBack"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
- <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FlipMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ObjectMirrorVertical"/>
- <menu:menuitem menu:id=".uno:ObjectMirrorHorizontal"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:GroupMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormatGroup"/>
- <menu:menuitem menu:id=".uno:FormatUngroup"/>
- <menu:menuitem menu:id=".uno:EnterGroup"/>
- <menu:menuitem menu:id=".uno:LeaveGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:DrawGraphicMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
- <menu:menuitem menu:id=".uno:FormatArea"/>
- <menu:menuitem menu:id=".uno:TextAttributes"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:ControlProperties"/>
- <menu:menuitem menu:id=".uno:FormProperties"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SpellDialog"/>
- <menu:menu menu:id=".uno:LanguageMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
- <menu:menuitem menu:id=".uno:ChineseConversion"/>
- <menu:menuitem menu:id=".uno:ThesaurusDialog"/>
- <menu:menuitem menu:id=".uno:Hyphenate"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MoreDictionaries"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:AuditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ShowPrecedents"/>
- <menu:menuitem menu:id=".uno:ClearArrowPrecedents"/>
- <menu:menuitem menu:id=".uno:ShowDependents"/>
- <menu:menuitem menu:id=".uno:ClearArrowDependents"/>
- <menu:menuitem menu:id=".uno:ClearArrows"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowErrors"/>
- <menu:menuitem menu:id=".uno:ShowInvalid"/>
- <menu:menuitem menu:id=".uno:RefreshArrows"/>
- <menu:menuitem menu:id=".uno:AutoRefreshArrows"/>
- <menu:menuitem menu:id=".uno:AuditingFillMode"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:GoalSeekDialog"/>
- <menu:menuitem menu:id=".uno:SolverDialog"/>
- <menu:menuitem menu:id=".uno:ScenarioManager"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShareDocument"/>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
- <menu:menu menu:id=".uno:ProtectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Protect"/>
- <menu:menuitem menu:id=".uno:ToolProtectionDocument"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:CellContentsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Calculate"/>
- <menu:menuitem menu:id=".uno:AutomaticCalculation"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoComplete"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Gallery"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuitem menu:id=".uno:MacroSignature"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
-
- <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:DataMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DefineDBName"/>
- <menu:menuitem menu:id=".uno:SelectDB"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DataSort"/>
- <menu:menu menu:id=".uno:FilterMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DataFilterAutoFilter"/>
- <menu:menuitem menu:id=".uno:DataFilterStandardFilter"/>
- <menu:menuitem menu:id=".uno:DataFilterSpecialFilter"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DataFilterRemoveFilter"/>
- <menu:menuitem menu:id=".uno:DataFilterHideAutoFilter"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:DataForm"/>
- <menu:menuitem menu:id=".uno:DataSubTotals"/>
- <menu:menuitem menu:id=".uno:Validation"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TableOperationDialog"/>
- <menu:menuitem menu:id=".uno:TextToColumns"/>
- <menu:menuitem menu:id=".uno:DataConsolidate"/>
- <menu:menu menu:id=".uno:GroupOutlineMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HideDetail"/>
- <menu:menuitem menu:id=".uno:ShowDetail"/>
- <menu:menuitem menu:id=".uno:Group"/>
- <menu:menuitem menu:id=".uno:Ungroup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoOutline"/>
- <menu:menuitem menu:id=".uno:ClearOutline"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:DataPilotMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DataDataPilotRun"/>
- <menu:menuitem menu:id=".uno:RecalcPivotTable"/>
- <menu:menuitem menu:id=".uno:DeletePivotTable"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DataAreaRefresh"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SplitWindow"/>
- <menu:menuitem menu:id=".uno:FreezePanes"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/statusbar/statusbar.xml
deleted file mode 100644
index 28dfaf480771..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/statusbar/statusbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatusDocPos" statusbar:align="left" statusbar:autosize="true" statusbar:width="58" statusbar:helpid="helpid:26114"/>
- <statusbar:statusbaritem xlink:href=".uno:StatusPageStyle" statusbar:align="left" statusbar:autosize="true" statusbar:width="83" statusbar:helpid="helpid:26115"/>
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="41" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:StatusSelectionMode" statusbar:align="center" statusbar:width="34" statusbar:helpid="helpid:26116"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="18" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="center" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="212" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="140" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35" statusbar:helpid="helpid:10000"/>
-</statusbar:statusbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/alignmentbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/alignmentbar.xml
deleted file mode 100644
index dbd7294e566c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/alignmentbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131" />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134" />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135" />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/arrowshapes.xml
deleted file mode 100644
index 4a53519494ea..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/basicshapes.xml
deleted file mode 100644
index e65778305788..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/calloutshapes.xml
deleted file mode 100644
index 91b957fa697a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/colorbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/colorbar.xml
deleted file mode 100644
index adcda76b5c3a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/colorbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/drawbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/drawbar.xml
deleted file mode 100644
index 2407475a88f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/drawbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
- <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false" toolbar:helpid="10114"/>
- <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false" toolbar:helpid="10112"/>
- <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false" toolbar:helpid="10115"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/>
- <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false" toolbar:helpid="10465"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="10906"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="11004"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="11005"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="11007"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="10977"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/drawobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/drawobjectbar.xml
deleted file mode 100644
index 8cd0a9bf8b67..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/drawobjectbar.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143"/>
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="10169"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="10164"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="26412"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:helpid="10283"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="10282"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false" toolbar:helpid="27322"/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/extrusionobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/extrusionobjectbar.xml
deleted file mode 100644
index 148849db6ee7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/extrusionobjectbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/findbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/findbar.xml
deleted file mode 100644
index 49e483e178a3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/findbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FindText"/>
- <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
- <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/flowchartshapes.xml
deleted file mode 100644
index bb1d1099dbd4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fontworkobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fontworkobjectbar.xml
deleted file mode 100644
index 32de621477dc..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fontworkobjectbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:helpid="helpid:10978" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights" toolbar:helpid="helpid:10979" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:helpid="helpid:10981" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:helpid="helpid:10982" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fontworkshapetype.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fontworkshapetype.xml
deleted file mode 100644
index 49b5b8173e0e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fontworkshapetype.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-stop" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-pour" toolbar:helpid="helpid:10978" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formatobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formatobjectbar.xml
deleted file mode 100644
index 773befcc8ac7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formatobjectbar.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="helpid:5539" />
- <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:UnderlineDouble" toolbar:helpid="helpid:26648" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="helpid:26371" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="helpid:26373" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="helpid:26372" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:helpid="helpid:26374" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells" toolbar:helpid="helpid:26581" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="helpid:10907" />
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="helpid:10908" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="helpid:26375" toolbar:style="radio auto" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:AlignVCenter" toolbar:helpid="helpid:26377" toolbar:style="radio auto" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="helpid:26376" toolbar:style="radio auto" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatCurrency" toolbar:helpid="helpid:26045" />
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent" toolbar:helpid="helpid:26046" />
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatDate" toolbar:helpid="helpid:26053" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatScientific" toolbar:helpid="helpid:26055" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatStandard" toolbar:helpid="helpid:26052" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatIncDecimals" toolbar:helpid="helpid:26057" />
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatDecDecimals" toolbar:helpid="helpid:26058" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" toolbar:helpid="helpid:10461" />
- <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" toolbar:helpid="helpid:10462" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="helpid:10017" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:26267" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:26268" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:26236" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:26237" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleSheetGrid" toolbar:helpid="helpid:26238" toolbar:visible="true" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formcontrols.xml
deleted file mode 100644
index e8060319e9f8..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formcontrols.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox" toolbar:helpid="helpid:10596" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:helpid="helpid:10599" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField" toolbar:helpid="helpid:10728" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton" toolbar:helpid="helpid:10594" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:RadioButton" toolbar:helpid="helpid:10595" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ListBox" toolbar:helpid="helpid:10600" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ComboBox" toolbar:helpid="helpid:10601" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:helpid="helpid:10597" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:helpid="helpid:10769" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:helpid="helpid:10768" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools" toolbar:helpid="helpid:11046" />
- <toolbar:toolbaritem xlink:href=".uno:MoreControls" toolbar:helpid="helpid:11045" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards" toolbar:helpid="helpid:10727" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formdesign.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formdesign.xml
deleted file mode 100644
index 5a74f41f361d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formdesign.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer" toolbar:helpid="helpid:10633" />
- <toolbar:toolbaritem xlink:href=".uno:TabDialog" toolbar:helpid="helpid:10615" />
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:helpid="helpid:10623" />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="helpid:10454" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="helpid:10455" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:helpid="helpid:27096" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:helpid="helpid:27097" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709" />
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formsfilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formsfilterbar.xml
deleted file mode 100644
index be94f01b761f..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formsfilterbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormFilterNavigator" toolbar:helpid="helpid:10732" />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExecute" toolbar:helpid="helpid:10731" />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExit" toolbar:helpid="helpid:10730" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formsnavigationbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formsnavigationbar.xml
deleted file mode 100644
index ce47a450e2f5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formsnavigationbar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="10725"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecText" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:AbsoluteRecord" toolbar:helpid="10622"/>
- <toolbar:toolbaritem xlink:href=".uno:RecFromText" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RecTotal" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:FirstRecord" toolbar:helpid="10616"/>
- <toolbar:toolbaritem xlink:href=".uno:PrevRecord" toolbar:helpid="10618"/>
- <toolbar:toolbaritem xlink:href=".uno:NextRecord" toolbar:helpid="10617"/>
- <toolbar:toolbaritem xlink:href=".uno:LastRecord" toolbar:helpid="10619"/>
- <toolbar:toolbaritem xlink:href=".uno:NewRecord" toolbar:helpid="10620"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="10627"/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="10630"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRecord" toolbar:helpid="10621"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
- <toolbar:toolbaritem xlink:href=".uno:RefreshFormControl"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="10714"/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="10712"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="10713"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="10716"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="10723"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilter" toolbar:helpid="10729"/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="10711"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid" toolbar:helpid="10761"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formtextobjectbar.xml
deleted file mode 100644
index dbdeaf675371..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/formtextobjectbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fullscreenbar.xml
deleted file mode 100644
index 5aecdda4fb04..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/graffilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/graffilterbar.xml
deleted file mode 100644
index 287c33fe25e5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/graffilterbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterInvert" toolbar:helpid="helpid:34149" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth" toolbar:helpid="helpid:34150" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen" toolbar:helpid="helpid:34151" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRemoveNoise" toolbar:helpid="helpid:34152" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSolarize" toolbar:helpid="helpid:34159" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSepia" toolbar:helpid="helpid:34158" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPoster" toolbar:helpid="helpid:34156" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPopart" toolbar:helpid="helpid:34157" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSobel" toolbar:helpid="helpid:34153" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRelief" toolbar:helpid="helpid:34155" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterMosaic" toolbar:helpid="helpid:34154" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/graphicobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/graphicobjectbar.xml
deleted file mode 100644
index 25eca7950842..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/graphicobjectbar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="helpid:10469" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="helpid:10871" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="helpid:11016" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="helpid:10869" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="helpid:10143" />
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="helpid:10142" />
- <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="helpid:10299" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafAttrCrop" toolbar:helpid="helpid:10883" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:26412" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" />
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:helpid="helpid:10283" />
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="helpid:10282" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/insertbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/insertbar.xml
deleted file mode 100644
index 5f5b73310ee4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/insertbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:helpid="helpid:5563" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="helpid:10503" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241" />
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="helpid:26063" />
- <toolbar:toolbaritem xlink:href=".uno:DrawChart" toolbar:helpid="helpid:26071" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" toolbar:visible="false" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/insertcellsbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/insertcellsbar.xml
deleted file mode 100644
index c7b5b70cabcb..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/insertcellsbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertCellsDown" toolbar:helpid="helpid:26278" />
- <toolbar:toolbaritem xlink:href=".uno:InsertCellsRight" toolbar:helpid="helpid:26279" />
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:26267" />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:26268" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/mediaobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/mediaobjectbar.xml
deleted file mode 100644
index 2014343bf89b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/mediaobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox" toolbar:helpid="helpid:6693" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/moreformcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/moreformcontrols.xml
deleted file mode 100644
index cdcba63e9cc7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/moreformcontrols.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Imagebutton" toolbar:helpid="helpid:10604" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:helpid="helpid:10710" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl" toolbar:helpid="helpid:10605" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:DateField" toolbar:helpid="helpid:10704" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:TimeField" toolbar:helpid="helpid:10705" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:NumericField" toolbar:helpid="helpid:10706" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField" toolbar:helpid="helpid:10707" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:PatternField" toolbar:helpid="helpid:10708" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox" toolbar:helpid="helpid:10598" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Grid" toolbar:helpid="helpid:10603" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NavigationBar" toolbar:helpid="helpid:10607" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/previewbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/previewbar.xml
deleted file mode 100644
index ef1acbe344ce..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/previewbar.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:PreviousPage" toolbar:helpid="helpid:26497" />
- <toolbar:toolbaritem xlink:href=".uno:NextPage" toolbar:helpid="helpid:26496" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FirstPage" toolbar:helpid="helpid:26498" />
- <toolbar:toolbaritem xlink:href=".uno:LastPage" toolbar:helpid="helpid:26499" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomIn" toolbar:helpid="helpid:26501" />
- <toolbar:toolbaritem xlink:href=".uno:ZoomOut" toolbar:helpid="helpid:26502" />
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PageFormatDialog" toolbar:helpid="helpid:26295" />
- <toolbar:toolbaritem xlink:href=".uno:EditHeaderAndFooter" toolbar:helpid="helpid:26235" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Margins" toolbar:helpid="helpid:26504" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ScalingFactor" toolbar:helpid="helpid:26505" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="helpid:5325" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/standardbar.xml
deleted file mode 100644
index cb733829f67f..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/standardbar.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="helpid:5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501"/>
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505"/>
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="helpid:5502"/>
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="helpid:5325"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:helpid="helpid:20622"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="helpid:12021"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710"/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711"/>
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="helpid:5715"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701"/>
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="helpid:5678"/>
- <toolbar:toolbaritem xlink:href=".uno:SortAscending" toolbar:helpid="helpid:26344"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDescending" toolbar:helpid="helpid:26343"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="helpid:26155"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="helpid:10244"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="helpid:5960"/>
- <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="helpid:6660"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/starshapes.xml
deleted file mode 100644
index a2ff874d2fe7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12" toolbar:helpid="helpid:11007" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate" toolbar:helpid="helpid:11007" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/symbolshapes.xml
deleted file mode 100644
index 0fa6aee313db..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/textobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/textobjectbar.xml
deleted file mode 100644
index e76bd3970e13..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/textobjectbar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:UnderlineDouble" toolbar:helpid="helpid:26648" toolbar:style="auto" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="helpid:10028" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="helpid:10030" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="helpid:10029" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:helpid="helpid:10031" toolbar:style="radio auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:10294" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:10295" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="helpid:10907" />
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="helpid:10908" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="helpid:10017" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/toolbar.xml
deleted file mode 100644
index e42964a86b0b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/toolbar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:helpid="helpid:26626" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:InsCellsCtrl" toolbar:helpid="helpid:26627" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:InsObjCtrl" toolbar:helpid="helpid:26628" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:helpid="helpid:10593" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat" toolbar:helpid="helpid:10242" />
- <toolbar:toolbaritem xlink:href=".uno:ChooseDesign" toolbar:helpid="helpid:26082" />
- <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="helpid:10245" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DataFilterAutoFilter" toolbar:helpid="helpid:26325" />
- <toolbar:toolbaritem xlink:href=".uno:DataFilterStandardFilter" toolbar:helpid="helpid:26323" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:DataFilterSpecialFilter" toolbar:helpid="helpid:26324" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:DataDataPilotRun" toolbar:helpid="helpid:26151" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EuroConverter" toolbar:helpid="helpid:26083" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefineName" toolbar:helpid="helpid:26271" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:GoalSeekDialog" toolbar:helpid="helpid:26153" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Group" toolbar:helpid="helpid:26331" />
- <toolbar:toolbaritem xlink:href=".uno:Ungroup" toolbar:helpid="helpid:26332" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/viewerbar.xml b/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/viewerbar.xml
deleted file mode 100644
index d4d6a59d7ed5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/scalc/toolbar/viewerbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961" />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/schart/menubar/menubar.xml
deleted file mode 100644
index 3c50167ef845..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/menubar/menubar.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect" menu:helpid="5537" menu:label="" />
- <menu:menuitem menu:id=".uno:Open" menu:helpid="5501" menu:label="" />
- <menu:menuitem menu:id=".uno:AutoPilotMenu" menu:helpid="6381" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc" menu:helpid="5503" menu:label="" />
- <menu:menuitem menu:id=".uno:Save" menu:helpid="5505" menu:label="" />
- <menu:menuitem menu:id=".uno:SaveAs" menu:helpid="5502" menu:label="" />
- <menu:menuitem menu:id=".uno:SaveAll" menu:helpid="5309" menu:label="" />
- <menu:menuitem menu:id=".uno:Reload" menu:helpid="5508" menu:label="" />
- <menu:menuitem menu:id=".uno:VersionDialog" menu:helpid="6583" menu:label="" />
- <menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties" menu:helpid="5535" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Print" menu:helpid="5504" menu:label="" />
- <menu:menuitem menu:id=".uno:PrinterSetup" menu:helpid="5302" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit" menu:helpid="5300" menu:label="" />
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo" menu:helpid="5701" menu:label="" />
- <menu:menuitem menu:id=".uno:Redo" menu:helpid="5700" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut" menu:helpid="5710" menu:label="" />
- <menu:menuitem menu:id=".uno:Copy" menu:helpid="5711" menu:label="" />
- <menu:menuitem menu:id=".uno:Paste" menu:helpid="5712" menu:label="" />
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AvailableToolbars" menu:label="" />
- <menu:menuitem menu:id=".uno:StatusBarVisible" menu:helpid="5920" menu:label="" />
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow" menu:helpid="6680" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DiagramData" menu:helpid="30514" menu:label="" />
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertMenuTitles" menu:label="" />
- <menu:menuitem menu:id=".uno:InsertMenuLegend" menu:label="" />
- <menu:menuitem menu:id=".uno:InsertMenuAxes" menu:label="" />
- <menu:menuitem menu:id=".uno:InsertMenuGrids" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertMenuDataLabels" menu:label="" />
- <menu:menuitem menu:id=".uno:InsertMenuTrendlines" menu:label="" />
- <menu:menuitem menu:id=".uno:InsertMenuMeanValues" menu:label="" />
- <menu:menuitem menu:id=".uno:InsertMenuYErrorBars" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertSymbol" menu:helpid="10503" menu:label="" />
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormatSelection" menu:label="" />
- <menu:menuitem menu:id=".uno:TransformDialog" menu:helpid="10087" menu:label="" />
- <menu:menu menu:id=".uno:ArrangeRow" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Forward" menu:helpid="30594" menu:label="" />
- <menu:menuitem menu:id=".uno:Backward" menu:helpid="30595" menu:label="" />
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ChartTitleMenu" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MainTitle" menu:helpid="30557" menu:label="" />
- <menu:menuitem menu:id=".uno:SubTitle" menu:helpid="30558" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:XTitle" menu:helpid="30559" menu:label="" />
- <menu:menuitem menu:id=".uno:YTitle" menu:helpid="30560" menu:label="" />
- <menu:menuitem menu:id=".uno:ZTitle" menu:helpid="30561" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SecondaryXTitle" menu:label="" />
- <menu:menuitem menu:id=".uno:SecondaryYTitle" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AllTitles" menu:helpid="30562" menu:label="" />
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:Legend" menu:helpid="30521" menu:label="" />
- <menu:menu menu:id=".uno:DiagramAxisMenu" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DiagramAxisX" menu:helpid="30552" menu:label="" />
- <menu:menuitem menu:id=".uno:DiagramAxisY" menu:helpid="30553" menu:label="" />
- <menu:menuitem menu:id=".uno:DiagramAxisZ" menu:helpid="30554" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DiagramAxisA" menu:helpid="30616" menu:label="" />
- <menu:menuitem menu:id=".uno:DiagramAxisB" menu:helpid="30617" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DiagramAxisAll" menu:helpid="30555" menu:label="" />
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:DiagramGridMenu" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DiagramGridYMain" menu:helpid="30564" menu:label="" />
- <menu:menuitem menu:id=".uno:DiagramGridXMain" menu:helpid="30563" menu:label="" />
- <menu:menuitem menu:id=".uno:DiagramGridZMain" menu:helpid="30565" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DiagramGridYHelp" menu:helpid="30579" menu:label="" />
- <menu:menuitem menu:id=".uno:DiagramGridXHelp" menu:helpid="30578" menu:label="" />
- <menu:menuitem menu:id=".uno:DiagramGridZHelp" menu:helpid="30580" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DiagramGridAll" menu:helpid="30566" menu:label="" />
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DiagramWall" menu:helpid="30524" menu:label="" />
- <menu:menuitem menu:id=".uno:DiagramFloor" menu:helpid="30525" menu:label="" />
- <menu:menuitem menu:id=".uno:DiagramArea" menu:helpid="30526" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DiagramType" menu:helpid="30528" menu:label="" />
- <menu:menuitem menu:id=".uno:DataRanges" menu:helpid="30514" menu:label="" />
- <menu:menuitem menu:id=".uno:View3D" menu:helpid="30527" menu:label="" />
-
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu" menu:label="" >
- <menu:menupopup>
- <menu:menu menu:id=".uno:MacrosMenu" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder" menu:helpid="6669" menu:label="" />
- <menu:menuitem menu:id=".uno:RunMacro" menu:helpid="40011" menu:label="" />
- <menu:menu menu:id=".uno:ScriptOrganizer" menu:label="" />
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1" menu:helpid="40013" menu:label="" />
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:helpid="42772" />
- <menu:menuitem menu:id=".uno:ConfigureDialog" menu:helpid="5904" menu:label="" />
- <menu:menuitem menu:id=".uno:OptionsTreeDialog" menu:helpid="31630" menu:label="" />
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow" menu:helpid="5620" menu:label="" />
- <menu:menuitem menu:id=".uno:CloseWin" menu:helpid="5621" menu:label="" />
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/schart/statusbar/statusbar.xml
deleted file mode 100644
index 27af64165411..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/statusbar/statusbar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:Context" statusbar:align="left" statusbar:autosize="true" statusbar:width="208" statusbar:helpid="helpid:5310"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14" statusbar:helpid="helpid:5584"/>
-</statusbar:statusbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/arrowshapes.xml
deleted file mode 100644
index 4a53519494ea..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/basicshapes.xml
deleted file mode 100644
index e65778305788..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/calloutshapes.xml
deleted file mode 100644
index 91b957fa697a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/drawbar.xml b/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/drawbar.xml
deleted file mode 100644
index f4017835635c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/drawbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="27173"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:style="dropdown" toolbar:helpid="11002"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:style="dropdown" toolbar:helpid="11003"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:style="dropdown" toolbar:helpid="11004"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:style="dropdown" toolbar:helpid="11005"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:style="dropdown" toolbar:helpid="11006"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:style="dropdown" toolbar:helpid="11007"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/flowchartshapes.xml
deleted file mode 100644
index bb1d1099dbd4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/standardbar.xml
deleted file mode 100644
index 28b7f131af6a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/standardbar.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:helpid="helpid:5500" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/starshapes.xml
deleted file mode 100644
index a2ff874d2fe7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12" toolbar:helpid="helpid:11007" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate" toolbar:helpid="helpid:11007" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/symbolshapes.xml
deleted file mode 100644
index 0fa6aee313db..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/toolbar.xml
deleted file mode 100644
index 41d5bd41ab63..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/schart/toolbar/toolbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ChartElementSelector" />
- <toolbar:toolbaritem xlink:href=".uno:FormatSelection" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DiagramType" toolbar:helpid="helpid:30528" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DiagramData" toolbar:helpid="helpid:30514" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleGridHorizontal" toolbar:helpid="helpid:30533" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleLegend" toolbar:helpid="helpid:30530" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ScaleText" toolbar:helpid="helpid:30586" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NewArrangement" toolbar:helpid="helpid:30539" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/menubar/menubar.xml
deleted file mode 100644
index 55f620d867de..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/menubar/menubar.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuitem menu:id=".uno:VersionDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menuitem menu:id=".uno:ExportToPDF"/>
- <menu:menu menu:id=".uno:SendMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menuitem menu:id=".uno:Signature"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WebHtml"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteSpecial"/>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
- <menu:menuitem menu:id=".uno:SearchDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CopyObjects"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
- <menu:menuitem menu:id=".uno:GlueEditMode"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Morphing"/>
- <menu:menuitem menu:id=".uno:ModifyField"/>
- <menu:menuitem menu:id=".uno:DeletePage"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ManageLinks"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
- <menu:menuitem menu:id=".uno:ImageMapDialog"/>
- <menu:menuitem menu:id=".uno:ObjectMenue"/>
- <menu:menuitem menu:id=".uno:EditHyperlink"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:PageMode" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:MasterPage" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:DisplayQualityMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:OutputQualityColor" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:OutputQualityGrayscale" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:OutputQualityBlackWhite" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:LeftPaneDraw"/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuitem menu:id=".uno:ShowRuler"/>
- <menu:menu menu:id=".uno:GridMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:GridVisible"/>
- <menu:menuitem menu:id=".uno:GridUse"/>
- <menu:menuitem menu:id=".uno:GridFront"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:SnapLinesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelplinesVisible"/>
- <menu:menuitem menu:id=".uno:HelplinesUse"/>
- <menu:menuitem menu:id=".uno:HelplinesFront"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertPage"/>
- <menu:menuitem menu:id=".uno:DuplicatePage"/>
- <menu:menuitem menu:id=".uno:InsertLayer"/>
- <menu:menuitem menu:id=".uno:CapturePoint"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertDateFieldFix"/>
- <menu:menuitem menu:id=".uno:InsertDateFieldVar"/>
- <menu:menuitem menu:id=".uno:InsertTimeFieldFix"/>
- <menu:menuitem menu:id=".uno:InsertTimeFieldVar"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuitem menu:id=".uno:InsertPageField"/>
- <menu:menuitem menu:id=".uno:InsertPagesField"/>
- <menu:menuitem menu:id=".uno:InsertFileField"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuitem menu:id=".uno:InsertSymbol"/>
- <menu:menu menu:id=".uno:FormattingMarkMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
- <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
- <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
- <menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
- <menu:menuitem menu:id=".uno:InsertLRM"/>
- <menu:menuitem menu:id=".uno:InsertRLM"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:GraphicMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertGraphic"/>
- <menu:menu menu:id=".uno:Scan">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TwainSelect"/>
- <menu:menuitem menu:id=".uno:TwainTransfer"/>
- </menu:menupopup>
- </menu:menu>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertAVMedia"/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertObject"/>
- <menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertMath"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertObjectChart"/>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ImportFromFile"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetDefault"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:OutlineBullet"/>
- <menu:menuitem menu:id=".uno:PageSetup"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:TransliterateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
- <menu:menuitem menu:id=".uno:FormatArea"/>
- <menu:menuitem menu:id=".uno:TextAttributes"/>
- <menu:menuitem menu:id=".uno:GrafAttrCrop"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ModifyLayer"/>
- <menu:menuitem menu:id=".uno:DesignerDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SpellDialog"/>
- <menu:menu menu:id=".uno:LanguageMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
- <menu:menuitem menu:id=".uno:ChineseConversion"/>
- <menu:menuitem menu:id=".uno:ThesaurusDialog"/>
- <menu:menuitem menu:id=".uno:Hyphenation"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MoreDictionaries"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Gallery"/>
- <menu:menuitem menu:id=".uno:BmpMask"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuitem menu:id=".uno:MacroSignature"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ModifyMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ToggleObjectRotateMode"/>
- <menu:menu menu:id=".uno:MirrorMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MirrorVert"/>
- <menu:menuitem menu:id=".uno:MirrorHorz"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ConvertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeBezier"/>
- <menu:menuitem menu:id=".uno:ChangePolygon"/>
- <menu:menuitem menu:id=".uno:convert_to_contour"/>
- <menu:menuitem menu:id=".uno:ConvertInto3D"/>
- <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
- <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
- <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ArrangeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:BringToFront"/>
- <menu:menuitem menu:id=".uno:Forward"/>
- <menu:menuitem menu:id=".uno:Backward"/>
- <menu:menuitem menu:id=".uno:SendToBack"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:BeforeObject"/>
- <menu:menuitem menu:id=".uno:BehindObject"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ReverseOrder"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectAlign">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
- <menu:menuitem menu:id=".uno:AlignCenter"/>
- <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AlignUp"/>
- <menu:menuitem menu:id=".uno:AlignMiddle"/>
- <menu:menuitem menu:id=".uno:AlignDown"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:DistributeSelection"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
- <menu:menuitem menu:id=".uno:NameGroup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FormatGroup"/>
- <menu:menuitem menu:id=".uno:FormatUngroup"/>
- <menu:menuitem menu:id=".uno:EnterGroup"/>
- <menu:menuitem menu:id=".uno:LeaveGroup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Combine"/>
- <menu:menuitem menu:id=".uno:Dismantle"/>
- <menu:menu menu:id=".uno:PolyFormen">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Merge"/>
- <menu:menuitem menu:id=".uno:Substract"/>
- <menu:menuitem menu:id=".uno:Intersect"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Connect"/>
- <menu:menuitem menu:id=".uno:Break"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/statusbar/statusbar.xml
deleted file mode 100644
index 0872bd42f3f4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/statusbar/statusbar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:Context" statusbar:align="left" statusbar:autosize="true" statusbar:width="184" statusbar:helpid="helpid:5310"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="208" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="14" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:PageStatus" statusbar:align="left" statusbar:width="124" statusbar:helpid="helpid:27086"/>
- <statusbar:statusbaritem xlink:href=".uno:LayoutStatus" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:27087"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="36" statusbar:helpid="helpid:10000"/>
-</statusbar:statusbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/3dobjectsbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/3dobjectsbar.xml
deleted file mode 100644
index 841d960388fb..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/3dobjectsbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Cube" toolbar:helpid="helpid:27296" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Sphere" toolbar:helpid="helpid:27297" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Cylinder" toolbar:helpid="helpid:27298" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Cone" toolbar:helpid="helpid:27299" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Cyramid" toolbar:helpid="helpid:27300" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Torus" toolbar:helpid="helpid:27312" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Shell3D" toolbar:helpid="helpid:27311" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:HalfSphere" toolbar:helpid="helpid:27313" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/alignmentbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/alignmentbar.xml
deleted file mode 100644
index dbd7294e566c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/alignmentbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131" />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134" />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135" />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/arrowsbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/arrowsbar.xml
deleted file mode 100644
index 50a7b0af85ff..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/arrowsbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Line" toolbar:helpid="helpid:10102" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="helpid:27173" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowCircle" toolbar:helpid="helpid:27175" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowSquare" toolbar:helpid="helpid:27177" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Line_Diagonal" toolbar:helpid="helpid:10103" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowStart" toolbar:helpid="helpid:27172" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineCircleArrow" toolbar:helpid="helpid:27176" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineSquareArrow" toolbar:helpid="helpid:27178" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MeasureLine" toolbar:helpid="helpid:27051" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrows" toolbar:helpid="helpid:27174" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/arrowshapes.xml
deleted file mode 100644
index b1260e5410bc..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/basicshapes.xml
deleted file mode 100644
index e65778305788..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/bezierobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/bezierobjectbar.xml
deleted file mode 100644
index a711f4643918..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/bezierobjectbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="helpid:10126" toolbar:style="radio auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:helpid="helpid:10121" />
- <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:helpid="helpid:10119" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierDelete" toolbar:helpid="helpid:10120" />
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine" toolbar:helpid="helpid:10127" />
- <toolbar:toolbaritem xlink:href=".uno:BezierConvert" toolbar:helpid="helpid:27065" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:helpid="helpid:27066" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:helpid="helpid:10123" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:helpid="helpid:27067" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose" toolbar:helpid="helpid:10122" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints" toolbar:helpid="helpid:27030" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/calloutshapes.xml
deleted file mode 100644
index 91b957fa697a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/choosemodebar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/choosemodebar.xml
deleted file mode 100644
index 9e30bc62d094..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/choosemodebar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="helpid:10129" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLathe" toolbar:helpid="helpid:27008" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CrookRotate" toolbar:helpid="helpid:27090" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CrookSlant" toolbar:helpid="helpid:27091" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Shear" toolbar:helpid="helpid:27107" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InteractiveTransparence" toolbar:helpid="helpid:27100" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InteractiveGradient" toolbar:helpid="helpid:27101" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/colorbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/colorbar.xml
deleted file mode 100644
index adcda76b5c3a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/colorbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/commentsbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/commentsbar.xml
deleted file mode 100644
index 07c42d262758..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/commentsbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="helpid:26276"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviousAnnotation" toolbar:helpid="helpid:11095"/>
- <toolbar:toolbaritem xlink:href=".uno:NextAnnotation" toolbar:helpid="helpid:11094"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteAnnotation" toolbar:helpid="helpid:11093"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteAllAnnotation" toolbar:helpid="helpid:11096"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/connectorsbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/connectorsbar.xml
deleted file mode 100644
index b33662343f51..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/connectorsbar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Connector" toolbar:helpid="27058"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorArrowStart" toolbar:visible="false" toolbar:helpid="27119"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorArrowEnd" toolbar:helpid="27120"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorArrows" toolbar:helpid="27121"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCircleStart" toolbar:visible="false" toolbar:helpid="27122"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCircleEnd" toolbar:visible="false" toolbar:helpid="27123"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCircles" toolbar:visible="false" toolbar:helpid="27124"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLines" toolbar:helpid="27139"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowStart" toolbar:visible="false" toolbar:helpid="27140"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowEnd" toolbar:helpid="27141"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrows" toolbar:helpid="27142"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleStart" toolbar:visible="false" toolbar:helpid="27143"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleEnd" toolbar:visible="false" toolbar:helpid="27144"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircles" toolbar:visible="false" toolbar:helpid="27145"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLine" toolbar:helpid="27125"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrowStart" toolbar:visible="false" toolbar:helpid="27126"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrowEnd" toolbar:helpid="27127"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrows" toolbar:helpid="27128"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircleStart" toolbar:visible="false" toolbar:helpid="27129"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircleEnd" toolbar:visible="false" toolbar:helpid="27130"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircles" toolbar:visible="false" toolbar:helpid="27131"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurve" toolbar:helpid="27132"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrowStart" toolbar:visible="false" toolbar:helpid="27133"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrowEnd" toolbar:helpid="27134"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrows" toolbar:helpid="27135"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircleStart" toolbar:visible="false" toolbar:helpid="27136"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircleEnd" toolbar:visible="false" toolbar:helpid="27137"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircles" toolbar:visible="false" toolbar:helpid="27138"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/drawingobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/drawingobjectbar.xml
deleted file mode 100644
index 4c322a9028b6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/drawingobjectbar.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143"/>
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="10169"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="10164"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="10299"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false" toolbar:helpid="10371"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/ellipsesbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/ellipsesbar.xml
deleted file mode 100644
index 84ccaf854009..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/ellipsesbar.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Circle" toolbar:helpid="helpid:10385" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:helpid="helpid:10112" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CirclePie" toolbar:helpid="helpid:10388" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:EllipseCut" toolbar:helpid="helpid:10392" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:helpid="helpid:10115" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse_Unfilled" toolbar:helpid="helpid:10384" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Circle_Unfilled" toolbar:helpid="helpid:10386" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Pie_Unfilled" toolbar:helpid="helpid:10387" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CirclePie_Unfilled" toolbar:helpid="helpid:10389" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:EllipseCut_Unfilled" toolbar:helpid="helpid:10393" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CircleCut_Unfilled" toolbar:helpid="helpid:10391" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:helpid="helpid:10114" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CircleArc" toolbar:helpid="helpid:10390" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/extrusionobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/extrusionobjectbar.xml
deleted file mode 100644
index 148849db6ee7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/extrusionobjectbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/findbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/findbar.xml
deleted file mode 100644
index 49e483e178a3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/findbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FindText"/>
- <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
- <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/flowchartshapes.xml
deleted file mode 100644
index 696a713424cd..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fontworkobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fontworkobjectbar.xml
deleted file mode 100644
index 32de621477dc..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fontworkobjectbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:helpid="helpid:10978" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights" toolbar:helpid="helpid:10979" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:helpid="helpid:10981" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:helpid="helpid:10982" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fontworkshapetype.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fontworkshapetype.xml
deleted file mode 100644
index 49b5b8173e0e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fontworkshapetype.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-stop" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-pour" toolbar:helpid="helpid:10978" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formcontrols.xml
deleted file mode 100644
index f0b802f28559..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formcontrols.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox" toolbar:helpid="helpid:10596" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:helpid="helpid:10599" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField" toolbar:helpid="helpid:10728" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton" toolbar:helpid="helpid:10594" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:RadioButton" toolbar:helpid="helpid:10595" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ListBox" toolbar:helpid="helpid:10600" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ComboBox" toolbar:helpid="helpid:10601" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:helpid="helpid:10597" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools" toolbar:helpid="helpid:11046" />
- <toolbar:toolbaritem xlink:href=".uno:MoreControls" toolbar:helpid="helpid:11045" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards" toolbar:helpid="helpid:10727" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formdesign.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formdesign.xml
deleted file mode 100644
index 01f59fb34b91..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formdesign.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer" toolbar:helpid="helpid:10633" />
- <toolbar:toolbaritem xlink:href=".uno:TabDialog" toolbar:helpid="helpid:10615" />
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:helpid="helpid:10623" />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="helpid:10454" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="helpid:10455" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:helpid="helpid:27096" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:helpid="helpid:27097" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709" />
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formsfilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formsfilterbar.xml
deleted file mode 100644
index 311ae87a37af..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formsfilterbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormFilterNavigator" toolbar:helpid="helpid:10732" />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExecute" toolbar:helpid="helpid:10731" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExit" toolbar:helpid="helpid:10730" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formsnavigationbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formsnavigationbar.xml
deleted file mode 100644
index c6e16444a55d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formsnavigationbar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="10725"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecText" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:AbsoluteRecord" toolbar:helpid="10622"/>
- <toolbar:toolbaritem xlink:href=".uno:RecFromText" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RecTotal" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:FirstRecord" toolbar:helpid="10616"/>
- <toolbar:toolbaritem xlink:href=".uno:PrevRecord" toolbar:helpid="10618"/>
- <toolbar:toolbaritem xlink:href=".uno:NextRecord" toolbar:helpid="10617"/>
- <toolbar:toolbaritem xlink:href=".uno:LastRecord" toolbar:helpid="10619"/>
- <toolbar:toolbaritem xlink:href=".uno:NewRecord" toolbar:helpid="10620"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="10627"/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="10630"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRecord" toolbar:helpid="10621"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="10714"/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="10712"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="10713"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="10716"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="10723"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilter" toolbar:helpid="10729"/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="10711"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid" toolbar:helpid="10761"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formtextobjectbar.xml
deleted file mode 100644
index dbdeaf675371..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/formtextobjectbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fullscreenbar.xml
deleted file mode 100644
index 5aecdda4fb04..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/gluepointsobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/gluepointsobjectbar.xml
deleted file mode 100644
index b6c8501f4044..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/gluepointsobjectbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GlueInsertPoint" toolbar:helpid="helpid:27302" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionLeft" toolbar:helpid="helpid:27314" />
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionTop" toolbar:helpid="helpid:27316" />
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionRight" toolbar:helpid="helpid:27315" />
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionBottom" toolbar:helpid="helpid:27317" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GluePercent" toolbar:helpid="helpid:27303" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignLeft" toolbar:helpid="helpid:27306" />
- <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignCenter" toolbar:helpid="helpid:27305" />
- <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignRight" toolbar:helpid="helpid:27307" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignTop" toolbar:helpid="helpid:27309" />
- <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignCenter" toolbar:helpid="helpid:27308" />
- <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignBottom" toolbar:helpid="helpid:27310" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/graffilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/graffilterbar.xml
deleted file mode 100644
index 287c33fe25e5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/graffilterbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterInvert" toolbar:helpid="helpid:34149" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth" toolbar:helpid="helpid:34150" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen" toolbar:helpid="helpid:34151" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRemoveNoise" toolbar:helpid="helpid:34152" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSolarize" toolbar:helpid="helpid:34159" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSepia" toolbar:helpid="helpid:34158" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPoster" toolbar:helpid="helpid:34156" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPopart" toolbar:helpid="helpid:34157" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSobel" toolbar:helpid="helpid:34153" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRelief" toolbar:helpid="helpid:34155" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterMosaic" toolbar:helpid="helpid:34154" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/graphicobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/graphicobjectbar.xml
deleted file mode 100644
index 43956d085f3c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/graphicobjectbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="helpid:10469" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="helpid:10871" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="helpid:11016" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="helpid:10867" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="helpid:10143" />
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="helpid:10142" />
- <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="helpid:10299" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Crop" toolbar:helpid="helpid:10883" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/insertbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/insertbar.xml
deleted file mode 100644
index 8313e1ab9cb6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/insertbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertPage" toolbar:helpid="helpid:27014" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:helpid="helpid:5563" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:helpid="helpid:27015" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:10141" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241" />
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695" />
- <toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:helpid="helpid:5676" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:helpid="helpid:5677" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertMath" toolbar:helpid="helpid:27106" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="helpid:10140" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/linesbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/linesbar.xml
deleted file mode 100644
index d0f9f8f90e18..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/linesbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BezierFill" toolbar:helpid="helpid:10118" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon" toolbar:helpid="helpid:10117" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:helpid="helpid:10394" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:helpid="helpid:10463" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="helpid:10397" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="helpid:10395" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:helpid="helpid:10396" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="helpid:10464" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/masterviewtoolbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/masterviewtoolbar.xml
deleted file mode 100644
index 994c537a0aad..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/masterviewtoolbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertMasterPage" toolbar:helpid="helpid:27430" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteMasterPage" toolbar:helpid="helpid:27431" />
- <toolbar:toolbaritem xlink:href=".uno:RenameMasterPage" toolbar:helpid="helpid:27432" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CloseMasterView" toolbar:helpid="helpid:27433" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/mediaobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/mediaobjectbar.xml
deleted file mode 100644
index 2014343bf89b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/mediaobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox" toolbar:helpid="helpid:6693" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/moreformcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/moreformcontrols.xml
deleted file mode 100644
index 275c733e7340..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/moreformcontrols.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SpinButton" toolbar:helpid="helpid:10769" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:helpid="helpid:10768" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton" toolbar:helpid="helpid:10604" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:helpid="helpid:10710" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl" toolbar:helpid="helpid:10605" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:DateField" toolbar:helpid="helpid:10704" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:TimeField" toolbar:helpid="helpid:10705" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:NumericField" toolbar:helpid="helpid:10706" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField" toolbar:helpid="helpid:10707" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:PatternField" toolbar:helpid="helpid:10708" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox" toolbar:helpid="helpid:10598" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Grid" toolbar:helpid="helpid:10603" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NavigationBar" toolbar:helpid="helpid:10607" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optimizetablebar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optimizetablebar.xml
deleted file mode 100644
index bf97f65ae9cb..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optimizetablebar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DistributeColumns" toolbar:helpid="helpid:20582" />
- <toolbar:toolbaritem xlink:href=".uno:DistributeRows" toolbar:helpid="helpid:20583" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml
deleted file mode 100644
index dac856b7669c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ClickChangeRotation" toolbar:helpid="helpid:27170" toolbar:style="auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesVisible" toolbar:helpid="helpid:27324" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" toolbar:style="auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesUse" toolbar:helpid="helpid:27152" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:SnapBorder" toolbar:helpid="helpid:27155" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:SnapFrame" toolbar:helpid="helpid:27156" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:SnapPoints" toolbar:helpid="helpid:27157" toolbar:style="auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:QuickEdit" toolbar:helpid="helpid:27158" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:PickThrough" toolbar:helpid="helpid:27159" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:DoubleClickTextEdit" toolbar:helpid="helpid:27169" toolbar:style="auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:helpid="helpid:27151" toolbar:style="auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeaveAllGroups" toolbar:helpid="helpid:27345" toolbar:style="auto" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/positionbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/positionbar.xml
deleted file mode 100644
index 5f571924d72a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/positionbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" />
- <toolbar:toolbaritem xlink:href=".uno:Forward" toolbar:helpid="helpid:27031" />
- <toolbar:toolbaritem xlink:href=".uno:Backward" toolbar:helpid="helpid:27032" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BeforeObject" toolbar:helpid="helpid:27326" />
- <toolbar:toolbaritem xlink:href=".uno:BehindObject" toolbar:helpid="helpid:27116" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ReverseOrder" toolbar:helpid="helpid:27117" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/rectanglesbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/rectanglesbar.xml
deleted file mode 100644
index 2716265612f4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/rectanglesbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="helpid:10104" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square" toolbar:helpid="helpid:10380" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Rect_Rounded" toolbar:helpid="helpid:10105" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square_Rounded" toolbar:helpid="helpid:10381" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Rect_Unfilled" toolbar:helpid="helpid:10378" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square_Unfilled" toolbar:helpid="helpid:10382" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Rect_Rounded_Unfilled" toolbar:helpid="helpid:10379" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square_Rounded_Unfilled" toolbar:helpid="helpid:10383" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/standardbar.xml
deleted file mode 100644
index a53982f43767..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/standardbar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501"/>
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:helpid="20622"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="5710"/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="5711"/>
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="5712"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="5715"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/>
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Window3D" toolbar:helpid="helpid:10644" toolbar:style="auto" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:helpid="10096"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/starshapes.xml
deleted file mode 100644
index a2ff874d2fe7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12" toolbar:helpid="helpid:11007" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate" toolbar:helpid="helpid:11007" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/symbolshapes.xml
deleted file mode 100644
index 0e96bcf78134..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/tableobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/tableobjectbar.xml
deleted file mode 100644
index 57726de89461..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/tableobjectbar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="helpid:10164"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MergeCells" toolbar:helpid="helpid:20506" />
- <toolbar:toolbaritem xlink:href=".uno:SplitCell" toolbar:helpid="helpid:20505" />
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:helpid="helpid:20510" toolbar:style="dropdown" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:helpid="helpid:20585" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:helpid="helpid:20586" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:helpid="helpid:20587" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:20501" />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:20502" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:20503" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:20504" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:helpid="helpid:20515" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:helpid="helpid:20514" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:helpid="helpid:20513" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableDesign" toolbar:helpid="helpid:10429" />
- <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:helpid="helpid:20459" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/textbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/textbar.xml
deleted file mode 100644
index 4bd5672237d3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/textbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Text" toolbar:helpid="helpid:10006" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:TextFitToSizeTool" toolbar:helpid="helpid:27285" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="helpid:10254" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="helpid:10905" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VerticalTextFitToSizeTool" toolbar:helpid="helpid:27286" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="helpid:10906" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/textobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/textobjectbar.xml
deleted file mode 100644
index d364ca42e771..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/textobjectbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="10007"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="10015"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="10009"/>
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="10008"/>
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="10014"/>
- <toolbar:toolbaritem xlink:href=".uno:Shadowed" toolbar:helpid="10010"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="10028"/>
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="10030"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="10029"/>
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="10031"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="10950"/>
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="10951"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaspaceIncrease" toolbar:helpid="27346"/>
- <toolbar:toolbaritem xlink:href=".uno:ParaspaceDecrease" toolbar:helpid="27347"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="10034"/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="10035"/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="10036"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/>
- <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:helpid="helpid:20403"/>
- <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:helpid="helpid:20404"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="10907"/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="10908"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="10296"/>
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="10297"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false" toolbar:helpid="27019"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/toolbar.xml
deleted file mode 100644
index 9bd802585f6f..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/toolbar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="helpid:10102" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="helpid:27173" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:10104" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:helpid="helpid:10398" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="helpid:10398" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineToolbox" toolbar:helpid="helpid:10401" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:ConnectorToolbox" toolbar:helpid="helpid:27028" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowsToolbox" toolbar:helpid=".uno:ArrowsToolbox" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:Objects3DToolbox" toolbar:helpid="helpid:27295" toolbar:style="radio dropdown" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="helpid:11002" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="helpid:11003" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="helpid:11004" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="helpid:11005" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="helpid:11006" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="helpid:11007" toolbar:style="radio dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
- <toolbar:toolbaritem xlink:href=".uno:GlueEditMode" toolbar:helpid="helpid:27301" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:ChangeBezier" toolbar:helpid="helpid:27036" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ChangePolygon" toolbar:helpid="helpid:27037" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ConvertInto3D" toolbar:helpid="helpid:10648" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLatheFast" toolbar:helpid="helpid:10649" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241" />
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="helpid:5960" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:helpid="helpid:27095" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:helpid="helpid:27022" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:helpid="helpid:27318" toolbar:style="radio dropdown" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:helpid="helpid:10593" toolbar:style="dropdown" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/viewerbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/viewerbar.xml
deleted file mode 100644
index d4d6a59d7ed5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/viewerbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961" />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/zoombar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/zoombar.xml
deleted file mode 100644
index fa59303d6176..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/zoombar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom100Percent" toolbar:helpid="10099"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPrevious" toolbar:visible="false" toolbar:helpid="10403"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomNext" toolbar:visible="false" toolbar:helpid="10402"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPage" toolbar:helpid="10100"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPageWidth" toolbar:helpid="27098"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomOptimal" toolbar:helpid="10101"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomObjects" toolbar:helpid="27099"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPanning" toolbar:helpid="27017"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/menubar/menubar.xml
deleted file mode 100644
index e643158b2506..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/menubar/menubar.xml
+++ /dev/null
@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuitem menu:id=".uno:VersionDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menuitem menu:id=".uno:ExportToPDF"/>
- <menu:menu menu:id=".uno:SendToMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:NewGlobalDoc"/>
- <menu:menuitem menu:id=".uno:NewHtmlDoc"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SendOutlineToStarImpress"/>
- <menu:menuitem menu:id=".uno:SendOutlineToClipboard"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CreateAbstract"/>
- <menu:menuitem menu:id=".uno:SendAbstractToStarImpress"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WebHtml"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PrintPreview"/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuitem menu:id=".uno:Repeat"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteSpecial"/>
- <menu:menu menu:id=".uno:SelectionModeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectionModeDefault" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SelectionModeBlock" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:SelectTextMode"/>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ChangesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TrackChanges"/>
- <menu:menuitem menu:id=".uno:ProtectTraceChangeMode"/>
- <menu:menuitem menu:id=".uno:ShowTrackedChanges"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AcceptTrackedChanges"/>
- <menu:menuitem menu:id=".uno:CommentChangeTracking"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:CompareDocuments"/>
- <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
- <menu:menuitem menu:id=".uno:SearchDialog"/>
- <menu:menuitem menu:id=".uno:EditGlossary"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
- <menu:menuitem menu:id=".uno:FieldDialog"/>
- <menu:menuitem menu:id=".uno:EditFootnote"/>
- <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
- <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
- <menu:menuitem menu:id=".uno:EditHyperlink"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
- <menu:menuitem menu:id=".uno:ImageMapDialog"/>
- <menu:menuitem menu:id=".uno:ObjectMenue"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:PrintLayout" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:BrowseView" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuitem menu:id=".uno:Ruler"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewBounds"/>
- <menu:menuitem menu:id=".uno:Marks"/>
- <menu:menuitem menu:id=".uno:Fieldnames"/>
- <menu:menuitem menu:id=".uno:ControlCodes"/>
- <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
- <menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertBreak"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertSymbol"/>
- <menu:menu menu:id=".uno:FormattingMarkMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
- <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
- <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
- <menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
- <menu:menuitem menu:id=".uno:InsertLRM"/>
- <menu:menuitem menu:id=".uno:InsertRLM"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertSection"/>
- <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertPageHeader"/>
- <menu:menuitem menu:id=".uno:InsertPageFooter"/>
- <menu:menuitem menu:id=".uno:InsertFootnoteDialog"/>
- <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
- <menu:menuitem menu:id=".uno:InsertBookmark"/>
- <menu:menuitem menu:id=".uno:InsertReferenceField"/>
- <menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuitem menu:id=".uno:InsertScript"/>
- <menu:menu menu:id=".uno:IndexesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertIndexesEntry"/>
- <menu:menuitem menu:id=".uno:InsertMultiIndex"/>
- <menu:menuitem menu:id=".uno:InsertAuthoritiesEntry"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertEnvelope"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertFrame"/>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertGraphicRuler"/>
- <menu:menu menu:id=".uno:GraphicMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertGraphic"/>
- <menu:menu menu:id=".uno:Scan">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TwainSelect"/>
- <menu:menuitem menu:id=".uno:TwainTransfer"/>
- </menu:menupopup>
- </menu:menu>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertAVMedia"/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertObject"/>
- <menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
- <menu:menuitem menu:id=".uno:InsertObjectChart"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertDoc"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:TransliterateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:RubyDialog"/>
- <menu:menuitem menu:id=".uno:FormatColumns"/>
- <menu:menuitem menu:id=".uno:EditRegion"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DesignerDialog"/>
- <menu:menu menu:id=".uno:AutoFormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:OnlineAutoFormat"/>
- <menu:menuitem menu:id=".uno:AutoFormatApply"/>
- <menu:menuitem menu:id=".uno:AutoFormatRedlineApply"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:AnchorMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WrapMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:WrapOff"/>
- <menu:menuitem menu:id=".uno:WrapOn"/>
- <menu:menuitem menu:id=".uno:WrapIdeal"/>
- <menu:menuitem menu:id=".uno:WrapThrough"/>
- <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WrapContour"/>
- <menu:menuitem menu:id=".uno:ContourDialog"/>
- <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TextWrap"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectAlign">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ArrangeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:BringToFront"/>
- <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
- <menu:menuitem menu:id=".uno:ObjectBackOne"/>
- <menu:menuitem menu:id=".uno:SendToBack"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
- <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FlipMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:GroupMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormatGroup"/>
- <menu:menuitem menu:id=".uno:FormatUngroup"/>
- <menu:menuitem menu:id=".uno:EnterGroup"/>
- <menu:menuitem menu:id=".uno:LeaveGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
- <menu:menuitem menu:id=".uno:FormatArea"/>
- <menu:menuitem menu:id=".uno:TextAttributes"/>
- <menu:menuitem menu:id=".uno:FontWork"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
- <menu:menuitem menu:id=".uno:NameGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:FrameDialog"/>
- <menu:menuitem menu:id=".uno:GraphicDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:TableInsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertRowDialog"/>
- <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableDeleteMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DeleteTable"/>
- <menu:menuitem menu:id=".uno:DeleteRows"/>
- <menu:menuitem menu:id=".uno:DeleteColumns"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableSelectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectTable"/>
- <menu:menuitem menu:id=".uno:EntireRow"/>
- <menu:menuitem menu:id=".uno:EntireColumn"/>
- <menu:menuitem menu:id=".uno:EntireCell"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:MergeCells"/>
- <menu:menuitem menu:id=".uno:SplitCell"/>
- <menu:menuitem menu:id=".uno:Protect"/>
- <menu:menuitem menu:id=".uno:MergeTable"/>
- <menu:menuitem menu:id=".uno:SplitTable"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoFormat"/>
- <menu:menu menu:id=".uno:TableAutoFitMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:DistributeColumns"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetRowHeight"/>
- <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
- <menu:menuitem menu:id=".uno:DistributeRows"/>
- <menu:menuitem menu:id=".uno:RowSplit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:HeadingRowsRepeat"/>
- <menu:menu menu:id=".uno:TableConvertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ConvertTextToTable"/>
- <menu:menuitem menu:id=".uno:ConvertTableToText"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:TableSort"/>
- <menu:menuitem menu:id=".uno:InsertFormula"/>
- <menu:menuitem menu:id=".uno:TableNumberFormatDialog"/>
- <menu:menuitem menu:id=".uno:TableBoundaries"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TableDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SpellingAndGrammarDialog"/>
- <menu:menu menu:id=".uno:LanguageMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetLanguageSelectionMenu"/>
- <menu:menuitem menu:id=".uno:SetLanguageParagraphMenu"/>
- <menu:menuitem menu:id=".uno:SetLanguageAllTextMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
- <menu:menuitem menu:id=".uno:ChineseConversion"/>
- <menu:menuitem menu:id=".uno:ThesaurusDialog"/>
- <menu:menuitem menu:id=".uno:Hyphenate"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MoreDictionaries"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:WordCountDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChapterNumberingDialog"/>
- <menu:menuitem menu:id=".uno:LineNumberingDialog"/>
- <menu:menuitem menu:id=".uno:FootnoteDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Gallery"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:BibliographyComponent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SortDialog"/>
- <menu:menuitem menu:id=".uno:CalculateSel"/>
- <menu:menu menu:id=".uno:UpdateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:UpdateAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:UpdateFields"/>
- <menu:menuitem menu:id=".uno:UpdateAllLinks"/>
- <menu:menuitem menu:id=".uno:UpdateCharts"/>
- <menu:menuitem menu:id=".uno:UpdateCurIndex"/>
- <menu:menuitem menu:id=".uno:UpdateAllIndexes"/>
- <menu:menuitem menu:id=".uno:Repaginate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuitem menu:id=".uno:MacroSignature"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/statusbar/statusbar.xml
deleted file mode 100644
index 3e46300cd0e7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/statusbar/statusbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:21181"/>
- <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79" statusbar:helpid="helpid:21182"/>
- <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63" statusbar:helpid="helpid:11064"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35" statusbar:helpid="helpid:10000"/>
-</statusbar:statusbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/alignmentbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/alignmentbar.xml
deleted file mode 100644
index 7b6bb3e61d2e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/alignmentbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131" />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134" />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135" />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/arrowshapes.xml
deleted file mode 100644
index 4a53519494ea..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/basicshapes.xml
deleted file mode 100644
index e65778305788..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/bezierobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/bezierobjectbar.xml
deleted file mode 100644
index a17067c335ec..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/bezierobjectbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="helpid:10126" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:helpid="helpid:10121" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:helpid="helpid:10119" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierDelete" toolbar:helpid="helpid:10120" />
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine" toolbar:helpid="helpid:10127" />
- <toolbar:toolbaritem xlink:href=".uno:BezierConvert" toolbar:helpid="helpid:27065" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:helpid="helpid:27066" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:helpid="helpid:10123" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:helpid="helpid:27067" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose" toolbar:helpid="helpid:10122" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints" toolbar:helpid="helpid:27030" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/calloutshapes.xml
deleted file mode 100644
index e708b70bbc4a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/colorbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/colorbar.xml
deleted file mode 100644
index e42bbfb49ad6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/colorbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawbar.xml
deleted file mode 100644
index 2407475a88f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
- <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false" toolbar:helpid="10114"/>
- <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false" toolbar:helpid="10112"/>
- <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false" toolbar:helpid="10115"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/>
- <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false" toolbar:helpid="10465"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="10906"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="11004"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="11005"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="11007"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="10977"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawingobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawingobjectbar.xml
deleted file mode 100644
index 3c64a4678780..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawingobjectbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="helpid:10143" />
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="helpid:10301" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="helpid:10169" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="helpid:10171" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="helpid:10172" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="helpid:10142" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="helpid:10164" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false" toolbar:helpid="27322"/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:visible="false" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:visible="false" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:visible="false" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false" toolbar:helpid="20584"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:helpid="10283"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="10282"/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="10455"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="10454"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawtextobjectbar.xml
deleted file mode 100644
index 5734555531d7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/drawtextobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="helpid:10017" toolbar:style="dropdown" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="helpid:10907" />
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="helpid:10908" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/extrusionobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/extrusionobjectbar.xml
deleted file mode 100644
index 148849db6ee7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/extrusionobjectbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/findbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/findbar.xml
deleted file mode 100644
index 49e483e178a3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/findbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FindText"/>
- <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
- <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/flowchartshapes.xml
deleted file mode 100644
index bb1d1099dbd4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fontworkobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fontworkobjectbar.xml
deleted file mode 100644
index 32de621477dc..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fontworkobjectbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:helpid="helpid:10978" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights" toolbar:helpid="helpid:10979" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:helpid="helpid:10981" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:helpid="helpid:10982" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fontworkshapetype.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fontworkshapetype.xml
deleted file mode 100644
index 49b5b8173e0e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fontworkshapetype.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-stop" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-pour" toolbar:helpid="helpid:10978" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formcontrols.xml
deleted file mode 100644
index 692fceee16f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formcontrols.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox" toolbar:helpid="helpid:10596" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:helpid="helpid:10599" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField" toolbar:helpid="helpid:10728" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton" toolbar:helpid="helpid:10594" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:RadioButton" toolbar:helpid="helpid:10595" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ListBox" toolbar:helpid="helpid:10600" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ComboBox" toolbar:helpid="helpid:10601" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:helpid="helpid:10597" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MoreControls" toolbar:helpid="helpid:11045" />
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools" toolbar:helpid="helpid:11046" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards" toolbar:helpid="helpid:10727" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formdesign.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formdesign.xml
deleted file mode 100644
index 8598b48bd762..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formdesign.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer" toolbar:helpid="helpid:10633" />
- <toolbar:toolbaritem xlink:href=".uno:TabDialog" toolbar:helpid="helpid:10615" />
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:helpid="helpid:10623" />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="helpid:10454" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="helpid:10455" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:helpid="helpid:27096" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:helpid="helpid:27097" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709" />
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formsfilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formsfilterbar.xml
deleted file mode 100644
index 7ebaa53250bb..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formsfilterbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormFilterExecute" toolbar:helpid="helpid:10731" />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator" toolbar:helpid="helpid:10732" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExit" toolbar:helpid="helpid:10730" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formsnavigationbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formsnavigationbar.xml
deleted file mode 100644
index c6e16444a55d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formsnavigationbar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="10725"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecText" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:AbsoluteRecord" toolbar:helpid="10622"/>
- <toolbar:toolbaritem xlink:href=".uno:RecFromText" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RecTotal" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:FirstRecord" toolbar:helpid="10616"/>
- <toolbar:toolbaritem xlink:href=".uno:PrevRecord" toolbar:helpid="10618"/>
- <toolbar:toolbaritem xlink:href=".uno:NextRecord" toolbar:helpid="10617"/>
- <toolbar:toolbaritem xlink:href=".uno:LastRecord" toolbar:helpid="10619"/>
- <toolbar:toolbaritem xlink:href=".uno:NewRecord" toolbar:helpid="10620"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="10627"/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="10630"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRecord" toolbar:helpid="10621"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="10714"/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="10712"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="10713"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="10716"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="10723"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilter" toolbar:helpid="10729"/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="10711"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid" toolbar:helpid="10761"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formtextobjectbar.xml
deleted file mode 100644
index dbdeaf675371..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/formtextobjectbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/frameobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/frameobjectbar.xml
deleted file mode 100644
index 2225e004ae41..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/frameobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="helpid:20472" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="helpid:20473" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:helpid="helpid:20563" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:helpid="helpid:20572" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:helpid="helpid:20573" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="helpid:20474" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="helpid:20475" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="helpid:20477" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="helpid:20476" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="helpid:20478" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="helpid:20480" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="helpid:20479" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="helpid:20456" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ChainFrames" toolbar:helpid="helpid:21736" />
- <toolbar:toolbaritem xlink:href=".uno:UnhainFrames" toolbar:helpid="helpid:21737" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fullscreenbar.xml
deleted file mode 100644
index 87ff9203a9ff..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/graffilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/graffilterbar.xml
deleted file mode 100644
index 67b6f17923ab..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/graffilterbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterInvert" toolbar:helpid="helpid:34149" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth" toolbar:helpid="helpid:34150" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen" toolbar:helpid="helpid:34151" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRemoveNoise" toolbar:helpid="helpid:34152" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSolarize" toolbar:helpid="helpid:34159" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSepia" toolbar:helpid="helpid:34158" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPoster" toolbar:helpid="helpid:34156" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPopart" toolbar:helpid="helpid:34157" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSobel" toolbar:helpid="helpid:34153" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRelief" toolbar:helpid="helpid:34155" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterMosaic" toolbar:helpid="helpid:34154" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/graphicobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/graphicobjectbar.xml
deleted file mode 100644
index 040bb8cd8ae6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/graphicobjectbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="11016"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
- <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/insertbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/insertbar.xml
deleted file mode 100644
index 41bc831962c1..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/insertbar.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSection" toolbar:helpid="21419"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract" toolbar:helpid="20333"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false" toolbar:helpid="helpid:5563" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFootnote" toolbar:helpid="20399"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertEndnote" toolbar:helpid="21418"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="20329"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertBookmark" toolbar:helpid="20302"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertReferenceField" toolbar:visible="false" toolbar:helpid="20313"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDoc" toolbar:helpid="5532"/>
- <toolbar:toolbaritem xlink:href=".uno:EditGlossary"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="20328"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl" toolbar:helpid="52824"/>
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:visible="false" toolbar:helpid="10593"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="20369"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false" toolbar:helpid="helpid:5561" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false" toolbar:helpid="helpid:5672" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex" toolbar:helpid="21420"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:helpid="20335"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/insertobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/insertobjectbar.xml
deleted file mode 100644
index ac28eb82bd11..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/insertobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:helpid="helpid:5563" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/mediaobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/mediaobjectbar.xml
deleted file mode 100644
index 35d0d138de84..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/mediaobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox" toolbar:helpid="helpid:6693"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/moreformcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/moreformcontrols.xml
deleted file mode 100644
index be3498c7f92b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/moreformcontrols.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SpinButton" toolbar:helpid="helpid:10769" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:helpid="helpid:10768" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton" toolbar:helpid="helpid:10604" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:helpid="helpid:10710" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl" toolbar:helpid="helpid:10605" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:DateField" toolbar:helpid="helpid:10704" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:TimeField" toolbar:helpid="helpid:10705" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:NumericField" toolbar:helpid="helpid:10706" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField" toolbar:helpid="helpid:10707" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:PatternField" toolbar:helpid="helpid:10708" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox" toolbar:helpid="helpid:10598" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Grid" toolbar:helpid="helpid:10603" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NavigationBar" toolbar:helpid="helpid:10607" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/numobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/numobjectbar.xml
deleted file mode 100644
index 50e28ac32f64..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/numobjectbar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementSubLevels" toolbar:helpid="20139"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph" toolbar:helpid="20136"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUp" toolbar:helpid="20134"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDown" toolbar:helpid="20135"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems" toolbar:helpid="20141"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDownSubItems" toolbar:helpid="20142"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/>
- <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/oleobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/oleobjectbar.xml
deleted file mode 100644
index c95b1aebb316..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/oleobjectbar.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="20475"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="20477"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="20476"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="20478"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="20480"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="20479"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="10187"/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="10200"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="10201"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/optimizetablebar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/optimizetablebar.xml
deleted file mode 100644
index 51ae902739de..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/optimizetablebar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DistributeColumns" toolbar:helpid="helpid:20582" />
- <toolbar:toolbaritem xlink:href=".uno:DistributeRows" toolbar:helpid="helpid:20583" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight" toolbar:helpid="helpid:20528" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth" toolbar:helpid="helpid:20521" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/previewobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/previewobjectbar.xml
deleted file mode 100644
index f0dc732d4ef9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/previewobjectbar.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:PageUp" toolbar:helpid="20937"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown" toolbar:helpid="20938"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowBookview" toolbar:helpid="helpid:21255"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviewZoom" toolbar:helpid="53071"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/standardbar.xml
deleted file mode 100644
index c1b38e3870f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/standardbar.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501"/>
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="5710"/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="5711"/>
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="5712"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="5715"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/>
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
- <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
- <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/starshapes.xml
deleted file mode 100644
index a2ff874d2fe7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12" toolbar:helpid="helpid:11007" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate" toolbar:helpid="helpid:11007" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/symbolshapes.xml
deleted file mode 100644
index 0fa6aee313db..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/tableobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/tableobjectbar.xml
deleted file mode 100644
index 231431f56a73..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/tableobjectbar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MergeCells" toolbar:helpid="helpid:20506" />
- <toolbar:toolbaritem xlink:href=".uno:SplitCell" toolbar:helpid="helpid:20505" />
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:helpid="helpid:20510" toolbar:style="dropdown" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:helpid="helpid:20585" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:helpid="helpid:20586" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:helpid="helpid:20587" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:20501" />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:20502" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:20503" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:20504" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:helpid="helpid:20515" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:helpid="helpid:20514" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:helpid="helpid:20513" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat" toolbar:helpid="helpid:20595" />
- <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:helpid="helpid:20459" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableSort" toolbar:helpid="helpid:20533" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoSum" toolbar:helpid="helpid:20595" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/textobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/textobjectbar.xml
deleted file mode 100644
index a169820627f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/textobjectbar.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="helpid:20144" />
- <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="helpid:20138" />
- <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" toolbar:helpid="helpid:10461" />
- <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" toolbar:helpid="helpid:10462" />
- <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:helpid="helpid:20403" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:helpid="helpid:20404" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:helpid="helpid:10017" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:helpid="helpid:10489" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:visible="false" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/toolbar.xml
deleted file mode 100644
index f3e242673fd9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/toolbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:helpid="52822"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShadowCursor" toolbar:helpid="22204"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
- <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
- <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/viewerbar.xml b/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/viewerbar.xml
deleted file mode 100644
index d4d6a59d7ed5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sglobal/toolbar/viewerbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961" />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/menubar/menubar.xml
deleted file mode 100644
index 03ddd6d68ab8..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/menubar/menubar.xml
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuitem menu:id=".uno:VersionDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menuitem menu:id=".uno:ExportToPDF"/>
- <menu:menu menu:id=".uno:SendMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsOOo"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsMS"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menuitem menu:id=".uno:Signature"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WebHtml"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteSpecial"/>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
- <menu:menuitem menu:id=".uno:SearchDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CopyObjects"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
- <menu:menuitem menu:id=".uno:GlueEditMode"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ModifyField"/>
- <menu:menuitem menu:id=".uno:DeletePage"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ManageLinks"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
- <menu:menuitem menu:id=".uno:ImageMapDialog"/>
- <menu:menuitem menu:id=".uno:ObjectMenue"/>
- <menu:menuitem menu:id=".uno:EditHyperlink"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NormalMultiPaneGUI" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:OutlineMode" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:DiaMode" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:Presentation" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:NotesMode" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:HandoutMode" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MasterPageMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SlideMasterPage" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:NotesMasterPage" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MasterLayouts"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:DisplayQualityMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:OutputQualityColor" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:OutputQualityGrayscale" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:OutputQualityBlackWhite" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
- <menu:menuitem menu:id=".uno:LeftPaneImpress"/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuitem menu:id=".uno:ShowRuler"/>
- <menu:menu menu:id=".uno:GridMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:GridVisible"/>
- <menu:menuitem menu:id=".uno:GridUse"/>
- <menu:menuitem menu:id=".uno:GridFront"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:SnapLinesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelplinesVisible"/>
- <menu:menuitem menu:id=".uno:HelplinesUse"/>
- <menu:menuitem menu:id=".uno:HelplinesFront"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HeaderAndFooter"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertPage"/>
- <menu:menuitem menu:id=".uno:DuplicatePage"/>
- <menu:menuitem menu:id=".uno:ExpandPage"/>
- <menu:menuitem menu:id=".uno:SummaryPage"/>
- <menu:menuitem menu:id=".uno:InsertPageNumber"/>
- <menu:menuitem menu:id=".uno:InsertDateAndTime"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertDateFieldFix"/>
- <menu:menuitem menu:id=".uno:InsertDateFieldVar"/>
- <menu:menuitem menu:id=".uno:InsertTimeFieldFix"/>
- <menu:menuitem menu:id=".uno:InsertTimeFieldVar"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuitem menu:id=".uno:InsertPageField"/>
- <menu:menuitem menu:id=".uno:InsertPagesField"/>
- <menu:menuitem menu:id=".uno:InsertFileField"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuitem menu:id=".uno:InsertSymbol"/>
- <menu:menu menu:id=".uno:FormattingMarkMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
- <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
- <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
- <menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
- <menu:menuitem menu:id=".uno:InsertLRM"/>
- <menu:menuitem menu:id=".uno:InsertRLM"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
- <menu:menuitem menu:id=".uno:AnimationObjects"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:GraphicMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertGraphic"/>
- <menu:menu menu:id=".uno:Scan">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TwainSelect"/>
- <menu:menuitem menu:id=".uno:TwainTransfer"/>
- </menu:menupopup>
- </menu:menu>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertAVMedia"/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertObject"/>
- <menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertMath"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertObjectChart"/>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ImportFromFile"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetDefault"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:OutlineBullet"/>
- <menu:menuitem menu:id=".uno:PageSetup"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:TransliterateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
- <menu:menuitem menu:id=".uno:FormatArea"/>
- <menu:menuitem menu:id=".uno:TextAttributes"/>
- <menu:menuitem menu:id=".uno:GrafAttrCrop"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PresentationLayout"/>
- <menu:menuitem menu:id=".uno:ModifyPage"/>
- <menu:menuitem menu:id=".uno:DesignerDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:GroupMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormatGroup"/>
- <menu:menuitem menu:id=".uno:FormatUngroup"/>
- <menu:menuitem menu:id=".uno:EnterGroup"/>
- <menu:menuitem menu:id=".uno:LeaveGroup"/>
- </menu:menupopup>
- </menu:menu>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SpellDialog"/>
- <menu:menu menu:id=".uno:LanguageMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
- <menu:menuitem menu:id=".uno:ChineseConversion"/>
- <menu:menuitem menu:id=".uno:ThesaurusDialog"/>
- <menu:menuitem menu:id=".uno:Hyphenation"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MoreDictionaries"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Gallery"/>
- <menu:menuitem menu:id=".uno:BmpMask"/>
- <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuitem menu:id=".uno:MacroSignature"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:SlideShowMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Presentation"/>
- <menu:menuitem menu:id=".uno:PresentationDialog"/>
- <menu:menuitem menu:id=".uno:RehearseTimings"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AnimationEffects"/>
- <!--menu:menuitem menu:id=".uno:CustomAnimationSchemes" / -->
- <menu:menuitem menu:id=".uno:CustomAnimation"/>
- <menu:menuitem menu:id=".uno:SlideChangeWindow"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowSlide"/>
- <menu:menuitem menu:id=".uno:HideSlide"/>
- <menu:menuitem menu:id=".uno:CustomShowDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/statusbar/statusbar.xml
deleted file mode 100644
index 0872bd42f3f4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/statusbar/statusbar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:Context" statusbar:align="left" statusbar:autosize="true" statusbar:width="184" statusbar:helpid="helpid:5310"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="208" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="14" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:PageStatus" statusbar:align="left" statusbar:width="124" statusbar:helpid="helpid:27086"/>
- <statusbar:statusbaritem xlink:href=".uno:LayoutStatus" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:27087"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="36" statusbar:helpid="helpid:10000"/>
-</statusbar:statusbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/3dobjectsbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/3dobjectsbar.xml
deleted file mode 100644
index 841d960388fb..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/3dobjectsbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Cube" toolbar:helpid="helpid:27296" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Sphere" toolbar:helpid="helpid:27297" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Cylinder" toolbar:helpid="helpid:27298" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Cone" toolbar:helpid="helpid:27299" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Cyramid" toolbar:helpid="helpid:27300" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Torus" toolbar:helpid="helpid:27312" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Shell3D" toolbar:helpid="helpid:27311" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:HalfSphere" toolbar:helpid="helpid:27313" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/alignmentbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/alignmentbar.xml
deleted file mode 100644
index 7b6bb3e61d2e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/alignmentbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131" />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134" />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135" />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/arrowsbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/arrowsbar.xml
deleted file mode 100644
index 50a7b0af85ff..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/arrowsbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Line" toolbar:helpid="helpid:10102" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="helpid:27173" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowCircle" toolbar:helpid="helpid:27175" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowSquare" toolbar:helpid="helpid:27177" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Line_Diagonal" toolbar:helpid="helpid:10103" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowStart" toolbar:helpid="helpid:27172" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineCircleArrow" toolbar:helpid="helpid:27176" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineSquareArrow" toolbar:helpid="helpid:27178" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MeasureLine" toolbar:helpid="helpid:27051" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrows" toolbar:helpid="helpid:27174" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/arrowshapes.xml
deleted file mode 100644
index 34f135283f50..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/basicshapes.xml
deleted file mode 100644
index a9e23fe67ed9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/bezierobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/bezierobjectbar.xml
deleted file mode 100644
index a711f4643918..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/bezierobjectbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="helpid:10126" toolbar:style="radio auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:helpid="helpid:10121" />
- <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:helpid="helpid:10119" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierDelete" toolbar:helpid="helpid:10120" />
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine" toolbar:helpid="helpid:10127" />
- <toolbar:toolbaritem xlink:href=".uno:BezierConvert" toolbar:helpid="helpid:27065" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:helpid="helpid:27066" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:helpid="helpid:10123" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:helpid="helpid:27067" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose" toolbar:helpid="helpid:10122" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints" toolbar:helpid="helpid:27030" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/calloutshapes.xml
deleted file mode 100644
index 91b957fa697a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/choosemodebar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/choosemodebar.xml
deleted file mode 100644
index 9e30bc62d094..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/choosemodebar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="helpid:10129" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLathe" toolbar:helpid="helpid:27008" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CrookRotate" toolbar:helpid="helpid:27090" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CrookSlant" toolbar:helpid="helpid:27091" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Shear" toolbar:helpid="helpid:27107" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InteractiveTransparence" toolbar:helpid="helpid:27100" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InteractiveGradient" toolbar:helpid="helpid:27101" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/colorbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/colorbar.xml
deleted file mode 100644
index adcda76b5c3a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/colorbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/commentsbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/commentsbar.xml
deleted file mode 100644
index 07c42d262758..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/commentsbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="helpid:26276"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviousAnnotation" toolbar:helpid="helpid:11095"/>
- <toolbar:toolbaritem xlink:href=".uno:NextAnnotation" toolbar:helpid="helpid:11094"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteAnnotation" toolbar:helpid="helpid:11093"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteAllAnnotation" toolbar:helpid="helpid:11096"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/commontaskbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/commontaskbar.xml
deleted file mode 100644
index c64a4b935717..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/commontaskbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertPage" toolbar:helpid="27014" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:AssignLayout" toolbar:helpid="27435" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:PresentationLayout" toolbar:helpid="27064"/>
- <toolbar:toolbaritem xlink:href=".uno:DuplicatePage" toolbar:visible="false" toolbar:helpid="27342"/>
- <toolbar:toolbaritem xlink:href=".uno:ExpandPage" toolbar:visible="false" toolbar:helpid="27343"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Presentation" toolbar:helpid="10157"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/connectorsbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/connectorsbar.xml
deleted file mode 100644
index b33662343f51..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/connectorsbar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Connector" toolbar:helpid="27058"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorArrowStart" toolbar:visible="false" toolbar:helpid="27119"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorArrowEnd" toolbar:helpid="27120"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorArrows" toolbar:helpid="27121"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCircleStart" toolbar:visible="false" toolbar:helpid="27122"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCircleEnd" toolbar:visible="false" toolbar:helpid="27123"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCircles" toolbar:visible="false" toolbar:helpid="27124"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLines" toolbar:helpid="27139"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowStart" toolbar:visible="false" toolbar:helpid="27140"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowEnd" toolbar:helpid="27141"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrows" toolbar:helpid="27142"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleStart" toolbar:visible="false" toolbar:helpid="27143"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleEnd" toolbar:visible="false" toolbar:helpid="27144"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircles" toolbar:visible="false" toolbar:helpid="27145"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLine" toolbar:helpid="27125"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrowStart" toolbar:visible="false" toolbar:helpid="27126"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrowEnd" toolbar:helpid="27127"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrows" toolbar:helpid="27128"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircleStart" toolbar:visible="false" toolbar:helpid="27129"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircleEnd" toolbar:visible="false" toolbar:helpid="27130"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircles" toolbar:visible="false" toolbar:helpid="27131"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurve" toolbar:helpid="27132"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrowStart" toolbar:visible="false" toolbar:helpid="27133"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrowEnd" toolbar:helpid="27134"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrows" toolbar:helpid="27135"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircleStart" toolbar:visible="false" toolbar:helpid="27136"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircleEnd" toolbar:visible="false" toolbar:helpid="27137"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircles" toolbar:visible="false" toolbar:helpid="27138"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/drawingobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/drawingobjectbar.xml
deleted file mode 100644
index 4c322a9028b6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/drawingobjectbar.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143"/>
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="10169"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="10164"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="10299"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false" toolbar:helpid="10371"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/ellipsesbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/ellipsesbar.xml
deleted file mode 100644
index 84ccaf854009..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/ellipsesbar.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Circle" toolbar:helpid="helpid:10385" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:helpid="helpid:10112" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CirclePie" toolbar:helpid="helpid:10388" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:EllipseCut" toolbar:helpid="helpid:10392" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:helpid="helpid:10115" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse_Unfilled" toolbar:helpid="helpid:10384" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Circle_Unfilled" toolbar:helpid="helpid:10386" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Pie_Unfilled" toolbar:helpid="helpid:10387" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CirclePie_Unfilled" toolbar:helpid="helpid:10389" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:EllipseCut_Unfilled" toolbar:helpid="helpid:10393" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CircleCut_Unfilled" toolbar:helpid="helpid:10391" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:helpid="helpid:10114" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CircleArc" toolbar:helpid="helpid:10390" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/extrusionobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/extrusionobjectbar.xml
deleted file mode 100644
index 148849db6ee7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/extrusionobjectbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/findbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/findbar.xml
deleted file mode 100644
index 49e483e178a3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/findbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FindText"/>
- <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
- <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/flowchartshapes.xml
deleted file mode 100644
index 5eff42015672..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fontworkobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fontworkobjectbar.xml
deleted file mode 100644
index 28687d66eb6f..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fontworkobjectbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:helpid="helpid:10978" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights" toolbar:helpid="helpid:10979" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:helpid="helpid:10981" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:helpid="helpid:10982" toolbar:style="dropdownonly" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fontworkshapetype.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fontworkshapetype.xml
deleted file mode 100644
index 49b5b8173e0e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fontworkshapetype.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-stop" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-pour" toolbar:helpid="helpid:10978" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formcontrols.xml
deleted file mode 100644
index f0b802f28559..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formcontrols.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox" toolbar:helpid="helpid:10596" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:helpid="helpid:10599" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField" toolbar:helpid="helpid:10728" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton" toolbar:helpid="helpid:10594" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:RadioButton" toolbar:helpid="helpid:10595" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ListBox" toolbar:helpid="helpid:10600" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ComboBox" toolbar:helpid="helpid:10601" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:helpid="helpid:10597" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools" toolbar:helpid="helpid:11046" />
- <toolbar:toolbaritem xlink:href=".uno:MoreControls" toolbar:helpid="helpid:11045" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards" toolbar:helpid="helpid:10727" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formdesign.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formdesign.xml
deleted file mode 100644
index 01f59fb34b91..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formdesign.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer" toolbar:helpid="helpid:10633" />
- <toolbar:toolbaritem xlink:href=".uno:TabDialog" toolbar:helpid="helpid:10615" />
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:helpid="helpid:10623" />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="helpid:10454" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="helpid:10455" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:helpid="helpid:27096" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:helpid="helpid:27097" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709" />
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formsfilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formsfilterbar.xml
deleted file mode 100644
index 1d1ad07a9938..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formsfilterbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormFilterExecute" toolbar:helpid="helpid:10731" />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator" toolbar:helpid="helpid:10732" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExit" toolbar:helpid="helpid:10730" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formsnavigationbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formsnavigationbar.xml
deleted file mode 100644
index c6e16444a55d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formsnavigationbar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="10725"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecText" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:AbsoluteRecord" toolbar:helpid="10622"/>
- <toolbar:toolbaritem xlink:href=".uno:RecFromText" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RecTotal" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:FirstRecord" toolbar:helpid="10616"/>
- <toolbar:toolbaritem xlink:href=".uno:PrevRecord" toolbar:helpid="10618"/>
- <toolbar:toolbaritem xlink:href=".uno:NextRecord" toolbar:helpid="10617"/>
- <toolbar:toolbaritem xlink:href=".uno:LastRecord" toolbar:helpid="10619"/>
- <toolbar:toolbaritem xlink:href=".uno:NewRecord" toolbar:helpid="10620"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="10627"/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="10630"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRecord" toolbar:helpid="10621"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="10714"/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="10712"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="10713"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="10716"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="10723"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilter" toolbar:helpid="10729"/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="10711"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid" toolbar:helpid="10761"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formtextobjectbar.xml
deleted file mode 100644
index dbdeaf675371..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/formtextobjectbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fullscreenbar.xml
deleted file mode 100644
index 5aecdda4fb04..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/gluepointsobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/gluepointsobjectbar.xml
deleted file mode 100644
index b6c8501f4044..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/gluepointsobjectbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GlueInsertPoint" toolbar:helpid="helpid:27302" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionLeft" toolbar:helpid="helpid:27314" />
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionTop" toolbar:helpid="helpid:27316" />
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionRight" toolbar:helpid="helpid:27315" />
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionBottom" toolbar:helpid="helpid:27317" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GluePercent" toolbar:helpid="helpid:27303" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignLeft" toolbar:helpid="helpid:27306" />
- <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignCenter" toolbar:helpid="helpid:27305" />
- <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignRight" toolbar:helpid="helpid:27307" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignTop" toolbar:helpid="helpid:27309" />
- <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignCenter" toolbar:helpid="helpid:27308" />
- <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignBottom" toolbar:helpid="helpid:27310" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/graffilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/graffilterbar.xml
deleted file mode 100644
index 287c33fe25e5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/graffilterbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterInvert" toolbar:helpid="helpid:34149" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth" toolbar:helpid="helpid:34150" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen" toolbar:helpid="helpid:34151" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRemoveNoise" toolbar:helpid="helpid:34152" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSolarize" toolbar:helpid="helpid:34159" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSepia" toolbar:helpid="helpid:34158" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPoster" toolbar:helpid="helpid:34156" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPopart" toolbar:helpid="helpid:34157" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSobel" toolbar:helpid="helpid:34153" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRelief" toolbar:helpid="helpid:34155" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterMosaic" toolbar:helpid="helpid:34154" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/graphicobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/graphicobjectbar.xml
deleted file mode 100644
index 93312f0d9c29..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/graphicobjectbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="helpid:10469" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="helpid:10871" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="helpid:11016" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="helpid:10869" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="helpid:10143" />
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="helpid:10142" />
- <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="helpid:10299" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Crop" toolbar:helpid="helpid:10883" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/insertbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/insertbar.xml
deleted file mode 100644
index 4ba1344cf2fc..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/insertbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertPage" toolbar:helpid="helpid:27014" toolbar:style="radio dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:helpid="helpid:5563" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:helpid="helpid:27015" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:10141" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241" />
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695" />
- <toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:helpid="helpid:5676" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:helpid="helpid:5677" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertMath" toolbar:helpid="helpid:27106"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="helpid:10140" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/linesbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/linesbar.xml
deleted file mode 100644
index d0f9f8f90e18..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/linesbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BezierFill" toolbar:helpid="helpid:10118" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon" toolbar:helpid="helpid:10117" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:helpid="helpid:10394" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:helpid="helpid:10463" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="helpid:10397" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="helpid:10395" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:helpid="helpid:10396" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="helpid:10464" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/masterviewtoolbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/masterviewtoolbar.xml
deleted file mode 100644
index 994c537a0aad..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/masterviewtoolbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertMasterPage" toolbar:helpid="helpid:27430" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteMasterPage" toolbar:helpid="helpid:27431" />
- <toolbar:toolbaritem xlink:href=".uno:RenameMasterPage" toolbar:helpid="helpid:27432" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CloseMasterView" toolbar:helpid="helpid:27433" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/mediaobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/mediaobjectbar.xml
deleted file mode 100644
index 2014343bf89b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/mediaobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox" toolbar:helpid="helpid:6693" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/moreformcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/moreformcontrols.xml
deleted file mode 100644
index 275c733e7340..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/moreformcontrols.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SpinButton" toolbar:helpid="helpid:10769" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:helpid="helpid:10768" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton" toolbar:helpid="helpid:10604" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:helpid="helpid:10710" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl" toolbar:helpid="helpid:10605" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:DateField" toolbar:helpid="helpid:10704" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:TimeField" toolbar:helpid="helpid:10705" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:NumericField" toolbar:helpid="helpid:10706" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField" toolbar:helpid="helpid:10707" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:PatternField" toolbar:helpid="helpid:10708" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox" toolbar:helpid="helpid:10598" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Grid" toolbar:helpid="helpid:10603" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NavigationBar" toolbar:helpid="helpid:10607" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optimizetablebar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optimizetablebar.xml
deleted file mode 100644
index bf97f65ae9cb..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optimizetablebar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DistributeColumns" toolbar:helpid="helpid:20582" />
- <toolbar:toolbaritem xlink:href=".uno:DistributeRows" toolbar:helpid="helpid:20583" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml
deleted file mode 100644
index e9f8b5199a5c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ClickChangeRotation" toolbar:helpid="27170"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="27322"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesVisible" toolbar:helpid="27324"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="27153"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="27154"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesUse" toolbar:helpid="27152"/>
- <toolbar:toolbaritem xlink:href=".uno:SnapBorder" toolbar:helpid="27155"/>
- <toolbar:toolbaritem xlink:href=".uno:SnapFrame" toolbar:helpid="27156"/>
- <toolbar:toolbaritem xlink:href=".uno:SnapPoints" toolbar:helpid="27157"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:QuickEdit" toolbar:helpid="27158"/>
- <toolbar:toolbaritem xlink:href=".uno:PickThrough" toolbar:helpid="27159"/>
- <toolbar:toolbaritem xlink:href=".uno:DoubleClickTextEdit" toolbar:helpid="27169"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:helpid="helpid:27151"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeaveAllGroups" toolbar:helpid="27345"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/outlinetoolbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/outlinetoolbar.xml
deleted file mode 100644
index d580779b35ee..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/outlinetoolbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OutlineCollapseAll" toolbar:helpid="helpid:10155" />
- <toolbar:toolbaritem xlink:href=".uno:OutlineExpandAll" toolbar:helpid="helpid:10232" />
- <toolbar:toolbaritem xlink:href=".uno:OutlineCollapse" toolbar:helpid="helpid:10231" />
- <toolbar:toolbaritem xlink:href=".uno:OutlineExpand" toolbar:helpid="helpid:10233" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OutlineFormat" toolbar:helpid="helpid:10154" />
- <toolbar:toolbaritem xlink:href=".uno:ColorView" toolbar:helpid="helpid:27257" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Presentation" toolbar:helpid="helpid:10157" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/positionbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/positionbar.xml
deleted file mode 100644
index 5f571924d72a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/positionbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" />
- <toolbar:toolbaritem xlink:href=".uno:Forward" toolbar:helpid="helpid:27031" />
- <toolbar:toolbaritem xlink:href=".uno:Backward" toolbar:helpid="helpid:27032" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BeforeObject" toolbar:helpid="helpid:27326" />
- <toolbar:toolbaritem xlink:href=".uno:BehindObject" toolbar:helpid="helpid:27116" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ReverseOrder" toolbar:helpid="helpid:27117" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/rectanglesbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/rectanglesbar.xml
deleted file mode 100644
index 2716265612f4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/rectanglesbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="helpid:10104" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square" toolbar:helpid="helpid:10380" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Rect_Rounded" toolbar:helpid="helpid:10105" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square_Rounded" toolbar:helpid="helpid:10381" toolbar:style="radio" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Rect_Unfilled" toolbar:helpid="helpid:10378" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square_Unfilled" toolbar:helpid="helpid:10382" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Rect_Rounded_Unfilled" toolbar:helpid="helpid:10379" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square_Rounded_Unfilled" toolbar:helpid="helpid:10383" toolbar:style="radio" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/slideviewobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/slideviewobjectbar.xml
deleted file mode 100644
index 2e28ce665391..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/slideviewobjectbar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RehearseTimings" toolbar:helpid="helpid:10159" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowSlide" toolbar:helpid="helpid:27440" />
- <toolbar:toolbaritem xlink:href=".uno:HideSlide" toolbar:helpid="helpid:10161" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PagesPerRow" toolbar:helpid="helpid:27284" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/slideviewtoolbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/slideviewtoolbar.xml
deleted file mode 100644
index 4ba11c49fd63..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/slideviewtoolbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Presentation" toolbar:helpid="helpid:10157" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/standardbar.xml
deleted file mode 100644
index e1d7147249ab..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/standardbar.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:helpid="helpid:5500" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501" />
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:helpid="helpid:20622" />
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" />
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="helpid:5715" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140" />
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:10141" />
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" toolbar:style="auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366" />
- <toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:helpid="helpid:10096" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" />
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/starshapes.xml
deleted file mode 100644
index 073375a2b458..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12" toolbar:helpid="helpid:11007" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate" toolbar:helpid="helpid:11007" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/symbolshapes.xml
deleted file mode 100644
index 0e96bcf78134..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/tableobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/tableobjectbar.xml
deleted file mode 100644
index 57726de89461..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/tableobjectbar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="helpid:10164"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MergeCells" toolbar:helpid="helpid:20506" />
- <toolbar:toolbaritem xlink:href=".uno:SplitCell" toolbar:helpid="helpid:20505" />
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:helpid="helpid:20510" toolbar:style="dropdown" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:helpid="helpid:20585" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:helpid="helpid:20586" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:helpid="helpid:20587" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:20501" />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:20502" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:20503" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:20504" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:helpid="helpid:20515" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:helpid="helpid:20514" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:helpid="helpid:20513" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableDesign" toolbar:helpid="helpid:10429" />
- <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:helpid="helpid:20459" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/textbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/textbar.xml
deleted file mode 100644
index 4bd5672237d3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/textbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:Text" toolbar:helpid="helpid:10006" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:TextFitToSizeTool" toolbar:helpid="helpid:27285" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="helpid:10254" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="helpid:10905" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VerticalTextFitToSizeTool" toolbar:helpid="helpid:27286" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="helpid:10906" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/textobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/textobjectbar.xml
deleted file mode 100644
index f91767c983ed..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/textobjectbar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="10007"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="10015"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="10009"/>
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="10008"/>
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="10014"/>
- <toolbar:toolbaritem xlink:href=".uno:Shadowed" toolbar:helpid="10010"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="10028"/>
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="10030"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="10029"/>
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="10031"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="10950"/>
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="10951"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaspaceIncrease" toolbar:visible="false" toolbar:helpid="27346"/>
- <toolbar:toolbaritem xlink:href=".uno:ParaspaceDecrease" toolbar:visible="false" toolbar:helpid="27347"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:visible="false" toolbar:helpid="10034"/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:visible="false" toolbar:helpid="10035"/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:visible="false" toolbar:helpid="10036"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/>
- <toolbar:toolbaritem xlink:href=".uno:OutlineLeft" toolbar:helpid="10152"/>
- <toolbar:toolbaritem xlink:href=".uno:OutlineRight" toolbar:helpid="10153"/>
- <toolbar:toolbaritem xlink:href=".uno:OutlineUp" toolbar:helpid="10150"/>
- <toolbar:toolbaritem xlink:href=".uno:OutlineDown" toolbar:helpid="10151"/>
- <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:helpid="helpid:20403"/>
- <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:helpid="helpid:20404"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="10907"/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="10908"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="10296"/>
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="10297"/>
- <toolbar:toolbaritem xlink:href=".uno:OutlineBullet" toolbar:helpid="10156"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false" toolbar:helpid="27019"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/toolbar.xml
deleted file mode 100644
index 25bffb7e72bb..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/toolbar.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="helpid:10102" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="helpid:27173" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:10104" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:helpid="helpid:10398" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="helpid:10398" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineToolbox" toolbar:helpid="helpid:10401" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:ConnectorToolbox" toolbar:helpid="helpid:27028" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowsToolbox" toolbar:helpid=".uno:ArrowsToolbox" toolbar:style="radio dropdown" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Objects3DToolbox" toolbar:helpid="helpid:27295" toolbar:style="radio dropdown" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="helpid:11002" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="helpid:11003" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="helpid:11004" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="helpid:11005" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="helpid:11006" toolbar:style="radio dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="helpid:11007" toolbar:style="radio dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
- <toolbar:toolbaritem xlink:href=".uno:GlueEditMode" toolbar:helpid="helpid:27301" toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:ChangeBezier" toolbar:helpid="helpid:27036" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ChangePolygon" toolbar:helpid="helpid:27037" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ConvertInto3D" toolbar:helpid="helpid:10648" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLatheFast" toolbar:helpid="helpid:10649" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241" />
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="helpid:5960" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="helpid:10129" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:helpid="helpid:27022" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:helpid="helpid:27318" toolbar:style="radio dropdown" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:helpid="helpid:10593" toolbar:style="dropdown" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
- <toolbar:toolbaritem xlink:href=".uno:CustomAnimation" toolbar:helpid="helpid:27328" toolbar:style="auto" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:AnimationEffects" toolbar:helpid="helpid:27063" />
- <toolbar:toolbaritem xlink:href=".uno:AnimationObjects" toolbar:helpid="helpid:27062" toolbar:style="auto" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Window3D" toolbar:helpid="helpid:10644" toolbar:style="auto" toolbar:visible="false" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/viewerbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/viewerbar.xml
deleted file mode 100644
index 861c4f3f890b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/viewerbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961" />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Presentation" toolbar:helpid="helpid:10157" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/zoombar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/zoombar.xml
deleted file mode 100644
index fa59303d6176..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/zoombar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom100Percent" toolbar:helpid="10099"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPrevious" toolbar:visible="false" toolbar:helpid="10403"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomNext" toolbar:visible="false" toolbar:helpid="10402"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPage" toolbar:helpid="10100"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPageWidth" toolbar:helpid="27098"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomOptimal" toolbar:helpid="10101"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomObjects" toolbar:helpid="27099"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPanning" toolbar:helpid="27017"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/smath/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/smath/menubar/menubar.xml
deleted file mode 100644
index dcb68e740718..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/smath/menubar/menubar.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuitem menu:id=".uno:VersionDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menu menu:id=".uno:SendToMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menuitem menu:id=".uno:Signature"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:Select"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:NextMark"/>
- <menu:menuitem menu:id=".uno:PrevMark"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:NextError"/>
- <menu:menuitem menu:id=".uno:PrevError"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Draw"/>
- <menu:menuitem menu:id=".uno:RedrawAutomatic"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuitem menu:id=".uno:ToolBox"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:ZoomIn"/>
- <menu:menuitem menu:id=".uno:ZoomOut"/>
- <menu:menuitem menu:id=".uno:Adjust"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeFont"/>
- <menu:menuitem menu:id=".uno:ChangeFontSize"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChangeDistance"/>
- <menu:menuitem menu:id=".uno:ChangeAlignment"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Textmode"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SymbolCatalogue"/>
- <menu:menuitem menu:id=".uno:ImportFormula"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
-
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/smath/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/smath/statusbar/statusbar.xml
deleted file mode 100644
index 33e4e4888f2a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/smath/statusbar/statusbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:TextStatus" statusbar:align="left" statusbar:width="300" statusbar:helpid="helpid:30367"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="54" statusbar:helpid="helpid:10000"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="14" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
-</statusbar:statusbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/smath/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/smath/toolbar/fullscreenbar.xml
deleted file mode 100644
index ce9cf7d93013..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/smath/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/smath/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/smath/toolbar/standardbar.xml
deleted file mode 100644
index 1a00b34b0128..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/smath/toolbar/standardbar.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:helpid="helpid:5500" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SendFax" toolbar:helpid="helpid:20028" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" toolbar:helpid="helpid:5401" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:text="" toolbar:visible="false" toolbar:helpid="5402"/>
-
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/smath/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/smath/toolbar/toolbar.xml
deleted file mode 100644
index 1d3eeb2dd0c8..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/smath/toolbar/toolbar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ZoomIn" toolbar:helpid="helpid:30266" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ZoomOut" toolbar:helpid="helpid:30267" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:View100" toolbar:helpid="helpid:30264" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Adjust" toolbar:helpid="helpid:30269" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Draw" toolbar:helpid="helpid:30268" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:FormelCursor" toolbar:helpid="helpid:30271" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolCatalogue" toolbar:helpid="helpid:30261" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/menubar/menubar.xml
deleted file mode 100644
index 552019d6cf86..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/menubar/menubar.xml
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menu menu:id=".uno:SendToMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WebHtml"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PrintPreview"/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuitem menu:id=".uno:Repeat"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteSpecial"/>
- <menu:menuitem menu:id=".uno:SelectTextMode"/>
- <menu:menu menu:id=".uno:SelectionModeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectionModeDefault" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SelectionModeBlock" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
- <menu:menuitem menu:id=".uno:SearchDialog"/>
- <menu:menuitem menu:id=".uno:EditGlossary"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FieldDialog"/>
- <menu:menuitem menu:id=".uno:EditFootnote"/>
- <menu:menuitem menu:id=".uno:EditHyperlink"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
- <menu:menuitem menu:id=".uno:ImageMapDialog"/>
- <menu:menuitem menu:id=".uno:ObjectMenue"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:PrintLayout" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:BrowseView" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SourceView" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuitem menu:id=".uno:Ruler"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewBounds"/>
- <menu:menuitem menu:id=".uno:Marks"/>
- <menu:menuitem menu:id=".uno:Fieldnames"/>
- <menu:menuitem menu:id=".uno:ControlCodes"/>
- <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
- <menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertSymbol"/>
- <menu:menu menu:id=".uno:FormattingMarkMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
- <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
- <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
- <menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
- <menu:menuitem menu:id=".uno:InsertLRM"/>
- <menu:menuitem menu:id=".uno:InsertRLM"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertSection"/>
- <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertFootnoteDialog"/>
- <menu:menuitem menu:id=".uno:InsertBookmark"/>
- <menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuitem menu:id=".uno:InsertScript"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertFrame"/>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertGraphicRuler"/>
- <menu:menuitem menu:id=".uno:InsertGraphic"/>
- <menu:menuitem menu:id=".uno:InsertAVMedia"/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertObject"/>
- <menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
- <menu:menuitem menu:id=".uno:InsertObjectChart"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertDoc"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:TransliterateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:FormatColumns"/>
- <menu:menuitem menu:id=".uno:EditRegion"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DesignerDialog"/>
- <menu:menu menu:id=".uno:AutoFormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:OnlineAutoFormat"/>
- <menu:menuitem menu:id=".uno:AutoFormatApply"/>
- <menu:menuitem menu:id=".uno:AutoFormatRedlineApply"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:AnchorMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WrapMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:WrapOff"/>
- <menu:menuitem menu:id=".uno:WrapOn"/>
- <menu:menuitem menu:id=".uno:WrapIdeal"/>
- <menu:menuitem menu:id=".uno:WrapThrough"/>
- <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WrapContour"/>
- <menu:menuitem menu:id=".uno:ContourDialog"/>
- <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TextWrap"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectAlign">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ArrangeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:BringToFront"/>
- <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
- <menu:menuitem menu:id=".uno:ObjectBackOne"/>
- <menu:menuitem menu:id=".uno:SendToBack"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
- <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FlipMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:GroupMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormatGroup"/>
- <menu:menuitem menu:id=".uno:FormatUngroup"/>
- <menu:menuitem menu:id=".uno:EnterGroup"/>
- <menu:menuitem menu:id=".uno:LeaveGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
- <menu:menuitem menu:id=".uno:FormatArea"/>
- <menu:menuitem menu:id=".uno:TextAttributes"/>
- <menu:menuitem menu:id=".uno:FontWork"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:NameGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:FrameDialog"/>
- <menu:menuitem menu:id=".uno:GraphicDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:TableInsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertRowDialog"/>
- <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableDeleteMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DeleteTable"/>
- <menu:menuitem menu:id=".uno:DeleteRows"/>
- <menu:menuitem menu:id=".uno:DeleteColumns"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableSelectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectTable"/>
- <menu:menuitem menu:id=".uno:EntireRow"/>
- <menu:menuitem menu:id=".uno:EntireColumn"/>
- <menu:menuitem menu:id=".uno:EntireCell"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:MergeCells"/>
- <menu:menuitem menu:id=".uno:SplitCell"/>
- <menu:menuitem menu:id=".uno:Protect"/>
- <menu:menuitem menu:id=".uno:MergeTable"/>
- <menu:menuitem menu:id=".uno:SplitTable"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoFormat"/>
- <menu:menu menu:id=".uno:TableAutoFitMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:DistributeColumns"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetRowHeight"/>
- <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
- <menu:menuitem menu:id=".uno:DistributeRows"/>
- <menu:menuitem menu:id=".uno:RowSplit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:HeadingRowsRepeat"/>
- <menu:menu menu:id=".uno:TableConvertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ConvertTextToTable"/>
- <menu:menuitem menu:id=".uno:ConvertTableToText"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:TableSort"/>
- <menu:menuitem menu:id=".uno:InsertFormula"/>
- <menu:menuitem menu:id=".uno:TableNumberFormatDialog"/>
- <menu:menuitem menu:id=".uno:TableBoundaries"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TableDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SpellingAndGrammarDialog"/>
- <menu:menu menu:id=".uno:LanguageMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetLanguageSelectionMenu"/>
- <menu:menuitem menu:id=".uno:SetLanguageParagraphMenu"/>
- <menu:menuitem menu:id=".uno:SetLanguageAllTextMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
- <menu:menuitem menu:id=".uno:ChineseConversion"/>
- <menu:menuitem menu:id=".uno:ThesaurusDialog"/>
- <menu:menuitem menu:id=".uno:Hyphenate"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MoreDictionaries"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:WordCountDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FootnoteDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Gallery"/>
- <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:BibliographyComponent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SortDialog"/>
- <menu:menuitem menu:id=".uno:CalculateSel"/>
- <menu:menuitem menu:id=".uno:Repaginate"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/statusbar/statusbar.xml
deleted file mode 100644
index f6880369df08..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/statusbar/statusbar.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:21181"/>
- <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79" statusbar:helpid="helpid:21182"/>
- <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35" statusbar:helpid="helpid:10000"/>
-</statusbar:statusbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/arrowshapes.xml
deleted file mode 100644
index 4a53519494ea..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/basicshapes.xml
deleted file mode 100644
index e65778305788..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/bezierobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/bezierobjectbar.xml
deleted file mode 100644
index 7c067e68d13c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/bezierobjectbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="helpid:10126" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:helpid="helpid:10121" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:helpid="helpid:10119" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierDelete" toolbar:helpid="helpid:10120" />
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine" toolbar:helpid="helpid:10127" />
- <toolbar:toolbaritem xlink:href=".uno:BezierConvert" toolbar:helpid="helpid:27065" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:helpid="helpid:27066" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:helpid="helpid:10123" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:helpid="helpid:27067" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose" toolbar:helpid="helpid:10122" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints" toolbar:helpid="helpid:27030" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/calloutshapes.xml
deleted file mode 100644
index 91b957fa697a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/colorbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/colorbar.xml
deleted file mode 100644
index 51054f609d8b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/colorbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="helpid:10869" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/drawingobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/drawingobjectbar.xml
deleted file mode 100644
index 124403489aaa..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/drawingobjectbar.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143"/>
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="10169"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="10164"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:visible="false" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:visible="false" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:visible="false" toolbar:helpid="20474"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false" toolbar:helpid="20584"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:helpid="10283"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="10282"/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false" toolbar:helpid="27322"/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/drawtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/drawtextobjectbar.xml
deleted file mode 100644
index e71905df663f..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/drawtextobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="helpid:10017" toolbar:style="dropdown" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="helpid:10907" />
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="helpid:10908" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/extrusionobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/extrusionobjectbar.xml
deleted file mode 100644
index 148849db6ee7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/extrusionobjectbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/findbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/findbar.xml
deleted file mode 100644
index 49e483e178a3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/findbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FindText"/>
- <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
- <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/flowchartshapes.xml
deleted file mode 100644
index bb1d1099dbd4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fontworkobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fontworkobjectbar.xml
deleted file mode 100644
index a6d5c8d4f6f9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fontworkobjectbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:helpid="helpid:10978" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights" toolbar:helpid="helpid:10979" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:helpid="helpid:10981" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:helpid="helpid:10982" toolbar:style="dropdownonly" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fontworkshapetype.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fontworkshapetype.xml
deleted file mode 100644
index 49b5b8173e0e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fontworkshapetype.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-stop" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-pour" toolbar:helpid="helpid:10978" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formcontrols.xml
deleted file mode 100644
index 48fc8fb1653e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formcontrols.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox" toolbar:helpid="helpid:10596" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:helpid="helpid:10599" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField" toolbar:helpid="helpid:10728" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton" toolbar:helpid="helpid:10594" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:RadioButton" toolbar:helpid="helpid:10595" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ListBox" toolbar:helpid="helpid:10600" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ComboBox" toolbar:helpid="helpid:10601" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:helpid="helpid:10597" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools" toolbar:helpid="helpid:11046" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards" toolbar:helpid="helpid:10727" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formdesign.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formdesign.xml
deleted file mode 100644
index b667b509e9b2..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formdesign.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer" toolbar:helpid="helpid:10633" />
- <toolbar:toolbaritem xlink:href=".uno:TabDialog" toolbar:helpid="helpid:10615" />
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:helpid="helpid:10623" />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="helpid:10454" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="helpid:10455" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:helpid="helpid:27096" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:helpid="helpid:27097" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709" />
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formsfilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formsfilterbar.xml
deleted file mode 100644
index 1d1ad07a9938..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formsfilterbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormFilterExecute" toolbar:helpid="helpid:10731" />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator" toolbar:helpid="helpid:10732" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExit" toolbar:helpid="helpid:10730" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formsnavigationbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formsnavigationbar.xml
deleted file mode 100644
index c6e16444a55d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formsnavigationbar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="10725"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecText" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:AbsoluteRecord" toolbar:helpid="10622"/>
- <toolbar:toolbaritem xlink:href=".uno:RecFromText" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RecTotal" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:FirstRecord" toolbar:helpid="10616"/>
- <toolbar:toolbaritem xlink:href=".uno:PrevRecord" toolbar:helpid="10618"/>
- <toolbar:toolbaritem xlink:href=".uno:NextRecord" toolbar:helpid="10617"/>
- <toolbar:toolbaritem xlink:href=".uno:LastRecord" toolbar:helpid="10619"/>
- <toolbar:toolbaritem xlink:href=".uno:NewRecord" toolbar:helpid="10620"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="10627"/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="10630"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRecord" toolbar:helpid="10621"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="10714"/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="10712"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="10713"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="10716"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="10723"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilter" toolbar:helpid="10729"/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="10711"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid" toolbar:helpid="10761"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formtextobjectbar.xml
deleted file mode 100644
index dbdeaf675371..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/formtextobjectbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/frameobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/frameobjectbar.xml
deleted file mode 100644
index a591f9094457..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/frameobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="helpid:20472" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="helpid:20473" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:helpid="helpid:20563" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:helpid="helpid:20572" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:helpid="helpid:20573" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="helpid:20474" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="helpid:20475" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="helpid:20477" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="helpid:20476" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="helpid:20478" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="helpid:20480" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="helpid:20479" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="helpid:20456" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ChainFrames" toolbar:helpid="helpid:21736" />
- <toolbar:toolbaritem xlink:href=".uno:UnhainFrames" toolbar:helpid="helpid:21737" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fullscreenbar.xml
deleted file mode 100644
index 5aecdda4fb04..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/graffilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/graffilterbar.xml
deleted file mode 100644
index 287c33fe25e5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/graffilterbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterInvert" toolbar:helpid="helpid:34149" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth" toolbar:helpid="helpid:34150" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen" toolbar:helpid="helpid:34151" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRemoveNoise" toolbar:helpid="helpid:34152" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSolarize" toolbar:helpid="helpid:34159" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSepia" toolbar:helpid="helpid:34158" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPoster" toolbar:helpid="helpid:34156" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPopart" toolbar:helpid="helpid:34157" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSobel" toolbar:helpid="helpid:34153" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRelief" toolbar:helpid="helpid:34155" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterMosaic" toolbar:helpid="helpid:34154" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/graphicobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/graphicobjectbar.xml
deleted file mode 100644
index 9b5f91cfe9ba..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/graphicobjectbar.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:helpid="20573"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:helpid="10371"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="20475"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="20476"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="20478"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="20480"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="20479"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="10187"/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="10200"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="10201"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/insertbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/insertbar.xml
deleted file mode 100644
index bc58724fab26..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/insertbar.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSection" toolbar:helpid="21419"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFootnote" toolbar:helpid="20399"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertEndnote" toolbar:helpid="21418"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="20329"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertBookmark" toolbar:helpid="20302"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDoc" toolbar:visible="false" toolbar:helpid="5532"/>
- <toolbar:toolbaritem xlink:href=".uno:EditGlossary"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="20328"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl" toolbar:helpid="52824"/>
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:visible="false" toolbar:helpid="10593"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="20369"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:visible="false" toolbar:helpid="10140"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex" toolbar:helpid="21420"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:helpid="20335"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/mediaobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/mediaobjectbar.xml
deleted file mode 100644
index 2014343bf89b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/mediaobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox" toolbar:helpid="helpid:6693" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/numobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/numobjectbar.xml
deleted file mode 100644
index 50e28ac32f64..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/numobjectbar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementSubLevels" toolbar:helpid="20139"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph" toolbar:helpid="20136"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUp" toolbar:helpid="20134"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDown" toolbar:helpid="20135"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems" toolbar:helpid="20141"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDownSubItems" toolbar:helpid="20142"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/>
- <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/oleobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/oleobjectbar.xml
deleted file mode 100644
index c95b1aebb316..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/oleobjectbar.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="20475"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="20477"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="20476"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="20478"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="20480"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="20479"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="10187"/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="10200"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="10201"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/optimizetablebar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/optimizetablebar.xml
deleted file mode 100644
index 7669add92e89..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/optimizetablebar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DistributeColumns" toolbar:helpid="helpid:20582" />
- <toolbar:toolbaritem xlink:href=".uno:DistributeRows" toolbar:helpid="helpid:20583" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight" toolbar:helpid="helpid:20528" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth" toolbar:helpid="helpid:20521" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/previewobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/previewobjectbar.xml
deleted file mode 100644
index 5c6d30522614..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/previewobjectbar.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:PageUp" toolbar:helpid="20937"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown" toolbar:helpid="20938"/>
-<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowBookview" toolbar:helpid="helpid:21255" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviewZoom" toolbar:helpid="53071"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/standardbar.xml
deleted file mode 100644
index a5d029920848..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/standardbar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501"/>
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
- <toolbar:toolbaritem xlink:href=".uno:SourceView" toolbar:helpid="5675"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="5710"/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="5711"/>
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="5712"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="5715"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/>
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:helpid="10593"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
- <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
- <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/starshapes.xml
deleted file mode 100644
index a2ff874d2fe7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12" toolbar:helpid="helpid:11007" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate" toolbar:helpid="helpid:11007" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/symbolshapes.xml
deleted file mode 100644
index 0fa6aee313db..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/tableobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/tableobjectbar.xml
deleted file mode 100644
index bce574f0d985..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/tableobjectbar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MergeCells" toolbar:helpid="helpid:20506" />
- <toolbar:toolbaritem xlink:href=".uno:SplitCell" toolbar:helpid="helpid:20505" />
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:helpid="helpid:20510" toolbar:style="dropdown" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:helpid="helpid:20585" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:helpid="helpid:20586" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:helpid="helpid:20587" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:20501" />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:20502" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:20503" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:20504" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:helpid="helpid:20515" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:helpid="helpid:20514" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:helpid="helpid:20513" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat" toolbar:helpid="helpid:20595" />
- <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:helpid="helpid:20459" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableSort" toolbar:helpid="helpid:20533" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoSum" toolbar:helpid="helpid:20595" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/textobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/textobjectbar.xml
deleted file mode 100644
index b0db34a8d1f3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/textobjectbar.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="10007"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="10015"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="10009"/>
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="10008"/>
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="10014"/>
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false" toolbar:helpid="20411"/>
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false" toolbar:helpid="20412"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="10028"/>
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="10030"/>
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="10029"/>
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="10950"/>
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="10951"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:visible="false" toolbar:helpid="10034"/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:visible="false" toolbar:helpid="10035"/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:visible="false" toolbar:helpid="10036"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" toolbar:helpid="10461"/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" toolbar:helpid="10462"/>
- <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:visible="false" toolbar:helpid="20403"/>
- <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:visible="false" toolbar:helpid="20404"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:helpid="10017"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:helpid="10489"/>
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="10185"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:visible="false" toolbar:helpid="5723"/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false" toolbar:helpid="10296"/>
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:visible="false" toolbar:helpid="10297"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/toolbar.xml
deleted file mode 100644
index ce47aaabe082..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/toolbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:helpid="52822"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
- <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:helpid="10371"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/viewerbar.xml b/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/viewerbar.xml
deleted file mode 100644
index d4d6a59d7ed5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/sweb/toolbar/viewerbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961" />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/menubar/menubar.xml
deleted file mode 100644
index 7e5f14f5d58c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/menubar/menubar.xml
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuitem menu:id=".uno:VersionDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menuitem menu:id=".uno:ExportToPDF"/>
- <menu:menu menu:id=".uno:SendToMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsOOo"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsMS"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:NewGlobalDoc"/>
- <menu:menuitem menu:id=".uno:NewHtmlDoc"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SendOutlineToStarImpress"/>
- <menu:menuitem menu:id=".uno:SendOutlineToClipboard"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CreateAbstract"/>
- <menu:menuitem menu:id=".uno:SendAbstractToStarImpress"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PrintPreview"/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuitem menu:id=".uno:Repeat"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteSpecial"/>
- <menu:menuitem menu:id=".uno:SelectTextMode"/>
- <menu:menu menu:id=".uno:SelectionModeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectionModeDefault" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SelectionModeBlock" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ChangesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TrackChanges"/>
- <menu:menuitem menu:id=".uno:ProtectTraceChangeMode"/>
- <menu:menuitem menu:id=".uno:ShowTrackedChanges"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AcceptTrackedChanges"/>
- <menu:menuitem menu:id=".uno:CommentChangeTracking"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:CompareDocuments"/>
- <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
- <menu:menuitem menu:id=".uno:SearchDialog"/>
- <menu:menuitem menu:id=".uno:EditGlossary"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
- <menu:menuitem menu:id=".uno:FieldDialog"/>
- <menu:menuitem menu:id=".uno:EditFootnote"/>
- <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
- <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
- <menu:menuitem menu:id=".uno:EditHyperlink"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
- <menu:menuitem menu:id=".uno:ImageMapDialog"/>
- <menu:menuitem menu:id=".uno:ObjectMenue"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:PrintLayout" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:BrowseView" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuitem menu:id=".uno:Ruler"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewBounds"/>
- <menu:menuitem menu:id=".uno:Marks"/>
- <menu:menuitem menu:id=".uno:Fieldnames"/>
- <menu:menuitem menu:id=".uno:ControlCodes"/>
- <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
- <menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertBreak"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertSymbol"/>
- <menu:menu menu:id=".uno:FormattingMarkMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
- <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
- <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
- <menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
- <menu:menuitem menu:id=".uno:InsertLRM"/>
- <menu:menuitem menu:id=".uno:InsertRLM"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertSection"/>
- <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertPageHeader"/>
- <menu:menuitem menu:id=".uno:InsertPageFooter"/>
- <menu:menuitem menu:id=".uno:InsertFootnoteDialog"/>
- <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
- <menu:menuitem menu:id=".uno:InsertBookmark"/>
- <menu:menuitem menu:id=".uno:InsertReferenceField"/>
- <menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuitem menu:id=".uno:InsertScript"/>
- <menu:menu menu:id=".uno:IndexesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertIndexesEntry"/>
- <menu:menuitem menu:id=".uno:InsertMultiIndex"/>
- <menu:menuitem menu:id=".uno:InsertAuthoritiesEntry"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertEnvelope"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertFrame"/>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertGraphicRuler"/>
- <menu:menu menu:id=".uno:GraphicMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertGraphic"/>
- <menu:menu menu:id=".uno:Scan">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TwainSelect"/>
- <menu:menuitem menu:id=".uno:TwainTransfer"/>
- </menu:menupopup>
- </menu:menu>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertAVMedia"/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertObject"/>
- <menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
- <menu:menuitem menu:id=".uno:InsertObjectChart"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertDoc"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:TransliterateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:RubyDialog"/>
- <menu:menuitem menu:id=".uno:FormatColumns"/>
- <menu:menuitem menu:id=".uno:EditRegion"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DesignerDialog"/>
- <menu:menu menu:id=".uno:AutoFormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:OnlineAutoFormat"/>
- <menu:menuitem menu:id=".uno:AutoFormatApply"/>
- <menu:menuitem menu:id=".uno:AutoFormatRedlineApply"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:AnchorMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WrapMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:WrapOff"/>
- <menu:menuitem menu:id=".uno:WrapOn"/>
- <menu:menuitem menu:id=".uno:WrapIdeal"/>
- <menu:menuitem menu:id=".uno:WrapThrough"/>
- <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WrapContour"/>
- <menu:menuitem menu:id=".uno:ContourDialog"/>
- <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TextWrap"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectAlign">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ArrangeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:BringToFront"/>
- <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
- <menu:menuitem menu:id=".uno:ObjectBackOne"/>
- <menu:menuitem menu:id=".uno:SendToBack"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
- <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FlipMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:GroupMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormatGroup"/>
- <menu:menuitem menu:id=".uno:FormatUngroup"/>
- <menu:menuitem menu:id=".uno:EnterGroup"/>
- <menu:menuitem menu:id=".uno:LeaveGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
- <menu:menuitem menu:id=".uno:FormatArea"/>
- <menu:menuitem menu:id=".uno:TextAttributes"/>
- <menu:menuitem menu:id=".uno:FontWork"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
- <menu:menuitem menu:id=".uno:NameGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:FrameDialog"/>
- <menu:menuitem menu:id=".uno:GraphicDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:TableInsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertRowDialog"/>
- <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableDeleteMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DeleteTable"/>
- <menu:menuitem menu:id=".uno:DeleteRows"/>
- <menu:menuitem menu:id=".uno:DeleteColumns"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableSelectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectTable"/>
- <menu:menuitem menu:id=".uno:EntireRow"/>
- <menu:menuitem menu:id=".uno:EntireColumn"/>
- <menu:menuitem menu:id=".uno:EntireCell"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:MergeCells"/>
- <menu:menuitem menu:id=".uno:SplitCell"/>
- <menu:menuitem menu:id=".uno:Protect"/>
- <menu:menuitem menu:id=".uno:MergeTable"/>
- <menu:menuitem menu:id=".uno:SplitTable"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoFormat"/>
- <menu:menu menu:id=".uno:TableAutoFitMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:DistributeColumns"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetRowHeight"/>
- <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
- <menu:menuitem menu:id=".uno:DistributeRows"/>
- <menu:menuitem menu:id=".uno:RowSplit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:HeadingRowsRepeat"/>
- <menu:menu menu:id=".uno:TableConvertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ConvertTextToTable"/>
- <menu:menuitem menu:id=".uno:ConvertTableToText"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:TableSort"/>
- <menu:menuitem menu:id=".uno:InsertFormula"/>
- <menu:menuitem menu:id=".uno:TableNumberFormatDialog"/>
- <menu:menuitem menu:id=".uno:TableBoundaries"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TableDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SpellingAndGrammarDialog"/>
- <menu:menu menu:id=".uno:LanguageMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
- <menu:menuitem menu:id=".uno:ChineseConversion"/>
- <menu:menuitem menu:id=".uno:ThesaurusDialog"/>
- <menu:menuitem menu:id=".uno:Hyphenate"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MoreDictionaries"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:WordCountDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChapterNumberingDialog"/>
- <menu:menuitem menu:id=".uno:LineNumberingDialog"/>
- <menu:menuitem menu:id=".uno:FootnoteDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Gallery"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:BibliographyComponent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MailMergeWizard"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SortDialog"/>
- <menu:menuitem menu:id=".uno:CalculateSel"/>
- <menu:menu menu:id=".uno:UpdateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:UpdateAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:UpdateFields"/>
- <menu:menuitem menu:id=".uno:UpdateAllLinks"/>
- <menu:menuitem menu:id=".uno:UpdateCharts"/>
- <menu:menuitem menu:id=".uno:UpdateCurIndex"/>
- <menu:menuitem menu:id=".uno:UpdateAllIndexes"/>
- <menu:menuitem menu:id=".uno:Repaginate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/statusbar/statusbar.xml
deleted file mode 100644
index f6880369df08..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/statusbar/statusbar.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:21181"/>
- <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79" statusbar:helpid="helpid:21182"/>
- <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35" statusbar:helpid="helpid:10000"/>
-</statusbar:statusbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/alignmentbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/alignmentbar.xml
deleted file mode 100644
index dbd7294e566c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/alignmentbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131" />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134" />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135" />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/arrowshapes.xml
deleted file mode 100644
index 4a53519494ea..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/basicshapes.xml
deleted file mode 100644
index e65778305788..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/bezierobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/bezierobjectbar.xml
deleted file mode 100644
index 7c067e68d13c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/bezierobjectbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="helpid:10126" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:helpid="helpid:10121" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:helpid="helpid:10119" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierDelete" toolbar:helpid="helpid:10120" />
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine" toolbar:helpid="helpid:10127" />
- <toolbar:toolbaritem xlink:href=".uno:BezierConvert" toolbar:helpid="helpid:27065" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:helpid="helpid:27066" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:helpid="helpid:10123" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:helpid="helpid:27067" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose" toolbar:helpid="helpid:10122" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints" toolbar:helpid="helpid:27030" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/calloutshapes.xml
deleted file mode 100644
index 91b957fa697a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/colorbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/colorbar.xml
deleted file mode 100644
index adcda76b5c3a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/colorbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawbar.xml
deleted file mode 100644
index 2407475a88f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
- <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false" toolbar:helpid="10114"/>
- <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false" toolbar:helpid="10112"/>
- <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false" toolbar:helpid="10115"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/>
- <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false" toolbar:helpid="10465"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="10906"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="11004"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="11005"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="11007"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="10977"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawingobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawingobjectbar.xml
deleted file mode 100644
index 4703c3cfdad6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawingobjectbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="helpid:10143" />
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="helpid:10301" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="helpid:10169" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="helpid:10171" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="helpid:10172" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="helpid:10142" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="helpid:10164" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false" toolbar:helpid="27322"/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:visible="false" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:visible="false" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:visible="false" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false" toolbar:helpid="20584"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:helpid="10283"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="10282"/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="10455"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="10454"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawtextobjectbar.xml
deleted file mode 100644
index 31e5ca4db662..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/drawtextobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="helpid:10017" toolbar:style="dropdown" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="helpid:10907" />
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="helpid:10908" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/extrusionobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/extrusionobjectbar.xml
deleted file mode 100644
index 148849db6ee7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/extrusionobjectbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/flowchartshapes.xml
deleted file mode 100644
index bb1d1099dbd4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fontworkobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fontworkobjectbar.xml
deleted file mode 100644
index 5219a1e235e9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fontworkobjectbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:helpid="helpid:10978" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights" toolbar:helpid="helpid:10979" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:helpid="helpid:10981" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:helpid="helpid:10982" toolbar:style="dropdownonly" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fontworkshapetype.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fontworkshapetype.xml
deleted file mode 100644
index 49b5b8173e0e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fontworkshapetype.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-stop" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-pour" toolbar:helpid="helpid:10978" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formcontrols.xml
deleted file mode 100644
index 573ca246f7a9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formcontrols.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:text="" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox" toolbar:helpid="helpid:10596" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:helpid="helpid:10599" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField" toolbar:helpid="helpid:10728" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton" toolbar:helpid="helpid:10594" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:RadioButton" toolbar:helpid="helpid:10595" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ListBox" toolbar:helpid="helpid:10600" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ComboBox" toolbar:helpid="helpid:10601" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:helpid="helpid:10597" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MoreControls" toolbar:helpid="helpid:11045" />
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools" toolbar:helpid="helpid:11046" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards" toolbar:helpid="helpid:10727" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formdesign.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formdesign.xml
deleted file mode 100644
index aaa3f09d9fb1..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formdesign.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer" toolbar:helpid="helpid:10633" />
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:helpid="helpid:10623" />
- <toolbar:toolbaritem xlink:href=".uno:TabDialog" toolbar:helpid="helpid:10615" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709" />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="helpid:10454" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="helpid:10455" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:helpid="helpid:27096" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:helpid="helpid:27097" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formsfilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formsfilterbar.xml
deleted file mode 100644
index 1d1ad07a9938..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formsfilterbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormFilterExecute" toolbar:helpid="helpid:10731" />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator" toolbar:helpid="helpid:10732" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExit" toolbar:helpid="helpid:10730" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formsnavigationbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formsnavigationbar.xml
deleted file mode 100644
index ce47a450e2f5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formsnavigationbar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="10725"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecText" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:AbsoluteRecord" toolbar:helpid="10622"/>
- <toolbar:toolbaritem xlink:href=".uno:RecFromText" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RecTotal" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:FirstRecord" toolbar:helpid="10616"/>
- <toolbar:toolbaritem xlink:href=".uno:PrevRecord" toolbar:helpid="10618"/>
- <toolbar:toolbaritem xlink:href=".uno:NextRecord" toolbar:helpid="10617"/>
- <toolbar:toolbaritem xlink:href=".uno:LastRecord" toolbar:helpid="10619"/>
- <toolbar:toolbaritem xlink:href=".uno:NewRecord" toolbar:helpid="10620"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="10627"/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="10630"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRecord" toolbar:helpid="10621"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
- <toolbar:toolbaritem xlink:href=".uno:RefreshFormControl"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="10714"/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="10712"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="10713"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="10716"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="10723"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilter" toolbar:helpid="10729"/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="10711"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid" toolbar:helpid="10761"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formtextobjectbar.xml
deleted file mode 100644
index dbdeaf675371..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/formtextobjectbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/frameobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/frameobjectbar.xml
deleted file mode 100644
index a591f9094457..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/frameobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="helpid:20472" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="helpid:20473" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:helpid="helpid:20563" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:helpid="helpid:20572" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:helpid="helpid:20573" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="helpid:20474" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="helpid:20475" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="helpid:20477" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="helpid:20476" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="helpid:20478" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="helpid:20480" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="helpid:20479" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="helpid:20456" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ChainFrames" toolbar:helpid="helpid:21736" />
- <toolbar:toolbaritem xlink:href=".uno:UnhainFrames" toolbar:helpid="helpid:21737" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fullscreenbar.xml
deleted file mode 100644
index 5aecdda4fb04..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/graffilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/graffilterbar.xml
deleted file mode 100644
index 287c33fe25e5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/graffilterbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterInvert" toolbar:helpid="helpid:34149" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth" toolbar:helpid="helpid:34150" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen" toolbar:helpid="helpid:34151" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRemoveNoise" toolbar:helpid="helpid:34152" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSolarize" toolbar:helpid="helpid:34159" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSepia" toolbar:helpid="helpid:34158" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPoster" toolbar:helpid="helpid:34156" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPopart" toolbar:helpid="helpid:34157" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSobel" toolbar:helpid="helpid:34153" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRelief" toolbar:helpid="helpid:34155" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterMosaic" toolbar:helpid="helpid:34154" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/graphicobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/graphicobjectbar.xml
deleted file mode 100644
index 040bb8cd8ae6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/graphicobjectbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="11016"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
- <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/insertbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/insertbar.xml
deleted file mode 100644
index a9bb7e0eb204..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/insertbar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract" toolbar:helpid="20333"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDoc" toolbar:helpid="5532"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFootnote" toolbar:helpid="20399"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertEndnote" toolbar:helpid="21418"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="20328"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="20369"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSection" toolbar:helpid="21419"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:helpid="20335"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl" toolbar:helpid="52824"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:visible="false" toolbar:helpid="10140"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjCtrl" toolbar:visible="false" toolbar:helpid="52823"/>
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:visible="false" toolbar:helpid="10593"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex" toolbar:helpid="21420"/>
- <toolbar:toolbaritem xlink:href=".uno:EditGlossary"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="20329"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertBookmark" toolbar:helpid="20302"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/insertobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/insertobjectbar.xml
deleted file mode 100644
index 951849543373..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/insertobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:helpid="helpid:5563" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/mediaobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/mediaobjectbar.xml
deleted file mode 100644
index 2014343bf89b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/mediaobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox" toolbar:helpid="helpid:6693" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/moreformcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/moreformcontrols.xml
deleted file mode 100644
index 4c5274460a71..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/moreformcontrols.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SpinButton" toolbar:helpid="helpid:10769" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:helpid="helpid:10768" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton" toolbar:helpid="helpid:10604" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:helpid="helpid:10710" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:DateField" toolbar:helpid="helpid:10704" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:TimeField" toolbar:helpid="helpid:10705" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl" toolbar:helpid="helpid:10605" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:NumericField" toolbar:helpid="helpid:10706" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField" toolbar:helpid="helpid:10707" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:PatternField" toolbar:helpid="helpid:10708" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox" toolbar:helpid="helpid:10598" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Grid" toolbar:helpid="helpid:10603" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NavigationBar" toolbar:helpid="helpid:10607" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/numobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/numobjectbar.xml
deleted file mode 100644
index 50e28ac32f64..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/numobjectbar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementSubLevels" toolbar:helpid="20139"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph" toolbar:helpid="20136"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUp" toolbar:helpid="20134"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDown" toolbar:helpid="20135"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems" toolbar:helpid="20141"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDownSubItems" toolbar:helpid="20142"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/>
- <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/oleobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/oleobjectbar.xml
deleted file mode 100644
index c95b1aebb316..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/oleobjectbar.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="20475"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="20477"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="20476"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="20478"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="20480"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="20479"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="10187"/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="10200"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="10201"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/optimizetablebar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/optimizetablebar.xml
deleted file mode 100644
index 7669add92e89..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/optimizetablebar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DistributeColumns" toolbar:helpid="helpid:20582" />
- <toolbar:toolbaritem xlink:href=".uno:DistributeRows" toolbar:helpid="helpid:20583" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight" toolbar:helpid="helpid:20528" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth" toolbar:helpid="helpid:20521" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/previewobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/previewobjectbar.xml
deleted file mode 100644
index 435250b63af5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/previewobjectbar.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:PageUp" toolbar:helpid="20937"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown" toolbar:helpid="20938"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowBookview" toolbar:helpid="helpid:21255" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviewZoom" toolbar:helpid="53071"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/standardbar.xml
deleted file mode 100644
index c1b38e3870f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/standardbar.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501"/>
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="5710"/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="5711"/>
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="5712"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="5715"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/>
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
- <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
- <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/starshapes.xml
deleted file mode 100644
index a2ff874d2fe7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12" toolbar:helpid="helpid:11007" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate" toolbar:helpid="helpid:11007" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/symbolshapes.xml
deleted file mode 100644
index 0fa6aee313db..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/tableobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/tableobjectbar.xml
deleted file mode 100644
index d34267a6e1de..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/tableobjectbar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MergeCells" toolbar:helpid="helpid:20506" />
- <toolbar:toolbaritem xlink:href=".uno:SplitCell" toolbar:helpid="helpid:20505" />
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:helpid="helpid:20510" toolbar:style="dropdown" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:helpid="helpid:20585" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:helpid="helpid:20586" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:helpid="helpid:20587" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:20501" />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:20502" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:20503" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:20504" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:helpid="helpid:20515" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:helpid="helpid:20514" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:helpid="helpid:20513" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat" toolbar:helpid="helpid:20595" />
- <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:helpid="helpid:20459" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableSort" toolbar:helpid="helpid:20533" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoSum" toolbar:helpid="helpid:20595" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/textobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/textobjectbar.xml
deleted file mode 100644
index d48a96df35dc..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/textobjectbar.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="helpid:20144" />
- <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="helpid:20138" />
- <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" toolbar:helpid="helpid:10461" />
- <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" toolbar:helpid="helpid:10462" />
- <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:helpid="helpid:20403" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:helpid="helpid:20404" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:helpid="helpid:10017" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:helpid="helpid:10489" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:visible="false" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/toolbar.xml
deleted file mode 100644
index 7ff331e17224..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/toolbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:helpid="52822"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShadowCursor" toolbar:helpid="22204"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
- <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
- <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/viewerbar.xml b/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/viewerbar.xml
deleted file mode 100644
index d4d6a59d7ed5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swform/toolbar/viewerbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961" />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/menubar/menubar.xml
deleted file mode 100644
index 7e5f14f5d58c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/menubar/menubar.xml
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuitem menu:id=".uno:VersionDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menuitem menu:id=".uno:ExportToPDF"/>
- <menu:menu menu:id=".uno:SendToMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsOOo"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsMS"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:NewGlobalDoc"/>
- <menu:menuitem menu:id=".uno:NewHtmlDoc"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SendOutlineToStarImpress"/>
- <menu:menuitem menu:id=".uno:SendOutlineToClipboard"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CreateAbstract"/>
- <menu:menuitem menu:id=".uno:SendAbstractToStarImpress"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PrintPreview"/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuitem menu:id=".uno:Repeat"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteSpecial"/>
- <menu:menuitem menu:id=".uno:SelectTextMode"/>
- <menu:menu menu:id=".uno:SelectionModeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectionModeDefault" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SelectionModeBlock" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ChangesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TrackChanges"/>
- <menu:menuitem menu:id=".uno:ProtectTraceChangeMode"/>
- <menu:menuitem menu:id=".uno:ShowTrackedChanges"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AcceptTrackedChanges"/>
- <menu:menuitem menu:id=".uno:CommentChangeTracking"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:CompareDocuments"/>
- <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
- <menu:menuitem menu:id=".uno:SearchDialog"/>
- <menu:menuitem menu:id=".uno:EditGlossary"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
- <menu:menuitem menu:id=".uno:FieldDialog"/>
- <menu:menuitem menu:id=".uno:EditFootnote"/>
- <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
- <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
- <menu:menuitem menu:id=".uno:EditHyperlink"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
- <menu:menuitem menu:id=".uno:ImageMapDialog"/>
- <menu:menuitem menu:id=".uno:ObjectMenue"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:PrintLayout" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:BrowseView" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuitem menu:id=".uno:Ruler"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewBounds"/>
- <menu:menuitem menu:id=".uno:Marks"/>
- <menu:menuitem menu:id=".uno:Fieldnames"/>
- <menu:menuitem menu:id=".uno:ControlCodes"/>
- <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
- <menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertBreak"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertSymbol"/>
- <menu:menu menu:id=".uno:FormattingMarkMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
- <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
- <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
- <menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
- <menu:menuitem menu:id=".uno:InsertLRM"/>
- <menu:menuitem menu:id=".uno:InsertRLM"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertSection"/>
- <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertPageHeader"/>
- <menu:menuitem menu:id=".uno:InsertPageFooter"/>
- <menu:menuitem menu:id=".uno:InsertFootnoteDialog"/>
- <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
- <menu:menuitem menu:id=".uno:InsertBookmark"/>
- <menu:menuitem menu:id=".uno:InsertReferenceField"/>
- <menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuitem menu:id=".uno:InsertScript"/>
- <menu:menu menu:id=".uno:IndexesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertIndexesEntry"/>
- <menu:menuitem menu:id=".uno:InsertMultiIndex"/>
- <menu:menuitem menu:id=".uno:InsertAuthoritiesEntry"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertEnvelope"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertFrame"/>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertGraphicRuler"/>
- <menu:menu menu:id=".uno:GraphicMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertGraphic"/>
- <menu:menu menu:id=".uno:Scan">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TwainSelect"/>
- <menu:menuitem menu:id=".uno:TwainTransfer"/>
- </menu:menupopup>
- </menu:menu>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertAVMedia"/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertObject"/>
- <menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
- <menu:menuitem menu:id=".uno:InsertObjectChart"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertDoc"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:TransliterateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:RubyDialog"/>
- <menu:menuitem menu:id=".uno:FormatColumns"/>
- <menu:menuitem menu:id=".uno:EditRegion"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DesignerDialog"/>
- <menu:menu menu:id=".uno:AutoFormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:OnlineAutoFormat"/>
- <menu:menuitem menu:id=".uno:AutoFormatApply"/>
- <menu:menuitem menu:id=".uno:AutoFormatRedlineApply"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:AnchorMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WrapMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:WrapOff"/>
- <menu:menuitem menu:id=".uno:WrapOn"/>
- <menu:menuitem menu:id=".uno:WrapIdeal"/>
- <menu:menuitem menu:id=".uno:WrapThrough"/>
- <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WrapContour"/>
- <menu:menuitem menu:id=".uno:ContourDialog"/>
- <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TextWrap"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectAlign">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ArrangeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:BringToFront"/>
- <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
- <menu:menuitem menu:id=".uno:ObjectBackOne"/>
- <menu:menuitem menu:id=".uno:SendToBack"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
- <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FlipMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:GroupMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormatGroup"/>
- <menu:menuitem menu:id=".uno:FormatUngroup"/>
- <menu:menuitem menu:id=".uno:EnterGroup"/>
- <menu:menuitem menu:id=".uno:LeaveGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
- <menu:menuitem menu:id=".uno:FormatArea"/>
- <menu:menuitem menu:id=".uno:TextAttributes"/>
- <menu:menuitem menu:id=".uno:FontWork"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
- <menu:menuitem menu:id=".uno:NameGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:FrameDialog"/>
- <menu:menuitem menu:id=".uno:GraphicDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:TableInsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertRowDialog"/>
- <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableDeleteMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DeleteTable"/>
- <menu:menuitem menu:id=".uno:DeleteRows"/>
- <menu:menuitem menu:id=".uno:DeleteColumns"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableSelectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectTable"/>
- <menu:menuitem menu:id=".uno:EntireRow"/>
- <menu:menuitem menu:id=".uno:EntireColumn"/>
- <menu:menuitem menu:id=".uno:EntireCell"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:MergeCells"/>
- <menu:menuitem menu:id=".uno:SplitCell"/>
- <menu:menuitem menu:id=".uno:Protect"/>
- <menu:menuitem menu:id=".uno:MergeTable"/>
- <menu:menuitem menu:id=".uno:SplitTable"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoFormat"/>
- <menu:menu menu:id=".uno:TableAutoFitMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:DistributeColumns"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetRowHeight"/>
- <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
- <menu:menuitem menu:id=".uno:DistributeRows"/>
- <menu:menuitem menu:id=".uno:RowSplit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:HeadingRowsRepeat"/>
- <menu:menu menu:id=".uno:TableConvertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ConvertTextToTable"/>
- <menu:menuitem menu:id=".uno:ConvertTableToText"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:TableSort"/>
- <menu:menuitem menu:id=".uno:InsertFormula"/>
- <menu:menuitem menu:id=".uno:TableNumberFormatDialog"/>
- <menu:menuitem menu:id=".uno:TableBoundaries"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TableDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SpellingAndGrammarDialog"/>
- <menu:menu menu:id=".uno:LanguageMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
- <menu:menuitem menu:id=".uno:ChineseConversion"/>
- <menu:menuitem menu:id=".uno:ThesaurusDialog"/>
- <menu:menuitem menu:id=".uno:Hyphenate"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MoreDictionaries"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:WordCountDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChapterNumberingDialog"/>
- <menu:menuitem menu:id=".uno:LineNumberingDialog"/>
- <menu:menuitem menu:id=".uno:FootnoteDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Gallery"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:BibliographyComponent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MailMergeWizard"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SortDialog"/>
- <menu:menuitem menu:id=".uno:CalculateSel"/>
- <menu:menu menu:id=".uno:UpdateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:UpdateAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:UpdateFields"/>
- <menu:menuitem menu:id=".uno:UpdateAllLinks"/>
- <menu:menuitem menu:id=".uno:UpdateCharts"/>
- <menu:menuitem menu:id=".uno:UpdateCurIndex"/>
- <menu:menuitem menu:id=".uno:UpdateAllIndexes"/>
- <menu:menuitem menu:id=".uno:Repaginate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/statusbar/statusbar.xml
deleted file mode 100644
index f6880369df08..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/statusbar/statusbar.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:21181"/>
- <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79" statusbar:helpid="helpid:21182"/>
- <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35" statusbar:helpid="helpid:10000"/>
-</statusbar:statusbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/alignmentbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/alignmentbar.xml
deleted file mode 100644
index dbd7294e566c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/alignmentbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131" />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134" />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135" />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/arrowshapes.xml
deleted file mode 100644
index 4a53519494ea..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/basicshapes.xml
deleted file mode 100644
index e65778305788..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/bezierobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/bezierobjectbar.xml
deleted file mode 100644
index 7c067e68d13c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/bezierobjectbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="helpid:10126" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:helpid="helpid:10121" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:helpid="helpid:10119" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierDelete" toolbar:helpid="helpid:10120" />
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine" toolbar:helpid="helpid:10127" />
- <toolbar:toolbaritem xlink:href=".uno:BezierConvert" toolbar:helpid="helpid:27065" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:helpid="helpid:27066" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:helpid="helpid:10123" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:helpid="helpid:27067" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose" toolbar:helpid="helpid:10122" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints" toolbar:helpid="helpid:27030" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/calloutshapes.xml
deleted file mode 100644
index 91b957fa697a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/colorbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/colorbar.xml
deleted file mode 100644
index adcda76b5c3a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/colorbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawbar.xml
deleted file mode 100644
index 2407475a88f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
- <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false" toolbar:helpid="10114"/>
- <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false" toolbar:helpid="10112"/>
- <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false" toolbar:helpid="10115"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/>
- <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false" toolbar:helpid="10465"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="10906"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="11004"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="11005"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="11007"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="10977"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawingobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawingobjectbar.xml
deleted file mode 100644
index 4703c3cfdad6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawingobjectbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="helpid:10143" />
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="helpid:10301" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="helpid:10169" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="helpid:10171" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="helpid:10172" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="helpid:10142" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="helpid:10164" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false" toolbar:helpid="27322"/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:visible="false" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:visible="false" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:visible="false" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false" toolbar:helpid="20584"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:helpid="10283"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="10282"/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="10455"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="10454"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawtextobjectbar.xml
deleted file mode 100644
index 31e5ca4db662..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/drawtextobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="helpid:10017" toolbar:style="dropdown" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="helpid:10907" />
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="helpid:10908" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/extrusionobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/extrusionobjectbar.xml
deleted file mode 100644
index 148849db6ee7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/extrusionobjectbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/flowchartshapes.xml
deleted file mode 100644
index bb1d1099dbd4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fontworkobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fontworkobjectbar.xml
deleted file mode 100644
index 5219a1e235e9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fontworkobjectbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:helpid="helpid:10978" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights" toolbar:helpid="helpid:10979" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:helpid="helpid:10981" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:helpid="helpid:10982" toolbar:style="dropdownonly" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fontworkshapetype.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fontworkshapetype.xml
deleted file mode 100644
index 49b5b8173e0e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fontworkshapetype.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-stop" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-pour" toolbar:helpid="helpid:10978" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formcontrols.xml
deleted file mode 100644
index 573ca246f7a9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formcontrols.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:text="" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox" toolbar:helpid="helpid:10596" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:helpid="helpid:10599" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField" toolbar:helpid="helpid:10728" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton" toolbar:helpid="helpid:10594" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:RadioButton" toolbar:helpid="helpid:10595" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ListBox" toolbar:helpid="helpid:10600" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ComboBox" toolbar:helpid="helpid:10601" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:helpid="helpid:10597" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MoreControls" toolbar:helpid="helpid:11045" />
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools" toolbar:helpid="helpid:11046" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards" toolbar:helpid="helpid:10727" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formdesign.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formdesign.xml
deleted file mode 100644
index f1cf268cea2a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formdesign.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowDataNavigator" toolbar:helpid="helpid:10773" />
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer" toolbar:helpid="helpid:10633" />
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:helpid="helpid:10623" />
- <toolbar:toolbaritem xlink:href=".uno:TabDialog" toolbar:helpid="helpid:10615" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709" />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="helpid:10454" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="helpid:10455" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:helpid="helpid:27096" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:helpid="helpid:27097" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formsfilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formsfilterbar.xml
deleted file mode 100644
index 1d1ad07a9938..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formsfilterbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormFilterExecute" toolbar:helpid="helpid:10731" />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator" toolbar:helpid="helpid:10732" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExit" toolbar:helpid="helpid:10730" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formsnavigationbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formsnavigationbar.xml
deleted file mode 100644
index c6e16444a55d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formsnavigationbar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="10725"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecText" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:AbsoluteRecord" toolbar:helpid="10622"/>
- <toolbar:toolbaritem xlink:href=".uno:RecFromText" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RecTotal" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:FirstRecord" toolbar:helpid="10616"/>
- <toolbar:toolbaritem xlink:href=".uno:PrevRecord" toolbar:helpid="10618"/>
- <toolbar:toolbaritem xlink:href=".uno:NextRecord" toolbar:helpid="10617"/>
- <toolbar:toolbaritem xlink:href=".uno:LastRecord" toolbar:helpid="10619"/>
- <toolbar:toolbaritem xlink:href=".uno:NewRecord" toolbar:helpid="10620"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="10627"/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="10630"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRecord" toolbar:helpid="10621"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="10714"/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="10712"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="10713"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="10716"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="10723"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilter" toolbar:helpid="10729"/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="10711"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid" toolbar:helpid="10761"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formtextobjectbar.xml
deleted file mode 100644
index dbdeaf675371..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/formtextobjectbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/frameobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/frameobjectbar.xml
deleted file mode 100644
index a591f9094457..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/frameobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="helpid:20472" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="helpid:20473" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:helpid="helpid:20563" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:helpid="helpid:20572" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:helpid="helpid:20573" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="helpid:20474" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="helpid:20475" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="helpid:20477" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="helpid:20476" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="helpid:20478" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="helpid:20480" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="helpid:20479" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="helpid:20456" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ChainFrames" toolbar:helpid="helpid:21736" />
- <toolbar:toolbaritem xlink:href=".uno:UnhainFrames" toolbar:helpid="helpid:21737" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fullscreenbar.xml
deleted file mode 100644
index 5aecdda4fb04..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/graffilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/graffilterbar.xml
deleted file mode 100644
index 287c33fe25e5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/graffilterbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterInvert" toolbar:helpid="helpid:34149" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth" toolbar:helpid="helpid:34150" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen" toolbar:helpid="helpid:34151" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRemoveNoise" toolbar:helpid="helpid:34152" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSolarize" toolbar:helpid="helpid:34159" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSepia" toolbar:helpid="helpid:34158" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPoster" toolbar:helpid="helpid:34156" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPopart" toolbar:helpid="helpid:34157" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSobel" toolbar:helpid="helpid:34153" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRelief" toolbar:helpid="helpid:34155" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterMosaic" toolbar:helpid="helpid:34154" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/graphicobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/graphicobjectbar.xml
deleted file mode 100644
index 040bb8cd8ae6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/graphicobjectbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="11016"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
- <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/insertbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/insertbar.xml
deleted file mode 100644
index a9bb7e0eb204..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/insertbar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract" toolbar:helpid="20333"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDoc" toolbar:helpid="5532"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFootnote" toolbar:helpid="20399"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertEndnote" toolbar:helpid="21418"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="20328"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="20369"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSection" toolbar:helpid="21419"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:helpid="20335"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl" toolbar:helpid="52824"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:visible="false" toolbar:helpid="10140"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjCtrl" toolbar:visible="false" toolbar:helpid="52823"/>
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:visible="false" toolbar:helpid="10593"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex" toolbar:helpid="21420"/>
- <toolbar:toolbaritem xlink:href=".uno:EditGlossary"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="20329"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertBookmark" toolbar:helpid="20302"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/insertobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/insertobjectbar.xml
deleted file mode 100644
index 951849543373..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/insertobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:helpid="helpid:5563" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/mediaobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/mediaobjectbar.xml
deleted file mode 100644
index 2014343bf89b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/mediaobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox" toolbar:helpid="helpid:6693" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/moreformcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/moreformcontrols.xml
deleted file mode 100644
index 4c5274460a71..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/moreformcontrols.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SpinButton" toolbar:helpid="helpid:10769" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:helpid="helpid:10768" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton" toolbar:helpid="helpid:10604" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:helpid="helpid:10710" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:DateField" toolbar:helpid="helpid:10704" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:TimeField" toolbar:helpid="helpid:10705" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl" toolbar:helpid="helpid:10605" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:NumericField" toolbar:helpid="helpid:10706" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField" toolbar:helpid="helpid:10707" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:PatternField" toolbar:helpid="helpid:10708" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox" toolbar:helpid="helpid:10598" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Grid" toolbar:helpid="helpid:10603" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NavigationBar" toolbar:helpid="helpid:10607" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/numobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/numobjectbar.xml
deleted file mode 100644
index 50e28ac32f64..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/numobjectbar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementSubLevels" toolbar:helpid="20139"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph" toolbar:helpid="20136"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUp" toolbar:helpid="20134"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDown" toolbar:helpid="20135"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems" toolbar:helpid="20141"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDownSubItems" toolbar:helpid="20142"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/>
- <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/oleobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/oleobjectbar.xml
deleted file mode 100644
index c95b1aebb316..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/oleobjectbar.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="20475"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="20477"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="20476"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="20478"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="20480"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="20479"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="10187"/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="10200"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="10201"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/optimizetablebar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/optimizetablebar.xml
deleted file mode 100644
index 7669add92e89..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/optimizetablebar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DistributeColumns" toolbar:helpid="helpid:20582" />
- <toolbar:toolbaritem xlink:href=".uno:DistributeRows" toolbar:helpid="helpid:20583" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight" toolbar:helpid="helpid:20528" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth" toolbar:helpid="helpid:20521" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/previewobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/previewobjectbar.xml
deleted file mode 100644
index 435250b63af5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/previewobjectbar.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:PageUp" toolbar:helpid="20937"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown" toolbar:helpid="20938"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowBookview" toolbar:helpid="helpid:21255" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviewZoom" toolbar:helpid="53071"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/standardbar.xml
deleted file mode 100644
index c1b38e3870f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/standardbar.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501"/>
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="5710"/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="5711"/>
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="5712"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="5715"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/>
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
- <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
- <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/starshapes.xml
deleted file mode 100644
index a2ff874d2fe7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12" toolbar:helpid="helpid:11007" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate" toolbar:helpid="helpid:11007" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/symbolshapes.xml
deleted file mode 100644
index 0fa6aee313db..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/tableobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/tableobjectbar.xml
deleted file mode 100644
index d34267a6e1de..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/tableobjectbar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MergeCells" toolbar:helpid="helpid:20506" />
- <toolbar:toolbaritem xlink:href=".uno:SplitCell" toolbar:helpid="helpid:20505" />
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:helpid="helpid:20510" toolbar:style="dropdown" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:helpid="helpid:20585" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:helpid="helpid:20586" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:helpid="helpid:20587" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:20501" />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:20502" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:20503" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:20504" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:helpid="helpid:20515" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:helpid="helpid:20514" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:helpid="helpid:20513" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat" toolbar:helpid="helpid:20595" />
- <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:helpid="helpid:20459" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableSort" toolbar:helpid="helpid:20533" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoSum" toolbar:helpid="helpid:20595" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/textobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/textobjectbar.xml
deleted file mode 100644
index d48a96df35dc..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/textobjectbar.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="helpid:20144" />
- <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="helpid:20138" />
- <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" toolbar:helpid="helpid:10461" />
- <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" toolbar:helpid="helpid:10462" />
- <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:helpid="helpid:20403" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:helpid="helpid:20404" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:helpid="helpid:10017" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:helpid="helpid:10489" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:visible="false" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/toolbar.xml
deleted file mode 100644
index 7ff331e17224..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/toolbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:helpid="52822"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShadowCursor" toolbar:helpid="22204"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
- <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
- <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/viewerbar.xml b/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/viewerbar.xml
deleted file mode 100644
index d4d6a59d7ed5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swreport/toolbar/viewerbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961" />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/menubar/menubar.xml
deleted file mode 100644
index 02107d0088a2..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/menubar/menubar.xml
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuitem menu:id=".uno:VersionDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menuitem menu:id=".uno:ExportToPDF"/>
- <menu:menu menu:id=".uno:SendToMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsOOo"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsMS"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:NewGlobalDoc"/>
- <menu:menuitem menu:id=".uno:NewHtmlDoc"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SendOutlineToStarImpress"/>
- <menu:menuitem menu:id=".uno:SendOutlineToClipboard"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CreateAbstract"/>
- <menu:menuitem menu:id=".uno:SendAbstractToStarImpress"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menuitem menu:id=".uno:Signature"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WebHtml"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PrintPreview"/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuitem menu:id=".uno:Repeat"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteSpecial"/>
- <menu:menuitem menu:id=".uno:SelectTextMode"/>
- <menu:menu menu:id=".uno:SelectionModeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectionModeDefault" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SelectionModeBlock" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ChangesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TrackChanges"/>
- <menu:menuitem menu:id=".uno:ProtectTraceChangeMode"/>
- <menu:menuitem menu:id=".uno:ShowTrackedChanges"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AcceptTrackedChanges"/>
- <menu:menuitem menu:id=".uno:CommentChangeTracking"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:CompareDocuments"/>
- <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
- <menu:menuitem menu:id=".uno:SearchDialog"/>
- <menu:menuitem menu:id=".uno:EditGlossary"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
- <menu:menuitem menu:id=".uno:FieldDialog"/>
- <menu:menuitem menu:id=".uno:EditFootnote"/>
- <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
- <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
- <menu:menuitem menu:id=".uno:EditHyperlink"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
- <menu:menuitem menu:id=".uno:ImageMapDialog"/>
- <menu:menuitem menu:id=".uno:ObjectMenue"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:PrintLayout" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:BrowseView" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuitem menu:id=".uno:Ruler"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewBounds"/>
- <menu:menuitem menu:id=".uno:Marks"/>
- <menu:menuitem menu:id=".uno:Fieldnames"/>
- <menu:menuitem menu:id=".uno:ControlCodes"/>
- <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
- <menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertBreak"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertSymbol"/>
- <menu:menu menu:id=".uno:FormattingMarkMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
- <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
- <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
- <menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
- <menu:menuitem menu:id=".uno:InsertLRM"/>
- <menu:menuitem menu:id=".uno:InsertRLM"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertSection"/>
- <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertPageHeader"/>
- <menu:menuitem menu:id=".uno:InsertPageFooter"/>
- <menu:menuitem menu:id=".uno:InsertFootnoteDialog"/>
- <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
- <menu:menuitem menu:id=".uno:InsertBookmark"/>
- <menu:menuitem menu:id=".uno:InsertReferenceField"/>
- <menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuitem menu:id=".uno:InsertScript"/>
- <menu:menu menu:id=".uno:IndexesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertIndexesEntry"/>
- <menu:menuitem menu:id=".uno:InsertMultiIndex"/>
- <menu:menuitem menu:id=".uno:InsertAuthoritiesEntry"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertEnvelope"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertFrame"/>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertGraphicRuler"/>
- <menu:menu menu:id=".uno:GraphicMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertGraphic"/>
- <menu:menu menu:id=".uno:Scan">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TwainSelect"/>
- <menu:menuitem menu:id=".uno:TwainTransfer"/>
- </menu:menupopup>
- </menu:menu>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertAVMedia"/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertObject"/>
- <menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
- <menu:menuitem menu:id=".uno:InsertObjectChart"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertDoc"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
- <menu:menuitem menu:id=".uno:TitlePageDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:TransliterateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:RubyDialog"/>
- <menu:menuitem menu:id=".uno:FormatColumns"/>
- <menu:menuitem menu:id=".uno:EditRegion"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DesignerDialog"/>
- <menu:menu menu:id=".uno:AutoFormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:OnlineAutoFormat"/>
- <menu:menuitem menu:id=".uno:AutoFormatApply"/>
- <menu:menuitem menu:id=".uno:AutoFormatRedlineApply"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:AnchorMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WrapMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:WrapOff"/>
- <menu:menuitem menu:id=".uno:WrapOn"/>
- <menu:menuitem menu:id=".uno:WrapIdeal"/>
- <menu:menuitem menu:id=".uno:WrapThrough"/>
- <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WrapContour"/>
- <menu:menuitem menu:id=".uno:ContourDialog"/>
- <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TextWrap"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectAlign">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ArrangeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:BringToFront"/>
- <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
- <menu:menuitem menu:id=".uno:ObjectBackOne"/>
- <menu:menuitem menu:id=".uno:SendToBack"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
- <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FlipMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:GroupMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormatGroup"/>
- <menu:menuitem menu:id=".uno:FormatUngroup"/>
- <menu:menuitem menu:id=".uno:EnterGroup"/>
- <menu:menuitem menu:id=".uno:LeaveGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
- <menu:menuitem menu:id=".uno:FormatArea"/>
- <menu:menuitem menu:id=".uno:TextAttributes"/>
- <menu:menuitem menu:id=".uno:FontWork"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
- <menu:menuitem menu:id=".uno:NameGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:FrameDialog"/>
- <menu:menuitem menu:id=".uno:GraphicDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:TableInsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertRowDialog"/>
- <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableDeleteMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DeleteTable"/>
- <menu:menuitem menu:id=".uno:DeleteRows"/>
- <menu:menuitem menu:id=".uno:DeleteColumns"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableSelectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectTable"/>
- <menu:menuitem menu:id=".uno:EntireRow"/>
- <menu:menuitem menu:id=".uno:EntireColumn"/>
- <menu:menuitem menu:id=".uno:EntireCell"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:MergeCells"/>
- <menu:menuitem menu:id=".uno:SplitCell"/>
- <menu:menuitem menu:id=".uno:Protect"/>
- <menu:menuitem menu:id=".uno:MergeTable"/>
- <menu:menuitem menu:id=".uno:SplitTable"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoFormat"/>
- <menu:menu menu:id=".uno:TableAutoFitMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:DistributeColumns"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetRowHeight"/>
- <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
- <menu:menuitem menu:id=".uno:DistributeRows"/>
- <menu:menuitem menu:id=".uno:RowSplit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:HeadingRowsRepeat"/>
- <menu:menu menu:id=".uno:TableConvertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ConvertTextToTable"/>
- <menu:menuitem menu:id=".uno:ConvertTableToText"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:TableSort"/>
- <menu:menuitem menu:id=".uno:InsertFormula"/>
- <menu:menuitem menu:id=".uno:TableNumberFormatDialog"/>
- <menu:menuitem menu:id=".uno:TableBoundaries"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TableDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SpellingAndGrammarDialog"/>
- <menu:menu menu:id=".uno:LanguageMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetLanguageSelectionMenu"/>
- <menu:menuitem menu:id=".uno:SetLanguageParagraphMenu"/>
- <menu:menuitem menu:id=".uno:SetLanguageAllTextMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
- <menu:menuitem menu:id=".uno:ChineseConversion"/>
- <menu:menuitem menu:id=".uno:ThesaurusDialog"/>
- <menu:menuitem menu:id=".uno:Hyphenate"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MoreDictionaries"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:WordCountDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChapterNumberingDialog"/>
- <menu:menuitem menu:id=".uno:LineNumberingDialog"/>
- <menu:menuitem menu:id=".uno:FootnoteDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Gallery"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:BibliographyComponent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MailMergeWizard"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SortDialog"/>
- <menu:menuitem menu:id=".uno:CalculateSel"/>
- <menu:menu menu:id=".uno:UpdateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:UpdateAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:UpdateFields"/>
- <menu:menuitem menu:id=".uno:UpdateAllLinks"/>
- <menu:menuitem menu:id=".uno:UpdateCharts"/>
- <menu:menuitem menu:id=".uno:UpdateCurIndex"/>
- <menu:menuitem menu:id=".uno:UpdateAllIndexes"/>
- <menu:menuitem menu:id=".uno:Repaginate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuitem menu:id=".uno:MacroSignature"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/statusbar/statusbar.xml
deleted file mode 100644
index 3e46300cd0e7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/statusbar/statusbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:21181"/>
- <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79" statusbar:helpid="helpid:21182"/>
- <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63" statusbar:helpid="helpid:11064"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35" statusbar:helpid="helpid:10000"/>
-</statusbar:statusbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/alignmentbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/alignmentbar.xml
deleted file mode 100644
index dbd7294e566c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/alignmentbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131" />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134" />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135" />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/arrowshapes.xml
deleted file mode 100644
index 4a53519494ea..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/basicshapes.xml
deleted file mode 100644
index e65778305788..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/bezierobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/bezierobjectbar.xml
deleted file mode 100644
index 7c067e68d13c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/bezierobjectbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="helpid:10126" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:helpid="helpid:10121" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:helpid="helpid:10119" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierDelete" toolbar:helpid="helpid:10120" />
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine" toolbar:helpid="helpid:10127" />
- <toolbar:toolbaritem xlink:href=".uno:BezierConvert" toolbar:helpid="helpid:27065" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:helpid="helpid:27066" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:helpid="helpid:10123" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:helpid="helpid:27067" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose" toolbar:helpid="helpid:10122" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints" toolbar:helpid="helpid:27030" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/calloutshapes.xml
deleted file mode 100644
index 91b957fa697a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/colorbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/colorbar.xml
deleted file mode 100644
index adcda76b5c3a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/colorbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawbar.xml
deleted file mode 100644
index 2407475a88f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
- <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false" toolbar:helpid="10114"/>
- <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false" toolbar:helpid="10112"/>
- <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false" toolbar:helpid="10115"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/>
- <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false" toolbar:helpid="10465"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="10906"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="11004"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="11005"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="11007"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="10977"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawingobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawingobjectbar.xml
deleted file mode 100644
index 4703c3cfdad6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawingobjectbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="helpid:10143" />
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="helpid:10301" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="helpid:10169" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="helpid:10171" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="helpid:10172" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="helpid:10142" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="helpid:10164" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false" toolbar:helpid="27322"/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:visible="false" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:visible="false" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:visible="false" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false" toolbar:helpid="20584"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:helpid="10283"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="10282"/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="10455"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="10454"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawtextobjectbar.xml
deleted file mode 100644
index 31e5ca4db662..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/drawtextobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="helpid:10017" toolbar:style="dropdown" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="helpid:10907" />
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="helpid:10908" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/extrusionobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/extrusionobjectbar.xml
deleted file mode 100644
index 148849db6ee7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/extrusionobjectbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/findbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/findbar.xml
deleted file mode 100644
index 49e483e178a3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/findbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FindText"/>
- <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
- <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/flowchartshapes.xml
deleted file mode 100644
index bb1d1099dbd4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fontworkobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fontworkobjectbar.xml
deleted file mode 100644
index 5219a1e235e9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fontworkobjectbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:helpid="helpid:10978" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights" toolbar:helpid="helpid:10979" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:helpid="helpid:10981" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:helpid="helpid:10982" toolbar:style="dropdownonly" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fontworkshapetype.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fontworkshapetype.xml
deleted file mode 100644
index 49b5b8173e0e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fontworkshapetype.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-stop" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-pour" toolbar:helpid="helpid:10978" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formcontrols.xml
deleted file mode 100644
index 573ca246f7a9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formcontrols.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:text="" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox" toolbar:helpid="helpid:10596" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:helpid="helpid:10599" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField" toolbar:helpid="helpid:10728" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton" toolbar:helpid="helpid:10594" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:RadioButton" toolbar:helpid="helpid:10595" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ListBox" toolbar:helpid="helpid:10600" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ComboBox" toolbar:helpid="helpid:10601" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:helpid="helpid:10597" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MoreControls" toolbar:helpid="helpid:11045" />
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools" toolbar:helpid="helpid:11046" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards" toolbar:helpid="helpid:10727" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formdesign.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formdesign.xml
deleted file mode 100644
index aaa3f09d9fb1..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formdesign.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer" toolbar:helpid="helpid:10633" />
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:helpid="helpid:10623" />
- <toolbar:toolbaritem xlink:href=".uno:TabDialog" toolbar:helpid="helpid:10615" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709" />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="helpid:10454" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="helpid:10455" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:helpid="helpid:27096" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:helpid="helpid:27097" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formsfilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formsfilterbar.xml
deleted file mode 100644
index 1d1ad07a9938..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formsfilterbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormFilterExecute" toolbar:helpid="helpid:10731" />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator" toolbar:helpid="helpid:10732" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExit" toolbar:helpid="helpid:10730" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formsnavigationbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formsnavigationbar.xml
deleted file mode 100644
index ce47a450e2f5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formsnavigationbar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="10725"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecText" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:AbsoluteRecord" toolbar:helpid="10622"/>
- <toolbar:toolbaritem xlink:href=".uno:RecFromText" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RecTotal" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:FirstRecord" toolbar:helpid="10616"/>
- <toolbar:toolbaritem xlink:href=".uno:PrevRecord" toolbar:helpid="10618"/>
- <toolbar:toolbaritem xlink:href=".uno:NextRecord" toolbar:helpid="10617"/>
- <toolbar:toolbaritem xlink:href=".uno:LastRecord" toolbar:helpid="10619"/>
- <toolbar:toolbaritem xlink:href=".uno:NewRecord" toolbar:helpid="10620"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="10627"/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="10630"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRecord" toolbar:helpid="10621"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
- <toolbar:toolbaritem xlink:href=".uno:RefreshFormControl"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="10714"/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="10712"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="10713"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="10716"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="10723"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilter" toolbar:helpid="10729"/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="10711"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid" toolbar:helpid="10761"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formtextobjectbar.xml
deleted file mode 100644
index dbdeaf675371..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/formtextobjectbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/frameobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/frameobjectbar.xml
deleted file mode 100644
index a591f9094457..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/frameobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="helpid:20472" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="helpid:20473" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:helpid="helpid:20563" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:helpid="helpid:20572" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:helpid="helpid:20573" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="helpid:20474" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="helpid:20475" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="helpid:20477" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="helpid:20476" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="helpid:20478" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="helpid:20480" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="helpid:20479" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="helpid:20456" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ChainFrames" toolbar:helpid="helpid:21736" />
- <toolbar:toolbaritem xlink:href=".uno:UnhainFrames" toolbar:helpid="helpid:21737" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fullscreenbar.xml
deleted file mode 100644
index 5aecdda4fb04..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/graffilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/graffilterbar.xml
deleted file mode 100644
index 287c33fe25e5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/graffilterbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterInvert" toolbar:helpid="helpid:34149" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth" toolbar:helpid="helpid:34150" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen" toolbar:helpid="helpid:34151" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRemoveNoise" toolbar:helpid="helpid:34152" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSolarize" toolbar:helpid="helpid:34159" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSepia" toolbar:helpid="helpid:34158" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPoster" toolbar:helpid="helpid:34156" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPopart" toolbar:helpid="helpid:34157" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSobel" toolbar:helpid="helpid:34153" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRelief" toolbar:helpid="helpid:34155" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterMosaic" toolbar:helpid="helpid:34154" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/graphicobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/graphicobjectbar.xml
deleted file mode 100644
index 040bb8cd8ae6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/graphicobjectbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="11016"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
- <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/insertbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/insertbar.xml
deleted file mode 100644
index 0b86a84ad6cd..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/insertbar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSection" toolbar:helpid="21419"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract" toolbar:helpid="20333"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false" toolbar:helpid="helpid:5563" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFootnote" toolbar:helpid="20399"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertEndnote" toolbar:helpid="21418"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="20329"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertBookmark" toolbar:helpid="20302"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertReferenceField" toolbar:visible="false" toolbar:helpid="20313"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDoc" toolbar:visible="false" toolbar:helpid="5532"/>
- <toolbar:toolbaritem xlink:href=".uno:EditGlossary"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="20328"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl" toolbar:helpid="52824"/>
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:visible="false" toolbar:helpid="10593"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="20369"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false" toolbar:helpid="helpid:5561" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false" toolbar:helpid="helpid:5672" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex" toolbar:helpid="21420"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:helpid="20335"/>
-</toolbar:toolbar>
-
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/mediaobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/mediaobjectbar.xml
deleted file mode 100644
index 2014343bf89b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/mediaobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox" toolbar:helpid="helpid:6693" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/moreformcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/moreformcontrols.xml
deleted file mode 100644
index 4c5274460a71..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/moreformcontrols.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SpinButton" toolbar:helpid="helpid:10769" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:helpid="helpid:10768" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton" toolbar:helpid="helpid:10604" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:helpid="helpid:10710" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:DateField" toolbar:helpid="helpid:10704" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:TimeField" toolbar:helpid="helpid:10705" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl" toolbar:helpid="helpid:10605" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:NumericField" toolbar:helpid="helpid:10706" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField" toolbar:helpid="helpid:10707" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:PatternField" toolbar:helpid="helpid:10708" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox" toolbar:helpid="helpid:10598" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Grid" toolbar:helpid="helpid:10603" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NavigationBar" toolbar:helpid="helpid:10607" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/navigationobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/navigationobjectbar.xml
deleted file mode 100644
index 6cea7c3ca49c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/navigationobjectbar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:NavigateBack" toolbar:helpid="helpid:22314"/>
- <toolbar:toolbaritem xlink:href=".uno:NavigateForward" toolbar:helpid="helpid:22315"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/numobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/numobjectbar.xml
deleted file mode 100644
index 50e28ac32f64..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/numobjectbar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementSubLevels" toolbar:helpid="20139"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph" toolbar:helpid="20136"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUp" toolbar:helpid="20134"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDown" toolbar:helpid="20135"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems" toolbar:helpid="20141"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDownSubItems" toolbar:helpid="20142"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/>
- <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/oleobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/oleobjectbar.xml
deleted file mode 100644
index c95b1aebb316..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/oleobjectbar.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="20475"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="20477"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="20476"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="20478"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="20480"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="20479"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="10187"/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="10200"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="10201"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/optimizetablebar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/optimizetablebar.xml
deleted file mode 100644
index 7669add92e89..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/optimizetablebar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DistributeColumns" toolbar:helpid="helpid:20582" />
- <toolbar:toolbaritem xlink:href=".uno:DistributeRows" toolbar:helpid="helpid:20583" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight" toolbar:helpid="helpid:20528" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth" toolbar:helpid="helpid:20521" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/previewobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/previewobjectbar.xml
deleted file mode 100644
index 435250b63af5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/previewobjectbar.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:PageUp" toolbar:helpid="20937"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown" toolbar:helpid="20938"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowBookview" toolbar:helpid="helpid:21255" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviewZoom" toolbar:helpid="53071"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/standardbar.xml
deleted file mode 100644
index c1b38e3870f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/standardbar.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501"/>
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="5710"/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="5711"/>
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="5712"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="5715"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/>
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
- <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
- <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/starshapes.xml
deleted file mode 100644
index a2ff874d2fe7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12" toolbar:helpid="helpid:11007" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate" toolbar:helpid="helpid:11007" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/symbolshapes.xml
deleted file mode 100644
index 0fa6aee313db..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/tableobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/tableobjectbar.xml
deleted file mode 100644
index d34267a6e1de..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/tableobjectbar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MergeCells" toolbar:helpid="helpid:20506" />
- <toolbar:toolbaritem xlink:href=".uno:SplitCell" toolbar:helpid="helpid:20505" />
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:helpid="helpid:20510" toolbar:style="dropdown" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:helpid="helpid:20585" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:helpid="helpid:20586" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:helpid="helpid:20587" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:20501" />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:20502" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:20503" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:20504" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:helpid="helpid:20515" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:helpid="helpid:20514" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:helpid="helpid:20513" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat" toolbar:helpid="helpid:20595" />
- <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:helpid="helpid:20459" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableSort" toolbar:helpid="helpid:20533" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoSum" toolbar:helpid="helpid:20595" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/textobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/textobjectbar.xml
deleted file mode 100644
index d48a96df35dc..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/textobjectbar.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="helpid:20144" />
- <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="helpid:20138" />
- <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" toolbar:helpid="helpid:10461" />
- <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" toolbar:helpid="helpid:10462" />
- <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:helpid="helpid:20403" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:helpid="helpid:20404" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:helpid="helpid:10017" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:helpid="helpid:10489" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:visible="false" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/toolbar.xml
deleted file mode 100644
index 7ff331e17224..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/toolbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:helpid="52822"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShadowCursor" toolbar:helpid="22204"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
- <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
- <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/viewerbar.xml b/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/viewerbar.xml
deleted file mode 100644
index d4d6a59d7ed5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swriter/toolbar/viewerbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961" />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/menubar/menubar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/menubar/menubar.xml
deleted file mode 100644
index ff139ef3654d..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/menubar/menubar.xml
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
- <menu:menu menu:id=".uno:PickList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:Open"/>
- <menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CloseDoc"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:SaveAs"/>
- <menu:menuitem menu:id=".uno:SaveAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Reload"/>
- <menu:menuitem menu:id=".uno:VersionDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menuitem menu:id=".uno:ExportToPDF"/>
- <menu:menu menu:id=".uno:SendToMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsOOo"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsMS"/>
- <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:NewGlobalDoc"/>
- <menu:menuitem menu:id=".uno:NewHtmlDoc"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SendOutlineToStarImpress"/>
- <menu:menuitem menu:id=".uno:SendOutlineToClipboard"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CreateAbstract"/>
- <menu:menuitem menu:id=".uno:SendAbstractToStarImpress"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menuitem menu:id=".uno:Signature"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:AddressBookSource"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:PrintPreview"/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:PrinterSetup"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Quit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:EditMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuitem menu:id=".uno:Repeat"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Cut"/>
- <menu:menuitem menu:id=".uno:Copy"/>
- <menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteSpecial"/>
- <menu:menuitem menu:id=".uno:SelectTextMode"/>
- <menu:menu menu:id=".uno:SelectionModeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectionModeDefault" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SelectionModeBlock" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:SelectAll"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ChangesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TrackChanges"/>
- <menu:menuitem menu:id=".uno:ProtectTraceChangeMode"/>
- <menu:menuitem menu:id=".uno:ShowTrackedChanges"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AcceptTrackedChanges"/>
- <menu:menuitem menu:id=".uno:CommentChangeTracking"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:CompareDocuments"/>
- <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
- <menu:menuitem menu:id=".uno:SearchDialog"/>
- <menu:menuitem menu:id=".uno:EditGlossary"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
- <menu:menuitem menu:id=".uno:FieldDialog"/>
- <menu:menuitem menu:id=".uno:EditFootnote"/>
- <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
- <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
- <menu:menuitem menu:id=".uno:EditHyperlink"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
- <menu:menuitem menu:id=".uno:ImageMapDialog"/>
- <menu:menuitem menu:id=".uno:ObjectMenue"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ViewMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:PrintLayout" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:BrowseView" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AvailableToolbars"/>
- <menu:menuitem menu:id=".uno:StatusBarVisible"/>
- <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
- <menu:menuitem menu:id=".uno:Ruler"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewBounds"/>
- <menu:menuitem menu:id=".uno:Marks"/>
- <menu:menuitem menu:id=".uno:Fieldnames"/>
- <menu:menuitem menu:id=".uno:ControlCodes"/>
- <menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
- <menu:menuitem menu:id=".uno:ShowAnnotations"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
- <menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:InsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertBreak"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertSymbol"/>
- <menu:menu menu:id=".uno:FormattingMarkMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
- <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
- <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
- <menu:menuitem menu:id=".uno:InsertZWSP"/>
- <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
- <menu:menuitem menu:id=".uno:InsertLRM"/>
- <menu:menuitem menu:id=".uno:InsertRLM"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertSection"/>
- <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertPageHeader"/>
- <menu:menuitem menu:id=".uno:InsertPageFooter"/>
- <menu:menuitem menu:id=".uno:InsertFootnoteDialog"/>
- <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
- <menu:menuitem menu:id=".uno:InsertBookmark"/>
- <menu:menuitem menu:id=".uno:InsertReferenceField"/>
- <menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuitem menu:id=".uno:InsertScript"/>
- <menu:menu menu:id=".uno:IndexesMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertIndexesEntry"/>
- <menu:menuitem menu:id=".uno:InsertMultiIndex"/>
- <menu:menuitem menu:id=".uno:InsertAuthoritiesEntry"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertEnvelope"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertFrame"/>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertGraphicRuler"/>
- <menu:menu menu:id=".uno:GraphicMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertGraphic"/>
- <menu:menu menu:id=".uno:Scan">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TwainSelect"/>
- <menu:menuitem menu:id=".uno:TwainTransfer"/>
- </menu:menupopup>
- </menu:menu>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertAVMedia"/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertObject"/>
- <menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
- <menu:menuitem menu:id=".uno:InsertObjectChart"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertDoc"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:TransliterateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:RubyDialog"/>
- <menu:menuitem menu:id=".uno:FormatColumns"/>
- <menu:menuitem menu:id=".uno:EditRegion"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DesignerDialog"/>
- <menu:menu menu:id=".uno:AutoFormatMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:OnlineAutoFormat"/>
- <menu:menuitem menu:id=".uno:AutoFormatApply"/>
- <menu:menuitem menu:id=".uno:AutoFormatRedlineApply"/>
- <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:AnchorMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WrapMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:WrapOff"/>
- <menu:menuitem menu:id=".uno:WrapOn"/>
- <menu:menuitem menu:id=".uno:WrapIdeal"/>
- <menu:menuitem menu:id=".uno:WrapThrough"/>
- <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:WrapContour"/>
- <menu:menuitem menu:id=".uno:ContourDialog"/>
- <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TextWrap"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ObjectAlign">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:CommonAlignLeft" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignHorizontalCenter" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ArrangeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:BringToFront"/>
- <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
- <menu:menuitem menu:id=".uno:ObjectBackOne"/>
- <menu:menuitem menu:id=".uno:SendToBack"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
- <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:FlipMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:GroupMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:FormatGroup"/>
- <menu:menuitem menu:id=".uno:FormatUngroup"/>
- <menu:menuitem menu:id=".uno:EnterGroup"/>
- <menu:menuitem menu:id=".uno:LeaveGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:ObjectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
- <menu:menuitem menu:id=".uno:FormatArea"/>
- <menu:menuitem menu:id=".uno:TextAttributes"/>
- <menu:menuitem menu:id=".uno:FontWork"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
- <menu:menuitem menu:id=".uno:NameGroup"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:FrameDialog"/>
- <menu:menuitem menu:id=".uno:GraphicDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableMenu">
- <menu:menupopup>
- <menu:menu menu:id=".uno:TableInsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertTable"/>
- <menu:menuitem menu:id=".uno:InsertRowDialog"/>
- <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableDeleteMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DeleteTable"/>
- <menu:menuitem menu:id=".uno:DeleteRows"/>
- <menu:menuitem menu:id=".uno:DeleteColumns"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableSelectMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SelectTable"/>
- <menu:menuitem menu:id=".uno:EntireRow"/>
- <menu:menuitem menu:id=".uno:EntireColumn"/>
- <menu:menuitem menu:id=".uno:EntireCell"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:MergeCells"/>
- <menu:menuitem menu:id=".uno:SplitCell"/>
- <menu:menuitem menu:id=".uno:Protect"/>
- <menu:menuitem menu:id=".uno:MergeTable"/>
- <menu:menuitem menu:id=".uno:SplitTable"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:AutoFormat"/>
- <menu:menu menu:id=".uno:TableAutoFitMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:DistributeColumns"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetRowHeight"/>
- <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
- <menu:menuitem menu:id=".uno:DistributeRows"/>
- <menu:menuitem menu:id=".uno:RowSplit"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:HeadingRowsRepeat"/>
- <menu:menu menu:id=".uno:TableConvertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ConvertTextToTable"/>
- <menu:menuitem menu:id=".uno:ConvertTableToText"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:TableSort"/>
- <menu:menuitem menu:id=".uno:InsertFormula"/>
- <menu:menuitem menu:id=".uno:TableNumberFormatDialog"/>
- <menu:menuitem menu:id=".uno:TableBoundaries"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TableDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:ToolsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SpellingAndGrammarDialog"/>
- <menu:menu menu:id=".uno:LanguageMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
- <menu:menuitem menu:id=".uno:ChineseConversion"/>
- <menu:menuitem menu:id=".uno:ThesaurusDialog"/>
- <menu:menuitem menu:id=".uno:Hyphenate"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MoreDictionaries"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id=".uno:WordCountDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ChapterNumberingDialog"/>
- <menu:menuitem menu:id=".uno:LineNumberingDialog"/>
- <menu:menuitem menu:id=".uno:FootnoteDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Gallery"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:BibliographyComponent"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MailMergeWizard"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SortDialog"/>
- <menu:menuitem menu:id=".uno:CalculateSel"/>
- <menu:menu menu:id=".uno:UpdateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:UpdateAll"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:UpdateFields"/>
- <menu:menuitem menu:id=".uno:UpdateAllLinks"/>
- <menu:menuitem menu:id=".uno:UpdateCharts"/>
- <menu:menuitem menu:id=".uno:UpdateCurIndex"/>
- <menu:menuitem menu:id=".uno:UpdateAllIndexes"/>
- <menu:menuitem menu:id=".uno:Repaginate"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:MacrosMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:MacroRecorder"/>
- <menu:menuitem menu:id=".uno:RunMacro"/>
- <menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuitem menu:id=".uno:MacroSignature"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
- <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
- <menu:menuitem menu:id=".uno:ConfigureDialog"/>
- <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:WindowList">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:NewWindow"/>
- <menu:menuitem menu:id=".uno:CloseWin"/>
- <menu:menuseparator/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:HelpMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:HelpIndex"/>
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ShowCredits"/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
- </menu:menu>
-</menu:menubar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/statusbar/statusbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/statusbar/statusbar.xml
deleted file mode 100644
index 3e46300cd0e7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/statusbar/statusbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE statusbar:statusbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "statusbar.dtd">
-<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:21181"/>
- <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79" statusbar:helpid="helpid:21182"/>
- <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63" statusbar:helpid="helpid:11064"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35" statusbar:helpid="helpid:10000"/>
-</statusbar:statusbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/alignmentbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/alignmentbar.xml
deleted file mode 100644
index dbd7294e566c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/alignmentbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131" />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134" />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135" />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/arrowshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/arrowshapes.xml
deleted file mode 100644
index 4a53519494ea..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/arrowshapes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/basicshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/basicshapes.xml
deleted file mode 100644
index e65778305788..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/basicshapes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/bezierobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/bezierobjectbar.xml
deleted file mode 100644
index 7c067e68d13c..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/bezierobjectbar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="helpid:10126" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:helpid="helpid:10121" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:helpid="helpid:10119" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierDelete" toolbar:helpid="helpid:10120" />
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine" toolbar:helpid="helpid:10127" />
- <toolbar:toolbaritem xlink:href=".uno:BezierConvert" toolbar:helpid="helpid:27065" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:helpid="helpid:27066" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:helpid="helpid:10123" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:helpid="helpid:27067" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose" toolbar:helpid="helpid:10122" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints" toolbar:helpid="helpid:27030" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/calloutshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/calloutshapes.xml
deleted file mode 100644
index 91b957fa697a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/calloutshapes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/colorbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/colorbar.xml
deleted file mode 100644
index adcda76b5c3a..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/colorbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawbar.xml
deleted file mode 100644
index 2407475a88f6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
- <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false" toolbar:helpid="10114"/>
- <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false" toolbar:helpid="10112"/>
- <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false" toolbar:helpid="10115"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/>
- <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false" toolbar:helpid="10465"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="10906"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="11004"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="11005"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="11007"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="10977"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawingobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawingobjectbar.xml
deleted file mode 100644
index 4703c3cfdad6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawingobjectbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="helpid:10143" />
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="helpid:10301" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="helpid:10169" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="helpid:10171" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="helpid:10172" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="helpid:10142" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="helpid:10164" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false" toolbar:helpid="27322"/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/>
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:visible="false" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:visible="false" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:visible="false" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false" toolbar:helpid="20584"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground" toolbar:helpid="10283"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="10282"/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="10455"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="10454"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawtextobjectbar.xml
deleted file mode 100644
index 31e5ca4db662..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/drawtextobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="helpid:10017" toolbar:style="dropdown" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="helpid:10907" />
- <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="helpid:10908" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/extrusionobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/extrusionobjectbar.xml
deleted file mode 100644
index 148849db6ee7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/extrusionobjectbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft" toolbar:helpid="10963"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight" toolbar:helpid="10964"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:helpid="10965" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:helpid="10966" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:helpid="10967" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:helpid="10968" toolbar:style="dropdownonly"/>
- <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:helpid="10969" toolbar:style="dropdownonly"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/findbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/findbar.xml
deleted file mode 100644
index 49e483e178a3..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/findbar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FindText"/>
- <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
- <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/flowchartshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/flowchartshapes.xml
deleted file mode 100644
index bb1d1099dbd4..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/flowchartshapes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-alternate-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-decision" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-predefined-process" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-internal-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-document" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-multidocument" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-terminator" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-preparation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-input" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-manual-operation" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fontworkobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fontworkobjectbar.xml
deleted file mode 100644
index 5219a1e235e9..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fontworkobjectbar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="helpid:10977" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:helpid="helpid:10978" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights" toolbar:helpid="helpid:10979" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:helpid="helpid:10981" toolbar:style="dropdownonly" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:helpid="helpid:10982" toolbar:style="dropdownonly" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fontworkshapetype.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fontworkshapetype.xml
deleted file mode 100644
index 49b5b8173e0e..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fontworkshapetype.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-stop" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-right" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-left" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-up" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-down" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-curve" toolbar:helpid="helpid:10978" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-pour" toolbar:helpid="helpid:10978" />
- <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-pour" toolbar:helpid="helpid:10978" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formcontrols.xml
deleted file mode 100644
index 20be12fee858..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formcontrols.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:text="" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchXFormsDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox" toolbar:helpid="helpid:10596" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:helpid="helpid:10599" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField" toolbar:helpid="helpid:10728" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton" toolbar:helpid="helpid:10594" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:RadioButton" toolbar:helpid="helpid:10595" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ListBox" toolbar:helpid="helpid:10600" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ComboBox" toolbar:helpid="helpid:10601" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:helpid="helpid:10597" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MoreControls" toolbar:helpid="helpid:11045" />
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools" toolbar:helpid="helpid:11046" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formdesign.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formdesign.xml
deleted file mode 100644
index 0b81640ff691..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formdesign.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="helpid:10128" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:SwitchXFormsDesignMode" toolbar:helpid="helpid:10629" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10614" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowDataNavigator" toolbar:helpid="helpid:10773" />
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer" toolbar:helpid="helpid:10633" />
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:helpid="helpid:10623" />
- <toolbar:toolbaritem xlink:href=".uno:TabDialog" toolbar:helpid="helpid:10615" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709" />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="helpid:10454" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="helpid:10455" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:helpid="helpid:27096" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:helpid="helpid:27097" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formsfilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formsfilterbar.xml
deleted file mode 100644
index 1d1ad07a9938..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formsfilterbar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FormFilterExecute" toolbar:helpid="helpid:10731" />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator" toolbar:helpid="helpid:10732" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExit" toolbar:helpid="helpid:10730" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formsnavigationbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formsnavigationbar.xml
deleted file mode 100644
index ce47a450e2f5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formsnavigationbar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="10725"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecText" toolbar:helpid="10624"/>
- <toolbar:toolbaritem xlink:href=".uno:AbsoluteRecord" toolbar:helpid="10622"/>
- <toolbar:toolbaritem xlink:href=".uno:RecFromText" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RecTotal" toolbar:helpid="10626"/>
- <toolbar:toolbaritem xlink:href=".uno:FirstRecord" toolbar:helpid="10616"/>
- <toolbar:toolbaritem xlink:href=".uno:PrevRecord" toolbar:helpid="10618"/>
- <toolbar:toolbaritem xlink:href=".uno:NextRecord" toolbar:helpid="10617"/>
- <toolbar:toolbaritem xlink:href=".uno:LastRecord" toolbar:helpid="10619"/>
- <toolbar:toolbaritem xlink:href=".uno:NewRecord" toolbar:helpid="10620"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="10627"/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="10630"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRecord" toolbar:helpid="10621"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
- <toolbar:toolbaritem xlink:href=".uno:RefreshFormControl"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="10714"/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="10712"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="10713"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="10716"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="10723"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilter" toolbar:helpid="10729"/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="10711"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid" toolbar:helpid="10761"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formtextobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formtextobjectbar.xml
deleted file mode 100644
index dbdeaf675371..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/formtextobjectbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:text="" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:text="" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:text="" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/frameobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/frameobjectbar.xml
deleted file mode 100644
index a591f9094457..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/frameobjectbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="helpid:20472" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="helpid:20473" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:helpid="helpid:20563" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:helpid="helpid:20572" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:helpid="helpid:20573" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="helpid:20474" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="helpid:20475" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="helpid:20477" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="helpid:20476" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="helpid:20478" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="helpid:20480" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="helpid:20479" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="helpid:20456" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="helpid:20349" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ChainFrames" toolbar:helpid="helpid:21736" />
- <toolbar:toolbaritem xlink:href=".uno:UnhainFrames" toolbar:helpid="helpid:21737" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fullscreenbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fullscreenbar.xml
deleted file mode 100644
index 5aecdda4fb04..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/fullscreenbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/graffilterbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/graffilterbar.xml
deleted file mode 100644
index 287c33fe25e5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/graffilterbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:GraphicFilterInvert" toolbar:helpid="helpid:34149" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth" toolbar:helpid="helpid:34150" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen" toolbar:helpid="helpid:34151" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRemoveNoise" toolbar:helpid="helpid:34152" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSolarize" toolbar:helpid="helpid:34159" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSepia" toolbar:helpid="helpid:34158" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPoster" toolbar:helpid="helpid:34156" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPopart" toolbar:helpid="helpid:34157" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSobel" toolbar:helpid="helpid:34153" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRelief" toolbar:helpid="helpid:34155" />
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterMosaic" toolbar:helpid="helpid:34154" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/graphicobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/graphicobjectbar.xml
deleted file mode 100644
index 040bb8cd8ae6..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/graphicobjectbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="11016"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
- <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/insertbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/insertbar.xml
deleted file mode 100644
index a9bb7e0eb204..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/insertbar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract" toolbar:helpid="20333"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDoc" toolbar:helpid="5532"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFootnote" toolbar:helpid="20399"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertEndnote" toolbar:helpid="21418"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="20328"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="20369"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSection" toolbar:helpid="21419"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:helpid="20335"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl" toolbar:helpid="52824"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:visible="false" toolbar:helpid="10140"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjCtrl" toolbar:visible="false" toolbar:helpid="52823"/>
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:visible="false" toolbar:helpid="10593"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex" toolbar:helpid="21420"/>
- <toolbar:toolbaritem xlink:href=".uno:EditGlossary"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="20329"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertBookmark" toolbar:helpid="20302"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/insertobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/insertobjectbar.xml
deleted file mode 100644
index 951849543373..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/insertobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:helpid="helpid:5563" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/mediaobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/mediaobjectbar.xml
deleted file mode 100644
index 2014343bf89b..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/mediaobjectbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox" toolbar:helpid="helpid:6693" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/moreformcontrols.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/moreformcontrols.xml
deleted file mode 100644
index c329d444c5d0..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/moreformcontrols.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SpinButton" toolbar:helpid="helpid:10769" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton" toolbar:helpid="helpid:10604" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:DateField" toolbar:helpid="helpid:10704" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:TimeField" toolbar:helpid="helpid:10705" toolbar:style="radio auto" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NumericField" toolbar:helpid="helpid:10706" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:GroupBox" toolbar:helpid="helpid:10598" toolbar:style="radio auto" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/numobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/numobjectbar.xml
deleted file mode 100644
index 50e28ac32f64..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/numobjectbar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementSubLevels" toolbar:helpid="20139"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph" toolbar:helpid="20136"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUp" toolbar:helpid="20134"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDown" toolbar:helpid="20135"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems" toolbar:helpid="20141"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveDownSubItems" toolbar:helpid="20142"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/>
- <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/oleobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/oleobjectbar.xml
deleted file mode 100644
index c95b1aebb316..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/oleobjectbar.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="20475"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="20477"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="20476"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="20478"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="20480"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="20479"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="10187"/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="10200"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="10201"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/optimizetablebar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/optimizetablebar.xml
deleted file mode 100644
index 7669add92e89..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/optimizetablebar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DistributeColumns" toolbar:helpid="helpid:20582" />
- <toolbar:toolbaritem xlink:href=".uno:DistributeRows" toolbar:helpid="helpid:20583" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight" toolbar:helpid="helpid:20528" />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth" toolbar:helpid="helpid:20521" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/previewobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/previewobjectbar.xml
deleted file mode 100644
index 435250b63af5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/previewobjectbar.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:PageUp" toolbar:helpid="20937"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown" toolbar:helpid="20938"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowBookview" toolbar:helpid="helpid:21255" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviewZoom" toolbar:helpid="53071"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/standardbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/standardbar.xml
deleted file mode 100644
index 1da9beff4735..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/standardbar.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501"/>
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:helpid="20622"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="5710"/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="5711"/>
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="5712"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="5715"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/>
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
- <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
- <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/starshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/starshapes.xml
deleted file mode 100644
index a2ff874d2fe7..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/starshapes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:StarShapes.bang" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star4" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star5" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star8" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star12" toolbar:helpid="helpid:11007" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.star24" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.signet" toolbar:helpid="helpid:11007" />
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate" toolbar:helpid="helpid:11007" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/symbolshapes.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/symbolshapes.xml
deleted file mode 100644
index 0fa6aee313db..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/symbolshapes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SymbolShapes.smiley" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket" toolbar:helpid="helpid:11003" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/tableobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/tableobjectbar.xml
deleted file mode 100644
index d34267a6e1de..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/tableobjectbar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MergeCells" toolbar:helpid="helpid:20506" />
- <toolbar:toolbaritem xlink:href=".uno:SplitCell" toolbar:helpid="helpid:20505" />
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:helpid="helpid:20510" toolbar:style="dropdown" />
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:helpid="helpid:20585" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:helpid="helpid:20586" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:helpid="helpid:20587" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:20501" />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:20502" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:20503" />
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:20504" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:helpid="helpid:20515" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:helpid="helpid:20514" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:helpid="helpid:20513" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat" toolbar:helpid="helpid:20595" />
- <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:helpid="helpid:20459" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableSort" toolbar:helpid="helpid:20533" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoSum" toolbar:helpid="helpid:20595" />
-</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/textobjectbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/textobjectbar.xml
deleted file mode 100644
index d48a96df35dc..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/textobjectbar.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951" toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036" toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="helpid:20144" />
- <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="helpid:20138" />
- <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" toolbar:helpid="helpid:10461" />
- <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" toolbar:helpid="helpid:10462" />
- <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:helpid="helpid:20403" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:helpid="helpid:20404" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:helpid="helpid:10017" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:helpid="helpid:10489" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185" toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297" toolbar:visible="false" />
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/toolbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/toolbar.xml
deleted file mode 100644
index 7ff331e17224..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/toolbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:helpid="52822"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShadowCursor" toolbar:helpid="22204"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
- <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
- <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
-</toolbar:toolbar> \ No newline at end of file
diff --git a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/viewerbar.xml b/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/viewerbar.xml
deleted file mode 100644
index d4d6a59d7ed5..000000000000
--- a/test/user-template/user/config/soffice.cfg/modules/swxform/toolbar/viewerbar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961" />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000" />
-</toolbar:toolbar> \ No newline at end of file