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
---
 .../uiconfig/basicide/toolbar/formcontrolsbar.xml  | 14 +++---
 basctl/uiconfig/basicide/toolbar/fullscreenbar.xml |  2 +-
 .../basicide/toolbar/insertcontrolsbar.xml         | 54 +++++++++++-----------
 basctl/uiconfig/basicide/toolbar/macrobar.xml      | 28 +++++------
 basctl/uiconfig/basicide/toolbar/standardbar.xml   | 32 ++++++-------
 .../uiconfig/basicide/toolbar/translationbar.xml   |  4 +-
 6 files changed, 67 insertions(+), 67 deletions(-)

(limited to 'basctl/uiconfig')

diff --git a/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml b/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
index d11e1ecc397b..ad4b50a991bb 100644
--- a/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
@@ -9,14 +9,14 @@
  -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFormRadio" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertFormCheck" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormRadio" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormCheck" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFormList" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertFormCombo" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormList" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormCombo" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFormVScroll" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertFormHScroll" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormVScroll" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormHScroll" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFormSpin" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormSpin" toolbar:style="radio"/>
 </toolbar:toolbar>
diff --git a/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml b/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml
index 7f6a3ba32c92..564b52e835aa 100644
--- a/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/fullscreenbar.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:FullScreen" toolbar:helpid="helpid:5627"  />
+ <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml b/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml
index ede46e2933b9..3e2d0cc8c4dd 100644
--- a/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml
@@ -18,45 +18,45 @@
  *   the License at http://www.apache.org/licenses/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:SelectMode" toolbar:helpid="helpid:10198"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ManageLanguage" toolbar:helpid="helpid:30820" />
+ <toolbar:toolbaritem xlink:href=".uno:SelectMode" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ManageLanguage"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:TestMode" toolbar:helpid="helpid:10199"  />
- <toolbar:toolbaritem xlink:href=".uno:ShowPropBrowser" toolbar:helpid="helpid:10943"  />
+ <toolbar:toolbaritem xlink:href=".uno:TestMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowPropBrowser"/>
  <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:toolbaritem xlink:href=".uno:InsertPushbutton" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertImageControl" 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:toolbaritem xlink:href=".uno:Checkbox" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Radiobutton" 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:toolbaritem xlink:href=".uno:InsertFixedText" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertEdit" 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:toolbaritem xlink:href=".uno:InsertListbox" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Combobox" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:VScrollbar" toolbar:helpid="helpid:10195"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:HScrollbar" toolbar:helpid="helpid:10194"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:VScrollbar" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:HScrollbar" 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:toolbaritem xlink:href=".uno:Groupbox" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ProgressBar" 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:toolbaritem xlink:href=".uno:HFixedLine" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:VFixedLine" 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:toolbaritem xlink:href=".uno:AddDateField" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertTimeField" 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:toolbaritem xlink:href=".uno:InsertNumericField" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCurrencyField" 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:toolbaritem xlink:href=".uno:InsertFormattedField" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertPatternField" 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:toolbaritem xlink:href=".uno:InsertFileControl" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertTreeControl" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
-<toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:helpid="helpid:10769" toolbar:style="radio" />
+<toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
 </toolbar:toolbar>
diff --git a/basctl/uiconfig/basicide/toolbar/macrobar.xml b/basctl/uiconfig/basicide/toolbar/macrobar.xml
index 96b2e7dd4089..5c3f374600a0 100644
--- a/basctl/uiconfig/basicide/toolbar/macrobar.xml
+++ b/basctl/uiconfig/basicide/toolbar/macrobar.xml
@@ -18,22 +18,22 @@
  *   the License at http://www.apache.org/licenses/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:LibSelector" toolbar:helpid="helpid:30787"  />
+ <toolbar:toolbaritem xlink:href=".uno:LibSelector"/>
  <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:toolbaritem xlink:href=".uno:CompileBasic"/>
+ <toolbar:toolbaritem xlink:href=".uno:RunBasic"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicStop"/>
  <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:toolbaritem xlink:href=".uno:BasicStepOver"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicStepInto"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicStepOut"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleBreakPoint"/>
+ <toolbar:toolbaritem xlink:href=".uno:ManageBreakPoints"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddWatch"/>
+ <toolbar:toolbaritem xlink:href=".uno:MatchGroup"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LoadBasic" toolbar:helpid="helpid:5951"  />
- <toolbar:toolbaritem xlink:href=".uno:SaveBasicAs" toolbar:helpid="helpid:5953"  />
+ <toolbar:toolbaritem xlink:href=".uno:LoadBasic"/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveBasicAs"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ImportDialog" />
+ <toolbar:toolbaritem xlink:href=".uno:ImportDialog"/>
 </toolbar:toolbar>
diff --git a/basctl/uiconfig/basicide/toolbar/standardbar.xml b/basctl/uiconfig/basicide/toolbar/standardbar.xml
index 454a318c94f2..1dc2675bf755 100644
--- a/basctl/uiconfig/basicide/toolbar/standardbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/standardbar.xml
@@ -18,25 +18,25 @@
  *   the License at http://www.apache.org/licenses/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: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:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509"  />
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
  <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:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701"  />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700"  />
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
  <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:toolbaritem xlink:href=".uno:ObjectCatalog"/>
+ <toolbar:toolbaritem xlink:href=".uno:ChooseMacro"/>
+ <toolbar:toolbaritem xlink:href=".uno:ModuleDialog"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" />
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" />
+ <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/basctl/uiconfig/basicide/toolbar/translationbar.xml b/basctl/uiconfig/basicide/toolbar/translationbar.xml
index 4103b6092280..dd37842994c3 100644
--- a/basctl/uiconfig/basicide/toolbar/translationbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/translationbar.xml
@@ -18,6 +18,6 @@
  *   the License at http://www.apache.org/licenses/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:CurrentLanguage" toolbar:helpid="helpid:30821"  />
- <toolbar:toolbaritem xlink:href=".uno:ManageLanguage" toolbar:helpid="helpid:30820"  />
+ <toolbar:toolbaritem xlink:href=".uno:CurrentLanguage"/>
+ <toolbar:toolbaritem xlink:href=".uno:ManageLanguage"/>
 </toolbar:toolbar>
\ No newline at end of file
-- 
cgit