You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/06/27 15:45:34 UTC

svn commit: r1354497 [18/33] - in /incubator/ooo/branches/alg/aw080: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/prj/ ext_libraries/serf/win/ ext_sources/ main/ main/animations/source/animc...

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/basicshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/basicshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/basicshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/basicshapes.xml Wed Jun 27 13:44:09 2012
@@ -23,29 +23,29 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" /> 
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" /> 
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,20 +23,20 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="helpid:10126"  toolbar:style="radio auto" />
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:style="radio auto"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:helpid="helpid:10121"  />
- <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:helpid="helpid:10119"  />
+ <toolbar:toolbaritem xlink:href=".uno:BezierMove"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierInsert"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierDelete" toolbar:helpid="helpid:10120"  />
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine" toolbar:helpid="helpid:10127"  />
- <toolbar:toolbaritem xlink:href=".uno:BezierConvert" toolbar:helpid="helpid:27065"  />
+ <toolbar:toolbaritem xlink:href=".uno:BezierDelete"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierCutLine"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierConvert"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:helpid="helpid:27066"  />
- <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:helpid="helpid:10123"  />
- <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:helpid="helpid:27067"  />
+ <toolbar:toolbaritem xlink:href=".uno:BezierEdge"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierSmooth"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose" toolbar:helpid="helpid:10122"  />
+ <toolbar:toolbaritem xlink:href=".uno:BezierClose"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints" toolbar:helpid="helpid:27030"  />
+ <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/calloutshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/calloutshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/calloutshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/calloutshapes.xml Wed Jun 27 13:44:09 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:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006"  />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006"  />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006"  />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006"  />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006"  />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006"  />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006"  />
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/choosemodebar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/choosemodebar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/choosemodebar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/choosemodebar.xml Wed Jun 27 13:44:09 2012
@@ -23,13 +23,13 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="helpid:10129"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLathe" toolbar:helpid="helpid:27008"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CrookRotate" toolbar:helpid="helpid:27090"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLathe" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CrookRotate" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CrookSlant" toolbar:helpid="helpid:27091"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Shear" toolbar:helpid="helpid:27107"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InteractiveTransparence" toolbar:helpid="helpid:27100"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InteractiveGradient" toolbar:helpid="helpid:27101"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:CrookSlant" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Shear" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InteractiveTransparence" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InteractiveGradient" toolbar:style="radio"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/colorbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/colorbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/colorbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/colorbar.xml Wed Jun 27 13:44:09 2012
@@ -23,15 +23,15 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865"  />
+ <toolbar:toolbaritem xlink:href=".uno:GrafRed"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866"  />
+ <toolbar:toolbaritem xlink:href=".uno:GrafGreen"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867"  />
+ <toolbar:toolbaritem xlink:href=".uno:GrafBlue"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863"  />
+ <toolbar:toolbaritem xlink:href=".uno:GrafLuminance"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864"  />
+ <toolbar:toolbaritem xlink:href=".uno:GrafContrast"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868"  />
+ <toolbar:toolbaritem xlink:href=".uno:GrafGamma"/>
 </toolbar:toolbar>

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/commentsbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/commentsbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/commentsbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/commentsbar.xml Wed Jun 27 13:44:09 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:InsertAnnotation" toolbar:helpid="helpid:26276"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
   <toolbar:toolbarseparator/>
-  <toolbar:toolbaritem xlink:href=".uno:PreviousAnnotation" toolbar:helpid="helpid:11095"/>
-  <toolbar:toolbaritem xlink:href=".uno:NextAnnotation" toolbar:helpid="helpid:11094"/>
+  <toolbar:toolbaritem xlink:href=".uno:PreviousAnnotation"/>
+  <toolbar:toolbaritem xlink:href=".uno:NextAnnotation"/>
   <toolbar:toolbarseparator/>
