incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1350784 [13/15] - in /incubator/ooo/trunk/main: basctl/uiconfig/basicide/statusbar/ basctl/uiconfig/basicide/toolbar/ chart2/uiconfig/menubar/ chart2/uiconfig/statusbar/ chart2/uiconfig/toolbar/ dbaccess/uiconfig/dbapp/menubar/ dbaccess/ui...
Date Fri, 15 Jun 2012 20:26:12 GMT
Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,40 +23,40 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:FormatLine"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:style="dropdown"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="helpid:10169"  />
+ <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="helpid:10171"  />
+ <toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="helpid:10172"  />
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="helpid:10142"  />
+ <toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="helpid:10164"  />
+ <toolbar:toolbaritem xlink:href=".uno:FillStyle"/>
  <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:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false"/>
  <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:toolbaritem xlink:href=".uno:WrapOff" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/>
  <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:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
+ <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="10455"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="10454"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatUngroup"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatGroup"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,34 +23,34 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:CharFontName"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015"  />
+ <toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
  <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:toolbaritem xlink:href=".uno:Bold"/>
+ <toolbar:toolbaritem xlink:href=".uno:Italic"/>
+ <toolbar:toolbaritem xlink:href=".uno:Underline"/>
+ <toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
+ <toolbar:toolbaritem xlink:href=".uno:SubScript"/>
  <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: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: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:toolbaritem xlink:href=".uno:SpacePara1" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpacePara2" 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:toolbaritem xlink:href=".uno:Color" 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:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" 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:toolbaritem xlink:href=".uno:TextdirectionLeftToRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom"/>
  <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:toolbaritem xlink:href=".uno:SelectAll"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/extrusionobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/extrusionobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/extrusionobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/extrusionobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,16 +23,16 @@
 
 
 <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:toolbaritem xlink:href=".uno:ExtrusionToggle"/>
  <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:toolbaritem xlink:href=".uno:ExtrusionTiltDown"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltRight"/>
  <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:toolbaritem xlink:href=".uno:ExtrusionDepthFloater" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:style="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/flowchartshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/flowchartshapes.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/flowchartshapes.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/flowchartshapes.xml Fri Jun 15 20:25:56 2012
@@ -23,36 +23,36 @@
 
 
 <toolbar: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: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: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: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: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: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: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: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: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: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

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,11 +23,11 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
  <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:toolbaritem xlink:href=".uno:FontworkShapeType" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkSameLetterHeights"/>
  <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:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:style="dropdownonly"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:style="dropdownonly"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fontworkshapetype.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fontworkshapetype.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fontworkshapetype.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fontworkshapetype.xml Fri Jun 15 20:25:56 2012
@@ -23,38 +23,38 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-plain-text"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-wave"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-inflate"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-stop"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-up"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-curve-down"/>
  <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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-up"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-triangle-down"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-right"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-left"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-down"/>
  <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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-up"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-slant-down"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-right"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-fade-up-and-left"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-up"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-chevron-down"/>
  <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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-curve"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-curve"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-curve"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-curve"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-curve"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-curve"/>
  <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:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-up-pour"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-down-pour"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-left-pour"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-arch-right-pour"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-circle-pour"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkShapeType.fontwork-open-circle-pour"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formcontrols.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formcontrols.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formcontrols.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formcontrols.xml Fri Jun 15 20:25:56 2012
@@ -23,26 +23,26 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:SelectObject" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
  <toolbar:toolbarbreak/>
- <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:ControlProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
  <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:toolbaritem xlink:href=".uno:CheckBox" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:Edit" 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:toolbaritem xlink:href=".uno:FormattedField" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:Pushbutton" 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:toolbaritem xlink:href=".uno:RadioButton" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:ListBox" 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:toolbaritem xlink:href=".uno:ComboBox" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:Label" 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:toolbaritem xlink:href=".uno:MoreControls"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards" toolbar:helpid="helpid:10727"  />
+ <toolbar:toolbaritem xlink:href=".uno:UseWizards"/>
 </toolbar:toolbar>

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formdesign.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formdesign.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formdesign.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formdesign.xml Fri Jun 15 20:25:56 2012
@@ -23,33 +23,33 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:SelectObject" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
  <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:ControlProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
  <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:toolbaritem xlink:href=".uno:ShowFmExplorer"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddField"/>
+ <toolbar:toolbaritem xlink:href=".uno:TabDialog"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709" />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763" />
+ <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly"/>
+ <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
  <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:toolbaritem xlink:href=".uno:TransformDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" 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:toolbaritem xlink:href=".uno:BringToFront" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack" 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:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130"  toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" 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:toolbaritem xlink:href=".uno:GridVisible"/>
