From 15175a00c976d48f132bc3458e961d1cb2e62a9b Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Wed, 3 Apr 2013 21:26:16 +0100
Subject: remove obsolete helpids and cleanup uiconfig XML

/usr/bin/perl -pi.bak
s/\s+statusbar:helpid="helpid:\d+"\s+/ /g;
s/\s+toolbar:helpid="helpid:\d+"\s+/ /g;
s|" />|"/>|g;

Change-Id: I3489a943476f9dae1bd6009e3cd2ea7ea04b6275
---
 dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml  |  8 ++---
 dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml |  8 ++---
 .../uiconfig/dbapp/toolbar/reportobjectbar.xml     |  8 ++---
 dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml |  8 ++---
 dbaccess/uiconfig/dbapp/toolbar/toolbar.xml        | 18 +++++-----
 dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml    | 40 +++++++++++-----------
 .../uiconfig/dbquery/toolbar/designobjectbar.xml   | 12 +++----
 dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml |  2 +-
 dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml   | 12 +++----
 dbaccess/uiconfig/dbtable/toolbar/toolbar.xml      | 18 +++++-----
 dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml      | 30 ++++++++--------
 11 files changed, 82 insertions(+), 82 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml b/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
index a2c4da20d987..44d69fd8b485 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
+++ b/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
@@ -18,8 +18,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar: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:toolbaritem xlink:href=".uno:DBFormOpen" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBFormEdit" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBFormDelete" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBFormRename" toolbar:text=""/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml b/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml
index 523b028daf20..9dc8121b1770 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml
+++ b/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml
@@ -18,8 +18,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar: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:toolbaritem xlink:href=".uno:DBQueryOpen" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBQueryEdit" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBQueryDelete" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBQueryRename" toolbar:text=""/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml b/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml
index eec3cbed42f5..057d128be47a 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml
+++ b/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml
@@ -18,8 +18,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar: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:toolbaritem xlink:href=".uno:DBReportOpen" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBReportEdit" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBReportDelete" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBReportRename" toolbar:text=""/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml b/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml
index 6c1d0bb44457..f6ec3f677de4 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml
+++ b/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml
@@ -18,8 +18,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar: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:toolbaritem xlink:href=".uno:DBTableOpen" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBTableEdit" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBTableDelete" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBTableRename" toolbar:text=""/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
index edc7c08ec945..cb5a7bb4990a 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
@@ -19,18 +19,18 @@
  -->
 <toolbar: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:toolbaritem xlink:href=".uno:AddDirect" toolbar:text="" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Save" 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:toolbaritem xlink:href=".uno:Copy" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste" 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:toolbaritem xlink:href=".uno:Sortup" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:text=""/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBNewForm" toolbar:helpid="helpid:5500" toolbar:text="" toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:DBNewForm" toolbar:text="" toolbar:style="dropdown"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" toolbar:helpid="helpid:5411" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:HelpIndex" toolbar:text=""/>
  <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml b/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml
index ad89634399b0..4fcf949da548 100644
--- a/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml
@@ -18,33 +18,33 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="helpid:38991" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:text=""/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" 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: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:RecUndo" toolbar:helpid="helpid:38992" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:text=""/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="helpid:10725" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecSearch" toolbar:text=""/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="helpid:10724" toolbar:text="" toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:Refresh" 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:toolbaritem xlink:href=".uno:OrderCrit" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:SortDown" 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:toolbaritem xlink:href=".uno:AutoFilter" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:text="" toolbar:style=""/>
+ <toolbar:toolbaritem xlink:href=".uno:FilterCrit" toolbar:text=""/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="helpid:10711" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" 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:toolbaritem xlink:href=".uno:DSBInsertColumns" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DSBInsertContent" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DSBFormLetter" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DSBDocumentDataSource" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DSBrowserExplorer" toolbar:text="" toolbar:style=""/>
 </toolbar:toolbar>
diff --git a/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml b/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
index a25548ff6898..9d807d0fd3b9 100644
--- a/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
+++ b/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
@@ -18,11 +18,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:AddTable" toolbar:helpid="helpid:10722" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:AddTable" 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:toolbaritem xlink:href=".uno:DBLimit" />
+ <toolbar:toolbaritem xlink:href=".uno:DBViewFunctions" toolbar:text="" toolbar:style=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBViewTableNames" toolbar:text="" toolbar:style=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBViewAliases" toolbar:text="" toolbar:style=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBDistinctValues" toolbar:text="" toolbar:style=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBLimit"/>
 </toolbar:toolbar>
diff --git a/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml b/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml
index 155666a5b55f..15e5126a8bd6 100644
--- a/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml
+++ b/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml
@@ -18,5 +18,5 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SbaNativeSql" toolbar:helpid="helpid:10720" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:SbaNativeSql" toolbar:text="" toolbar:style=""/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml b/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml
index 38d0224b4f16..068321919f47 100644
--- a/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml
@@ -18,13 +18,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:text=""/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc" 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:toolbaritem xlink:href=".uno:Undo" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo" 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:toolbaritem xlink:href=".uno:AddTable" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DBAddRelation" toolbar:text=""/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml b/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml
index fff21c8e5853..d0db2bff93e3 100644
--- a/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml
@@ -18,17 +18,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno: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:Save" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs" 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:toolbaritem xlink:href=".uno:EditDoc" toolbar:text="" toolbar:style="" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBIndexDesign" toolbar:helpid="helpid:12251" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:DBIndexDesign" 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: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:helpid="helpid:5701" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:text=""/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml b/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml
index 2f516a0dc101..7bb145eaf3b7 100644
--- a/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml
@@ -18,27 +18,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="helpid:38991" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:text=""/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" 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: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:RecUndo" toolbar:helpid="helpid:38992" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:text=""/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="helpid:10725" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecSearch" toolbar:text=""/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="helpid:10724" toolbar:text="" toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:Refresh" 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:toolbaritem xlink:href=".uno:OrderCrit" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:SortDown" 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:toolbaritem xlink:href=".uno:AutoFilter" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:text="" toolbar:style=""/>
+ <toolbar:toolbaritem xlink:href=".uno:FilterCrit" toolbar:text=""/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="helpid:10711" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:text=""/>
 </toolbar:toolbar>
-- 
cgit