-  <toolbar:toolbaritem xlink:href=".uno:DeleteAnnotation" toolbar:helpid="helpid:11093"/>
-  <toolbar:toolbaritem xlink:href=".uno:DeleteAllAnnotation" toolbar:helpid="helpid:11096"/>
+  <toolbar:toolbaritem xlink:href=".uno:DeleteAnnotation"/>
+  <toolbar:toolbaritem xlink:href=".uno:DeleteAllAnnotation"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/connectorsbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/connectorsbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/connectorsbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/connectorsbar.xml Wed Jun 27 13:44:09 2012
@@ -23,35 +23,35 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:Connector" toolbar:helpid="27058"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorArrowStart" toolbar:visible="false" toolbar:helpid="27119"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorArrowEnd" toolbar:helpid="27120"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorArrows" toolbar:helpid="27121"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCircleStart" toolbar:visible="false" toolbar:helpid="27122"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCircleEnd" toolbar:visible="false" toolbar:helpid="27123"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCircles" toolbar:visible="false" toolbar:helpid="27124"/>
+ <toolbar:toolbaritem xlink:href=".uno:Connector"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorArrowStart" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorArrowEnd"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorArrows"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorCircleStart" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorCircleEnd" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorCircles" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLines" toolbar:helpid="27139"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowStart" toolbar:visible="false" toolbar:helpid="27140"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowEnd" toolbar:helpid="27141"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrows" toolbar:helpid="27142"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleStart" toolbar:visible="false" toolbar:helpid="27143"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleEnd" toolbar:visible="false" toolbar:helpid="27144"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircles" toolbar:visible="false" toolbar:helpid="27145"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLines"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowStart" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowEnd"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrows"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleStart" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleEnd" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircles" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLine" toolbar:helpid="27125"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrowStart" toolbar:visible="false" toolbar:helpid="27126"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrowEnd" toolbar:helpid="27127"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrows" toolbar:helpid="27128"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircleStart" toolbar:visible="false" toolbar:helpid="27129"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircleEnd" toolbar:visible="false" toolbar:helpid="27130"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircles" toolbar:visible="false" toolbar:helpid="27131"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLine"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrowStart" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrowEnd"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrows"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircleStart" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircleEnd" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLineCircles" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurve" toolbar:helpid="27132"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrowStart" toolbar:visible="false" toolbar:helpid="27133"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrowEnd" toolbar:helpid="27134"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrows" toolbar:helpid="27135"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircleStart" toolbar:visible="false" toolbar:helpid="27136"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircleEnd" toolbar:visible="false" toolbar:helpid="27137"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircles" toolbar:visible="false" toolbar:helpid="27138"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorCurve"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrowStart" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrowEnd"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveArrows"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircleStart" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircleEnd" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircles" toolbar:visible="false"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,21 +23,21 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143"/>
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatLine"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="10169"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="10164"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillStyle"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="10299"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false" toolbar:helpid="10371"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillShadow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml Wed Jun 27 13:44:09 2012
@@ -23,19 +23,19 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="helpid:10110"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Circle" toolbar:helpid="helpid:10385"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:helpid="helpid:10112"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CirclePie" toolbar:helpid="helpid:10388"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:EllipseCut" toolbar:helpid="helpid:10392"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:helpid="helpid:10115"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Circle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CirclePie" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:EllipseCut" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse_Unfilled" toolbar:helpid="helpid:10384"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Circle_Unfilled" toolbar:helpid="helpid:10386"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Pie_Unfilled" toolbar:helpid="helpid:10387"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CirclePie_Unfilled" toolbar:helpid="helpid:10389"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:EllipseCut_Unfilled" toolbar:helpid="helpid:10393"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CircleCut_Unfilled" toolbar:helpid="helpid:10391"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:helpid="helpid:10114"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CircleArc" toolbar:helpid="helpid:10390"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Ellipse_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Circle_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Pie_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CirclePie_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:EllipseCut_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CircleCut_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CircleArc" toolbar:style="radio"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml Wed Jun 27 13:44:09 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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml Wed Jun 27 13:44:09 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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml Wed Jun 27 13:44:09 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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml Wed Jun 27 13:44:09 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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formcontrols.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formcontrols.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formcontrols.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formcontrols.xml Wed Jun 27 13:44:09 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: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:FormDesignTools" toolbar:helpid="helpid:11046"  />
- <toolbar:toolbaritem xlink:href=".uno:MoreControls" toolbar:helpid="helpid:11045"  />
+ <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
+ <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards" toolbar:helpid="helpid:10727"  />
+ <toolbar:toolbaritem xlink:href=".uno:UseWizards"/>
 </toolbar:toolbar>

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formdesign.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formdesign.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formdesign.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formdesign.xml Wed Jun 27 13:44:09 2012
@@ -23,29 +23,29 @@
 
 
 <toolbar: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:SelectObject" toolbar:style="radio auto"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:helpid="helpid:10613"  />