+ <toolbar:toolbaritem xlink:href=".uno:GridUse"/>
+ <toolbar:toolbaritem xlink:href=".uno:HelplinesMove"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formsfilterbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formsfilterbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formsfilterbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formsfilterbar.xml Fri Jun 15 20:25:56 2012
@@ -23,8 +23,8 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:FormFilterExecute"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExit" toolbar:helpid="helpid:10730"  />
+ <toolbar:toolbaritem xlink:href=".uno:FormFilterExit"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formsnavigationbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formsnavigationbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formsnavigationbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formsnavigationbar.xml Fri Jun 15 20:25:56 2012
@@ -23,33 +23,33 @@
 
 
 <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:toolbaritem xlink:href=".uno:RecSearch"/>
  <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:toolbaritem xlink:href=".uno:RecText"/>
+ <toolbar:toolbaritem xlink:href=".uno:AbsoluteRecord"/>
+ <toolbar:toolbaritem xlink:href=".uno:RecFromText"/>
+ <toolbar:toolbaritem xlink:href=".uno:RecTotal"/>
+ <toolbar:toolbaritem xlink:href=".uno:FirstRecord"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrevRecord"/>
+ <toolbar:toolbaritem xlink:href=".uno:NextRecord"/>
+ <toolbar:toolbaritem xlink:href=".uno:LastRecord"/>
+ <toolbar:toolbaritem xlink:href=".uno:NewRecord"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:RecSave"/>
+ <toolbar:toolbaritem xlink:href=".uno:RecUndo"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteRecord"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
+ <toolbar:toolbaritem xlink:href=".uno:Refresh"/>
  <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:toolbaritem xlink:href=".uno:OrderCrit"/>
+ <toolbar:toolbaritem xlink:href=".uno:Sortup"/>
+ <toolbar:toolbaritem xlink:href=".uno:SortDown"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:AutoFilter"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormFiltered"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormFilter"/>
+ <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid" toolbar:helpid="10761"/>
+ <toolbar:toolbaritem xlink:href=".uno:ViewFormAsGrid"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/formtextobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,28 +23,28 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:CharFontName"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
  <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:toolbaritem xlink:href=".uno:Bold"/>
+ <toolbar:toolbaritem xlink:href=".uno:Italic"/>
+ <toolbar:toolbaritem xlink:href=".uno:Underline"/>
+ <toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
+ <toolbar:toolbaritem xlink:href=".uno:SubScript"/>
+ <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:style="radio"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:style="radio"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpacePara2" 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:toolbaritem xlink:href=".uno:FontDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/frameobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/frameobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/frameobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,34 +23,34 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:StyleApply"/>
  <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:toolbaritem xlink:href=".uno:WrapOff" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:style="radio"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:style="dropdown"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" 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:toolbaritem xlink:href=".uno:ChainFrames"/>
+ <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fullscreenbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fullscreenbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/fullscreenbar.xml Fri Jun 15 20:25:56 2012
@@ -23,5 +23,5 @@
 
 
 <toolbar: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

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/graffilterbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/graffilterbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/graffilterbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/graffilterbar.xml Fri Jun 15 20:25:56 2012
@@ -23,17 +23,17 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:GraphicFilterInvert"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSmooth"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSharpen"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRemoveNoise"/>
  <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:toolbaritem xlink:href=".uno:GraphicFilterSolarize"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicFilterSepia"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPoster"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicFilterPopart"/>
  <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:toolbaritem xlink:href=".uno:GraphicFilterSobel"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicFilterRelief"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicFilterMosaic"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,18 +23,18 @@
 
 
 <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:toolbaritem xlink:href=".uno:InsertGraphic"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/>
+ <toolbar:toolbaritem xlink:href=".uno:GrafMode"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="11016"/>
+ <toolbar:toolbaritem xlink:href=".uno:ColorSettings"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
+ <toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
- <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/insertbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/insertbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/insertbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/insertbar.xml Fri Jun 15 20:25:56 2012
@@ -23,31 +23,31 @@
 
 
 <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:toolbaritem xlink:href=".uno:InsertTable"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertSection"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false"/>
  <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:toolbaritem xlink:href=".uno:InsertFootnote"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertEndnote"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertBookmark"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertReferenceField" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDoc" toolbar:visible="false" toolbar:helpid="5532"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertDoc" toolbar:visible="false"/>
  <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:toolbaritem xlink:href=".uno:InsertSymbol"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl"/>