- <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:helpid="helpid:10614"  />
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087"  />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer" toolbar:helpid="helpid:10633"  />
- <toolbar:toolbaritem xlink:href=".uno:TabDialog" toolbar:helpid="helpid:10615"  />
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:helpid="helpid:10623"  />
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus" toolbar:helpid="helpid:10763"  />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287"  toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="helpid:10454"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="helpid:10455"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:helpid="helpid:27096"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:helpid="helpid:27097"  toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130"  toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly" toolbar:helpid="helpid:10709"  />
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322"  />
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154"  />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153"  />
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer"/>
+ <toolbar:toolbaritem xlink:href=".uno:TabDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddField"/>
+ <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
+ <toolbar:toolbarseparator/>
+ <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: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:style="dropdown"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:OpenReadOnly"/>
+ <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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml Wed Jun 27 13:44:09 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:FormFilterNavigator" toolbar:helpid="helpid:10732"  />
- <toolbar:toolbaritem xlink:href=".uno:FormFilterExecute" toolbar:helpid="helpid:10731"  />
+ <toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormFilterExecute"/>
  <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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml Wed Jun 27 13:44:09 2012
@@ -23,32 +23,32 @@
 
 
 <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:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="10724"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="10714"/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="10712"/>
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="10713"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="10716"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="10723"/>
- <toolbar:toolbaritem xlink:href=".uno:FormFilter" toolbar:helpid="10729"/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="10711"/>
+ <toolbar: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:toolbarseparator/>
+ <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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml Wed Jun 27 13:44:09 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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml Wed Jun 27 13:44:09 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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,20 +23,20 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:GlueInsertPoint" toolbar:helpid="helpid:27302"  />
+ <toolbar:toolbaritem xlink:href=".uno:GlueInsertPoint"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionLeft" toolbar:helpid="helpid:27314"  />
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionTop" toolbar:helpid="helpid:27316"  />
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionRight" toolbar:helpid="helpid:27315"  />
- <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionBottom" toolbar:helpid="helpid:27317"  />
+ <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionTop"/>
+ <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:GlueEscapeDirectionBottom"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GluePercent" toolbar:helpid="helpid:27303"  />
+ <toolbar:toolbaritem xlink:href=".uno:GluePercent"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignLeft" toolbar:helpid="helpid:27306"  />
- <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignCenter" toolbar:helpid="helpid:27305"  />
- <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignRight" toolbar:helpid="helpid:27307"  />
+ <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:GlueHorzAlignRight"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignTop" toolbar:helpid="helpid:27309"  />
- <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignCenter" toolbar:helpid="helpid:27308"  />
- <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignBottom" toolbar:helpid="helpid:27310"  />
+ <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignTop"/>
+ <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:GlueVertAlignBottom"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/graffilterbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/graffilterbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/graffilterbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/graffilterbar.xml Wed Jun 27 13:44:09 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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml Wed Jun 27 13:44:09 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:GraphicFilterToolbox" toolbar:helpid="helpid:10469"  toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:style="dropdown"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="helpid:10871"  />
+ <toolbar:toolbaritem xlink:href=".uno:GrafMode"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:helpid="helpid:11016" />
+ <toolbar:toolbaritem xlink:href=".uno:ColorSettings"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="helpid:10867"  />
+ <toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="helpid:10143"  />
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="helpid:10142"  />
- <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="helpid:10299"  />
+ <toolbar:toolbaritem xlink:href=".uno:FormatLine"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillShadow"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Crop" toolbar:helpid="helpid:10883"  />
+ <toolbar:toolbaritem xlink:href=".uno:Crop"/>
 </toolbar:toolbar>

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/insertbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/insertbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/insertbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/insertbar.xml Wed Jun 27 13:44:09 2012
@@ -23,20 +23,20 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:InsertPage" toolbar:helpid="helpid:27014"  />
+ <toolbar:toolbaritem xlink:href=".uno:InsertPage"/>
  <toolbar:toolbarseparator/>
-	<toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:helpid="helpid:5563"  toolbar:visible="false" />
+	<toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false"/>
 	<toolbar:toolbarseparator/>
-	<toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:helpid="helpid:27015"  toolbar:visible="false" />
-	<toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:10141"  />
+	<toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:visible="false"/>
+	<toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
 	<toolbar:toolbarseparator/>
-	<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241"  />
-	<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695"  />
-	<toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:helpid="helpid:5676"  toolbar:visible="false" />
-	<toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:helpid="helpid:5677"  toolbar:visible="false" />
-	<toolbar:toolbaritem xlink:href=".uno:InsertMath" toolbar:helpid="helpid:27106"  />
-	<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="helpid:10140"  />
-	<toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561"  toolbar:visible="false" />
-	<toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672"  toolbar:visible="false" />
+	<toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
+	<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
+	<toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:visible="false"/>
+	<toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:visible="false"/>
+	<toolbar:toolbaritem xlink:href=".uno:InsertMath"/>
+	<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:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/linesbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/linesbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/linesbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/linesbar.xml Wed Jun 27 13:44:09 2012
@@ -23,13 +23,13 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:BezierFill" toolbar:helpid="helpid:10118"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon" toolbar:helpid="helpid:10117"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:helpid="helpid:10394"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:helpid="helpid:10463"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:BezierFill" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="helpid:10397"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="helpid:10395"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:helpid="helpid:10396"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="helpid:10464"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:style="radio"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml Wed Jun 27 13:44:09 2012
@@ -23,9 +23,9 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:InsertMasterPage" toolbar:helpid="helpid:27430"  />
- <toolbar:toolbaritem xlink:href=".uno:DeleteMasterPage" toolbar:helpid="helpid:27431"  />
- <toolbar:toolbaritem xlink:href=".uno:RenameMasterPage" toolbar:helpid="helpid:27432"  />
+ <toolbar:toolbaritem xlink:href=".uno:InsertMasterPage"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteMasterPage"/>
+ <toolbar:toolbaritem xlink:href=".uno:RenameMasterPage"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CloseMasterView" toolbar:helpid="helpid:27433"  />
+ <toolbar:toolbaritem xlink:href=".uno:CloseMasterView"/>
 </toolbar:toolbar>

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml Wed Jun 27 13:44:09 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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml Wed Jun 27 13:44:09 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:FileControl" toolbar:helpid="helpid:10605"  toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:DateField" toolbar:helpid="helpid:10704"  toolbar:style="radio auto" />
+ <toolbar:toolbaritem xlink:href=".uno:FileControl" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:DateField" toolbar:style="radio auto"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:TimeField" toolbar:helpid="helpid:10705"  toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:NumericField" toolbar:helpid="helpid:10706"  toolbar:style="radio auto" />
+ <toolbar:toolbaritem xlink:href=".uno:TimeField" 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/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml Wed Jun 27 13:44:09 2012
@@ -23,6 +23,6 @@
 
 
 <toolbar: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:DistributeColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/optionsbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/optionsbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/optionsbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/optionsbar.xml Wed Jun 27 13:44:09 2012