+ <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:visible="false"/>
  <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:toolbaritem xlink:href=".uno:InsertGraphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex" toolbar:helpid="21420"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:helpid="20335"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry"/>
 </toolbar:toolbar>
 

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/mediaobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/mediaobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/mediaobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/mediaobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,7 +23,7 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:InsertAVMedia"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox" toolbar:helpid="helpid:6693"  />
+ <toolbar:toolbaritem xlink:href=".uno:AVMediaToolBox"/>
 </toolbar:toolbar>

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/moreformcontrols.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/moreformcontrols.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/moreformcontrols.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/moreformcontrols.xml Fri Jun 15 20:25:56 2012
@@ -23,23 +23,23 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:SpinButton" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollBar" 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:toolbaritem xlink:href=".uno:Imagebutton" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl" 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:toolbaritem xlink:href=".uno:DateField" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:TimeField" 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:toolbaritem xlink:href=".uno:FileControl" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumericField" 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:toolbaritem xlink:href=".uno:CurrencyField" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:PatternField" 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:toolbaritem xlink:href=".uno:GroupBox" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:Grid" toolbar:style="radio auto"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NavigationBar" toolbar:helpid="helpid:10607" />
+ <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/numobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/numobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/numobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/numobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,23 +23,23 @@
 
 
 <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:toolbaritem xlink:href=".uno:DefaultBullet"/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/>
+ <toolbar:toolbaritem xlink:href=".uno:RemoveBullets"/>
  <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:toolbaritem xlink:href=".uno:IncrementLevel"/>
+ <toolbar:toolbaritem xlink:href=".uno:DecrementLevel"/>
+ <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels"/>
+ <toolbar:toolbaritem xlink:href=".uno:DecrementSubLevels"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph" toolbar:helpid="20136"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph"/>
  <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:toolbaritem xlink:href=".uno:MoveUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:MoveDown"/>
+ <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems"/>
+ <toolbar:toolbaritem xlink:href=".uno:MoveDownSubItems"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/>
- <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberingStart"/>
+ <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/oleobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/oleobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/oleobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,30 +23,30 @@
 
 
 <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:toolbaritem xlink:href=".uno:StyleApply"/>
  <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:toolbaritem xlink:href=".uno:AlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapOff"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapOn"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/optimizetablebar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/optimizetablebar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/optimizetablebar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/optimizetablebar.xml Fri Jun 15 20:25:56 2012
@@ -23,8 +23,8 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:DistributeColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,24 +23,24 @@
 
 
 <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:toolbaritem xlink:href=".uno:PageUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
  <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:toolbaritem xlink:href=".uno:ShowTwoPages"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviewZoom" toolbar:helpid="53071"/>
+ <toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/>
+ <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/>
+ <toolbar:toolbaritem xlink:href=".uno:ClosePreview"/>
 </toolbar:toolbar>

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/standardbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/standardbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/standardbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/standardbar.xml Fri Jun 15 20:25:56 2012
@@ -24,41 +24,41 @@
 
 <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: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:toolbaritem xlink:href=".uno:AddDirect"/>
+ <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintPreview"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpellOnline"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertDraw"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
+ <toolbar:toolbaritem xlink:href=".uno:Gallery"/>
+ <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlCodes"/>
+ <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
 </toolbar:toolbar>

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/starshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/starshapes.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/starshapes.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/starshapes.xml Fri Jun 15 20:25:56 2012
@@ -23,17 +23,17 @@
 
 
 <toolbar: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: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: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: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

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/symbolshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/symbolshapes.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/symbolshapes.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/symbolshapes.xml Fri Jun 15 20:25:56 2012
@@ -23,24 +23,24 @@
 
 
 <toolbar: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: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: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: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: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: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

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/tableobjectbar.xml?rev=1350784&r1=1350783&r2=1350784&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/tableobjectbar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/toolbar/tableobjectbar.xml Fri Jun 15 20:25:56 2012
@@ -23,35 +23,35 @@
 
 
 <toolbar: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:toolbaritem xlink:href=".uno:InsertTable"/>
  <toolbar:toolbarseparator/>
- <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:LineStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
  <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:SetBorderStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" 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:toolbaritem xlink:href=".uno:MergeCells"/>
+ <toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
+ <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" 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:toolbaritem xlink:href=".uno:CellVertTop" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" 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:toolbaritem xlink:href=".uno:InsertRows"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
  <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:toolbaritem xlink:href=".uno:SelectTable" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireRow" 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:toolbaritem xlink:href=".uno:AutoFormat"/>
+ <toolbar:toolbaritem xlink:href=".uno:TableDialog"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableSort" toolbar:helpid="helpid:20533"  />
+ <toolbar:toolbaritem xlink:href=".uno:TableSort"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoSum" toolbar:helpid="helpid:20595"  />
+ <toolbar:toolbaritem xlink:href=".uno:AutoSum"/>
 </toolbar:toolbar>



Mime
View raw message