@@ -23,25 +23,25 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ClickChangeRotation" toolbar:helpid="helpid:27170"  toolbar:style="auto" />
+ <toolbar:toolbaritem xlink:href=".uno:ClickChangeRotation" toolbar:style="auto"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322"  toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesVisible" toolbar:helpid="helpid:27324"  toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153"  toolbar:style="auto" />
+ <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:HelplinesVisible" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:style="auto"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154"  toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:HelplinesUse" toolbar:helpid="helpid:27152"  toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:SnapBorder" toolbar:helpid="helpid:27155"  toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:SnapFrame" toolbar:helpid="helpid:27156"  toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:SnapPoints" toolbar:helpid="helpid:27157"  toolbar:style="auto" />
+ <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:HelplinesUse" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:SnapBorder" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:SnapFrame" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:SnapPoints" toolbar:style="auto"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:QuickEdit" toolbar:helpid="helpid:27158"  toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:PickThrough" toolbar:helpid="helpid:27159"  toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:DoubleClickTextEdit" toolbar:helpid="helpid:27169"  toolbar:style="auto" />
+ <toolbar:toolbaritem xlink:href=".uno:QuickEdit" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:PickThrough" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:DoubleClickTextEdit" toolbar:style="auto"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HandlesDraft" toolbar:helpid="helpid:27150"  toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:BigHandles" toolbar:helpid="helpid:27168"  toolbar:style="auto" />
- <toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:helpid="helpid:27151"  toolbar:style="auto" />
+ <toolbar:toolbaritem xlink:href=".uno:HandlesDraft" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:BigHandles" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:style="auto"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeaveAllGroups" toolbar:helpid="helpid:27345"  toolbar:style="auto" />
+ <toolbar:toolbaritem xlink:href=".uno:LeaveAllGroups" toolbar:style="auto"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/positionbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/positionbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/positionbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/positionbar.xml Wed Jun 27 13:44:09 2012
@@ -23,13 +23,13 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="helpid:10286"  />
- <toolbar:toolbaritem xlink:href=".uno:Forward" toolbar:helpid="helpid:27031"  />
- <toolbar:toolbaritem xlink:href=".uno:Backward" toolbar:helpid="helpid:27032"  />
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="helpid:10287"  />
+ <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
+ <toolbar:toolbaritem xlink:href=".uno:Forward"/>
+ <toolbar:toolbaritem xlink:href=".uno:Backward"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BeforeObject" toolbar:helpid="helpid:27326"  />
- <toolbar:toolbaritem xlink:href=".uno:BehindObject" toolbar:helpid="helpid:27116"  />
+ <toolbar:toolbaritem xlink:href=".uno:BeforeObject"/>
+ <toolbar:toolbaritem xlink:href=".uno:BehindObject"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ReverseOrder" toolbar:helpid="helpid:27117"  />
+ <toolbar:toolbaritem xlink:href=".uno:ReverseOrder"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml Wed Jun 27 13:44:09 2012
@@ -23,13 +23,13 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="helpid:10104" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square" toolbar:helpid="helpid:10380" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Rect_Rounded" toolbar:helpid="helpid:10105" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square_Rounded" toolbar:helpid="helpid:10381" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Square" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Rect_Rounded" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Square_Rounded" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Rect_Unfilled" toolbar:helpid="helpid:10378" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square_Unfilled" toolbar:helpid="helpid:10382" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Rect_Rounded_Unfilled" toolbar:helpid="helpid:10379" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Square_Rounded_Unfilled" toolbar:helpid="helpid:10383" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Rect_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Square_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Rect_Rounded_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Square_Rounded_Unfilled" toolbar:style="radio"/>
 </toolbar:toolbar>
\ No newline at end of file