incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1354497 [3/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/animco...
Date Wed, 27 Jun 2012 13:45:34 GMT
Modified: incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/menubar/menubar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/menubar/menubar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/menubar/menubar.xml Wed Jun 27 13:44:09 2012
@@ -20,145 +20,145 @@
  * 
  ***********************************************************-->
 <menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
-	<menu:menu menu:id=".uno:PickList" menu:label="" >
+	<menu:menu menu:id=".uno:PickList">
 		<menu:menupopup>
-			<menu:menuitem menu:id=".uno:AddDirect" menu:helpid="5537" menu:label="" />
-			<menu:menuitem menu:id=".uno:Open" menu:helpid="5501" menu:label="" />
-			<menu:menuitem menu:id=".uno:AutoPilotMenu" menu:helpid="6381" menu:label="" />
+			<menu:menuitem menu:id=".uno:AddDirect"/>
+			<menu:menuitem menu:id=".uno:Open"/>
+			<menu:menuitem menu:id=".uno:AutoPilotMenu"/>
 			<menu:menuseparator/>
-			<menu:menuitem menu:id=".uno:CloseDoc" menu:helpid="5503" menu:label="" />
-			<menu:menuitem menu:id=".uno:Save" menu:helpid="5505" menu:label="" />
-			<menu:menuitem menu:id=".uno:SaveAs" menu:helpid="5502" menu:label="" />
-			<menu:menuitem menu:id=".uno:SaveAll" menu:helpid="5309" menu:label="" />
-			<menu:menuitem menu:id=".uno:Reload" menu:helpid="5508" menu:label="" />
-			<menu:menuitem menu:id=".uno:VersionDialog" menu:helpid="6583" menu:label="" />
-			<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />
+			<menu:menuitem menu:id=".uno:CloseDoc"/>
+			<menu:menuitem menu:id=".uno:Save"/>
+			<menu:menuitem menu:id=".uno:SaveAs"/>
+			<menu:menuitem menu:id=".uno:SaveAll"/>
+			<menu:menuitem menu:id=".uno:Reload"/>
+			<menu:menuitem menu:id=".uno:VersionDialog"/>
+			<menu:menuitem menu:id=".uno:SendMail"/>
 			<menu:menuseparator/>
-			<menu:menuitem menu:id=".uno:SetDocumentProperties" menu:helpid="5535" menu:label="" />
+			<menu:menuitem menu:id=".uno:SetDocumentProperties"/>
 			<menu:menuseparator/>
-			<menu:menuitem menu:id=".uno:Print" menu:helpid="5504" menu:label="" />
-			<menu:menuitem menu:id=".uno:PrinterSetup" menu:helpid="5302" menu:label="" />
+			<menu:menuitem menu:id=".uno:Print"/>
+			<menu:menuitem menu:id=".uno:PrinterSetup"/>
 			<menu:menuseparator/>
-			<menu:menuitem menu:id=".uno:Quit" menu:helpid="5300" menu:label="" />
+			<menu:menuitem menu:id=".uno:Quit"/>
 		</menu:menupopup>
 	</menu:menu>
-	<menu:menu menu:id=".uno:EditMenu" menu:label="" >
+	<menu:menu menu:id=".uno:EditMenu">
 		<menu:menupopup>
-			<menu:menuitem menu:id=".uno:Undo" menu:helpid="5701" menu:label="" />
-			<menu:menuitem menu:id=".uno:Redo" menu:helpid="5700" menu:label="" />
+			<menu:menuitem menu:id=".uno:Undo"/>
+			<menu:menuitem menu:id=".uno:Redo"/>
 			<menu:menuseparator/>
-			<menu:menuitem menu:id=".uno:Cut" menu:helpid="5710" menu:label="" />
-			<menu:menuitem menu:id=".uno:Copy" menu:helpid="5711" menu:label="" />
-			<menu:menuitem menu:id=".uno:Paste" menu:helpid="5712" menu:label="" />
+			<menu:menuitem menu:id=".uno:Cut"/>
+			<menu:menuitem menu:id=".uno:Copy"/>
+			<menu:menuitem menu:id=".uno:Paste"/>
 		</menu:menupopup>
 	</menu:menu>
-	<menu:menu menu:id=".uno:ViewMenu" menu:label="" >
+	<menu:menu menu:id=".uno:ViewMenu">
 		<menu:menupopup>
-			<menu:menuitem menu:id=".uno:AvailableToolbars" menu:label="" />
-			<menu:menuitem menu:id=".uno:StatusBarVisible" menu:helpid="5920" menu:label="" />
-			<menu:menuitem menu:id=".uno:ShowImeStatusWindow" menu:helpid="6680" menu:label="" />
+			<menu:menuitem menu:id=".uno:AvailableToolbars"/>
+			<menu:menuitem menu:id=".uno:StatusBarVisible"/>
+			<menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
 			<menu:menuseparator/>
-			<menu:menuitem menu:id=".uno:DiagramData" menu:helpid="30514" menu:label="" />
+			<menu:menuitem menu:id=".uno:DiagramData"/>
 		</menu:menupopup>
 	</menu:menu>
-	<menu:menu menu:id=".uno:InsertMenu" menu:label="" >
+	<menu:menu menu:id=".uno:InsertMenu">
 		<menu:menupopup>
-                <menu:menuitem menu:id=".uno:InsertMenuTitles" menu:label="" />
-                <menu:menuitem menu:id=".uno:InsertMenuLegend" menu:label="" />
-                <menu:menuitem menu:id=".uno:InsertMenuAxes" menu:label="" />
-                <menu:menuitem menu:id=".uno:InsertMenuGrids" menu:label="" />
+                <menu:menuitem menu:id=".uno:InsertMenuTitles"/>
+                <menu:menuitem menu:id=".uno:InsertMenuLegend"/>
+                <menu:menuitem menu:id=".uno:InsertMenuAxes"/>
+                <menu:menuitem menu:id=".uno:InsertMenuGrids"/>
 			<menu:menuseparator/>
-			    <menu:menuitem menu:id=".uno:InsertMenuDataLabels" menu:label="" />
-			    <menu:menuitem menu:id=".uno:InsertMenuTrendlines" menu:label="" />
-			    <menu:menuitem menu:id=".uno:InsertMenuMeanValues" menu:label="" />
-			    <menu:menuitem menu:id=".uno:InsertMenuYErrorBars" menu:label="" />
+			    <menu:menuitem menu:id=".uno:InsertMenuDataLabels"/>
+			    <menu:menuitem menu:id=".uno:InsertMenuTrendlines"/>
+			    <menu:menuitem menu:id=".uno:InsertMenuMeanValues"/>
+			    <menu:menuitem menu:id=".uno:InsertMenuYErrorBars"/>
 			<menu:menuseparator/>
-			    <menu:menuitem menu:id=".uno:InsertSymbol" menu:helpid="10503" menu:label="" />
+			    <menu:menuitem menu:id=".uno:InsertSymbol"/>
 		</menu:menupopup>
 	</menu:menu>
-	<menu:menu menu:id=".uno:FormatMenu" menu:label="" >
+	<menu:menu menu:id=".uno:FormatMenu">
 		<menu:menupopup>
-		    <menu:menuitem menu:id=".uno:FormatSelection" menu:label="" />
-			<menu:menuitem menu:id=".uno:TransformDialog" menu:helpid="10087" menu:label="" />
-			<menu:menu menu:id=".uno:ArrangeRow" menu:label="" >
+		    <menu:menuitem menu:id=".uno:FormatSelection"/>
+			<menu:menuitem menu:id=".uno:TransformDialog"/>
+			<menu:menu menu:id=".uno:ArrangeRow">
 				<menu:menupopup>
-					<menu:menuitem menu:id=".uno:Forward" menu:helpid="30594" menu:label="" />
-					<menu:menuitem menu:id=".uno:Backward" menu:helpid="30595" menu:label="" />
+					<menu:menuitem menu:id=".uno:Forward"/>
+					<menu:menuitem menu:id=".uno:Backward"/>
 				</menu:menupopup>
 			</menu:menu>
 			<menu:menuseparator/>
-			<menu:menu menu:id=".uno:ChartTitleMenu" menu:label="" >
+			<menu:menu menu:id=".uno:ChartTitleMenu">
 				<menu:menupopup>
-					<menu:menuitem menu:id=".uno:MainTitle" menu:helpid="30557" menu:label="" />
-					<menu:menuitem menu:id=".uno:SubTitle" menu:helpid="30558" menu:label="" />
+					<menu:menuitem menu:id=".uno:MainTitle"/>
+					<menu:menuitem menu:id=".uno:SubTitle"/>
 					<menu:menuseparator/>
-					<menu:menuitem menu:id=".uno:XTitle" menu:helpid="30559" menu:label="" />
-					<menu:menuitem menu:id=".uno:YTitle" menu:helpid="30560" menu:label="" />
-					<menu:menuitem menu:id=".uno:ZTitle" menu:helpid="30561" menu:label="" />
+					<menu:menuitem menu:id=".uno:XTitle"/>
+					<menu:menuitem menu:id=".uno:YTitle"/>
+					<menu:menuitem menu:id=".uno:ZTitle"/>
 					<menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:SecondaryXTitle" menu:label="" />
-                    <menu:menuitem menu:id=".uno:SecondaryYTitle" menu:label="" />
+                    <menu:menuitem menu:id=".uno:SecondaryXTitle"/>
+                    <menu:menuitem menu:id=".uno:SecondaryYTitle"/>
                     <menu:menuseparator/>
-					<menu:menuitem menu:id=".uno:AllTitles" menu:helpid="30562" menu:label="" />
+					<menu:menuitem menu:id=".uno:AllTitles"/>
 				</menu:menupopup>
 			</menu:menu>
-            <menu:menuitem menu:id=".uno:Legend" menu:helpid="30521" menu:label="" />
-			<menu:menu menu:id=".uno:DiagramAxisMenu" menu:label="" >
+            <menu:menuitem menu:id=".uno:Legend"/>
+			<menu:menu menu:id=".uno:DiagramAxisMenu">
 				<menu:menupopup>
-					<menu:menuitem menu:id=".uno:DiagramAxisX" menu:helpid="30552" menu:label="" />
-					<menu:menuitem menu:id=".uno:DiagramAxisY" menu:helpid="30553" menu:label="" />
-					<menu:menuitem menu:id=".uno:DiagramAxisZ" menu:helpid="30554" menu:label="" />
+					<menu:menuitem menu:id=".uno:DiagramAxisX"/>
+					<menu:menuitem menu:id=".uno:DiagramAxisY"/>
+					<menu:menuitem menu:id=".uno:DiagramAxisZ"/>
 					<menu:menuseparator/>
-					<menu:menuitem menu:id=".uno:DiagramAxisA" menu:helpid="30616" menu:label="" />
-					<menu:menuitem menu:id=".uno:DiagramAxisB" menu:helpid="30617" menu:label="" />
+					<menu:menuitem menu:id=".uno:DiagramAxisA"/>
+					<menu:menuitem menu:id=".uno:DiagramAxisB"/>
 					<menu:menuseparator/>
-					<menu:menuitem menu:id=".uno:DiagramAxisAll" menu:helpid="30555" menu:label="" />
+					<menu:menuitem menu:id=".uno:DiagramAxisAll"/>
 				</menu:menupopup>
 			</menu:menu>
-            <menu:menu menu:id=".uno:DiagramGridMenu" menu:label="" >
+            <menu:menu menu:id=".uno:DiagramGridMenu">
 				<menu:menupopup>
-					<menu:menuitem menu:id=".uno:DiagramGridYMain" menu:helpid="30564" menu:label="" />
-					<menu:menuitem menu:id=".uno:DiagramGridXMain" menu:helpid="30563" menu:label="" />
-					<menu:menuitem menu:id=".uno:DiagramGridZMain" menu:helpid="30565" menu:label="" />
-					<menu:menuseparator/>
-					<menu:menuitem menu:id=".uno:DiagramGridYHelp" menu:helpid="30579" menu:label="" />
-					<menu:menuitem menu:id=".uno:DiagramGridXHelp" menu:helpid="30578" menu:label="" />
-					<menu:menuitem menu:id=".uno:DiagramGridZHelp" menu:helpid="30580" menu:label="" />
+					<menu:menuitem menu:id=".uno:DiagramGridYMain"/>
+					<menu:menuitem menu:id=".uno:DiagramGridXMain"/>
+					<menu:menuitem menu:id=".uno:DiagramGridZMain"/>
+					<menu:menuseparator/>
+					<menu:menuitem menu:id=".uno:DiagramGridYHelp"/>
+					<menu:menuitem menu:id=".uno:DiagramGridXHelp"/>
+					<menu:menuitem menu:id=".uno:DiagramGridZHelp"/>
 					<menu:menuseparator/>
-					<menu:menuitem menu:id=".uno:DiagramGridAll" menu:helpid="30566" menu:label="" />
+					<menu:menuitem menu:id=".uno:DiagramGridAll"/>
 				</menu:menupopup>
 			</menu:menu>
 			<menu:menuseparator/>
-			    <menu:menuitem menu:id=".uno:DiagramWall" menu:helpid="30524" menu:label="" />
-			    <menu:menuitem menu:id=".uno:DiagramFloor" menu:helpid="30525" menu:label="" />
-			    <menu:menuitem menu:id=".uno:DiagramArea" menu:helpid="30526" menu:label="" />
+			    <menu:menuitem menu:id=".uno:DiagramWall"/>
+			    <menu:menuitem menu:id=".uno:DiagramFloor"/>
+			    <menu:menuitem menu:id=".uno:DiagramArea"/>
             <menu:menuseparator/>
-                <menu:menuitem menu:id=".uno:DiagramType" menu:helpid="30528" menu:label="" />
-                <menu:menuitem menu:id=".uno:DataRanges" menu:helpid="30514" menu:label="" />
-			    <menu:menuitem menu:id=".uno:View3D" menu:helpid="30527" menu:label="" />
+                <menu:menuitem menu:id=".uno:DiagramType"/>
+                <menu:menuitem menu:id=".uno:DataRanges"/>
+			    <menu:menuitem menu:id=".uno:View3D"/>
             
 		</menu:menupopup>
 	</menu:menu>
-	<menu:menu menu:id=".uno:ToolsMenu" menu:label="" >
+	<menu:menu menu:id=".uno:ToolsMenu">
 		<menu:menupopup>
-		    <menu:menu menu:id=".uno:MacrosMenu" menu:label="" >
+		    <menu:menu menu:id=".uno:MacrosMenu">
                 <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:MacroRecorder" menu:helpid="6669" menu:label="" />
-                    <menu:menuitem menu:id=".uno:RunMacro" menu:helpid="40011" menu:label="" />
-                    <menu:menu menu:id=".uno:ScriptOrganizer" menu:label="" />
+                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
+                    <menu:menuitem menu:id=".uno:RunMacro"/>
+                    <menu:menu menu:id=".uno:ScriptOrganizer"/>
                     <menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1" menu:helpid="40013" menu:label="" />
+                    <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
                 </menu:menupopup>
 			</menu:menu>
-		    <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:helpid="42772" />
-			<menu:menuitem menu:id=".uno:ConfigureDialog" menu:helpid="5904" menu:label="" />
-			<menu:menuitem menu:id=".uno:OptionsTreeDialog" menu:helpid="31630" menu:label="" />
+		    <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
+			<menu:menuitem menu:id=".uno:ConfigureDialog"/>
+			<menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
 		</menu:menupopup>
 	</menu:menu>
-	<menu:menu menu:id=".uno:WindowList" menu:label="" >
+	<menu:menu menu:id=".uno:WindowList">
 		<menu:menupopup>
-			<menu:menuitem menu:id=".uno:NewWindow" menu:helpid="5620" menu:label="" />
-			<menu:menuitem menu:id=".uno:CloseWin" menu:helpid="5621" menu:label="" />
+			<menu:menuitem menu:id=".uno:NewWindow"/>
+			<menu:menuitem menu:id=".uno:CloseWin"/>
 			<menu:menuseparator/>
 		</menu:menupopup>
 	</menu:menu>

Modified: incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/statusbar/statusbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/statusbar/statusbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/statusbar/statusbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/statusbar/statusbar.xml Wed Jun 27 13:44:09 2012
@@ -21,6 +21,6 @@
  * 
  ***********************************************************-->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:Context" statusbar:align="left" statusbar:autosize="true" statusbar:width="208" statusbar:helpid="helpid:5310"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14" statusbar:helpid="helpid:5584"/>
+ <statusbar:statusbaritem xlink:href=".uno:Context" statusbar:align="left" statusbar:autosize="true" statusbar:width="208"/>
+ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14"/>
 </statusbar:statusbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/arrowshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/arrowshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/arrowshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/arrowshapes.xml Wed Jun 27 13:44:09 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:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/basicshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/basicshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/basicshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/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/chart2/uiconfig/toolbar/calloutshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/calloutshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/calloutshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/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/chart2/uiconfig/toolbar/drawbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/drawbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/drawbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/drawbar.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:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="27173"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
+ <toolbar:toolbaritem xlink:href=".uno:Line"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd"/>
+ <toolbar:toolbaritem xlink:href=".uno:Rect"/>
+ <toolbar:toolbaritem xlink:href=".uno:Ellipse"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled"/>
+ <toolbar:toolbaritem xlink:href=".uno:DrawText"/>
+ <toolbar:toolbaritem xlink:href=".uno:DrawCaption"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:style="dropdown" toolbar:helpid="11002"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:style="dropdown" toolbar:helpid="11003"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:style="dropdown" toolbar:helpid="11004"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:style="dropdown" toolbar:helpid="11005"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:style="dropdown" toolbar:helpid="11006"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:style="dropdown" toolbar:helpid="11007"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:style="dropdown"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/flowchartshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/flowchartshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/flowchartshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/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/chart2/uiconfig/toolbar/standardbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/standardbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/standardbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/standardbar.xml Wed Jun 27 13:44:09 2012
@@ -23,22 +23,22 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:helpid="helpid:5500" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" toolbar:text="" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
+ <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:helpid="helpid:6312" toolbar:text="" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/starshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/starshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/starshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/starshapes.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: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/branches/alg/aw080/main/chart2/uiconfig/toolbar/symbolshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/symbolshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/symbolshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/symbolshapes.xml Wed Jun 27 13:44:09 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/branches/alg/aw080/main/chart2/uiconfig/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/uiconfig/toolbar/toolbar.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:ChartElementSelector" />
- <toolbar:toolbaritem xlink:href=".uno:FormatSelection" />
+ <toolbar:toolbaritem xlink:href=".uno:ChartElementSelector"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatSelection"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DiagramType" toolbar:helpid="helpid:30528" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DiagramData" toolbar:helpid="helpid:30514" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:DiagramType"/>
+ <toolbar:toolbaritem xlink:href=".uno:DiagramData"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleGridHorizontal" toolbar:helpid="helpid:30533" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleLegend" toolbar:helpid="helpid:30530" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:ScaleText" toolbar:helpid="helpid:30586" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:ToggleGridHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleLegend"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScaleText"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NewArrangement" toolbar:helpid="helpid:30539" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:NewArrangement"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/chart2/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/util/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/util/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/util/makefile.mk Wed Jun 27 13:44:09 2012
@@ -40,7 +40,7 @@ TARGET=chart_db
 
 .INCLUDE :  target.mk
 
-.IF "$(L10N_framewor)"==""
+.IF "$(L10N_framework)"==""
 ALLTAR : \
 	$(BIN)$/$(PRJNAME).rdb \
 	$(MISC)$/$(TARGET).don
@@ -52,5 +52,5 @@ $(MISC)$/$(TARGET).don : $(UCR)$/$(PRJNA
 	$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(UCR)$/$(PRJNAME).db -X$(SOLARBINDIR)$/types.rdb && echo > $@
 	echo $@
 
-.ENDIF			# "$(L10N_framewor)"==""
+.ENDIF # "$(L10N_framework)"==""
 

Modified: incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/InlineContainer.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/InlineContainer.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/InlineContainer.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/InlineContainer.hxx Wed Jun 27 13:44:09 2012
@@ -95,7 +95,7 @@ public:
     explicit MakeSet(const T &a)
         : ::std::set< T >()
     {
-        insert(this->end(), a);
+        this->insert(this->end(), a);
     }
     MakeSet &operator()(const T &a)
     {

Modified: incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/embeddedobjectcontainer.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/embeddedobjectcontainer.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/embeddedobjectcontainer.hxx Wed Jun 27 13:44:09 2012
@@ -127,10 +127,12 @@ public:
 
     // move an embedded object from one container to another one
     sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& );
-
+ // #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+    
+sal_Bool            RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose = sal_True, sal_Bool bKeepToTempStorage = sal_True );
+sal_Bool            RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose = sal_True, sal_Bool bKeepToTempStorage = sal_True ); 
     // remove an embedded object from the container and from the storage; if object can't be closed
-    sal_Bool            RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose=sal_True );
-    sal_Bool            RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose=sal_True );
+    //sal_Bool            RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose=sal_True );
+   // sal_Bool            RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose=sal_True );
 
 	// close and remove an embedded object from the container without removing it from the storage
     sal_Bool            CloseEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );

Modified: incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/sequenceasvector.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/sequenceasvector.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/sequenceasvector.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/comphelper/inc/comphelper/sequenceasvector.hxx Wed Jun 27 13:44:09 2012
@@ -139,7 +139,7 @@ class SequenceAsVector : public ::std::v
             const TElementType* pSource = lSource.getConstArray();
 
             for (sal_Int32 i=0; i<c; ++i)
-                push_back(pSource[i]);
+                this->push_back(pSource[i]);
         }
 
         //---------------------------------------

Modified: incubator/ooo/branches/alg/aw080/main/comphelper/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/comphelper/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/comphelper/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/comphelper/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
 VERBOSEFLAG := -s
 .ENDIF
 
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: incubator/ooo/branches/alg/aw080/main/comphelper/source/container/embeddedobjectcontainer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/comphelper/source/container/embeddedobjectcontainer.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/comphelper/source/container/embeddedobjectcontainer.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/comphelper/source/container/embeddedobjectcontainer.cxx Wed Jun 27 13:44:09 2012
@@ -950,13 +950,16 @@ sal_Bool EmbeddedObjectContainer::MoveEm
     return bRet;
 }
 
-sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose )
+//sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose )
+// #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+
+sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose, sal_Bool bKeepToTempStorage )
 {
 	RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Name )" );
 
     uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( rName );
     if ( xObj.is() )
-        return RemoveEmbeddedObject( xObj, bClose );
+        //return RemoveEmbeddedObject( xObj, bClose );
+        return RemoveEmbeddedObject( xObj, bClose, bKeepToTempStorage );
     else
         return sal_False;
 }
@@ -1014,7 +1017,9 @@ sal_Bool EmbeddedObjectContainer::MoveEm
     return sal_False;
 }
 
-sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, sal_Bool bClose )
+//sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, sal_Bool bClose )
+// #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+
+sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, sal_Bool bClose, sal_Bool bKeepToTempStorage ) 
 {
 	RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Object )" );
 
@@ -1051,7 +1056,8 @@ sal_Bool EmbeddedObjectContainer::Remove
         // somebody still needs the object, so we must assign a temporary persistence
         try
         {
-            if ( xPersist.is() )
+        //    if ( xPersist.is() )
+             if ( xPersist.is() && bKeepToTempStorage )	// #i119941
             {
                 /*
                 //TODO/LATER: needs storage handling!  Why not letting the object do it?!
@@ -1131,7 +1137,8 @@ sal_Bool EmbeddedObjectContainer::Remove
     }
 
     OSL_ENSURE( bFound, "Object not found for removal!" );
-    if ( xPersist.is() )
+   // if ( xPersist.is() )
+    if ( xPersist.is() && bKeepToTempStorage )	// #i119941
     {
         // remove replacement image (if there is one)
         RemoveGraphicStream( aName );

Modified: incubator/ooo/branches/alg/aw080/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/configure.in?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/configure.in (original)
+++ incubator/ooo/branches/alg/aw080/main/configure.in Wed Jun 27 13:44:09 2012
@@ -307,8 +307,8 @@ AC_ARG_ENABLE(kde4,
                           if you want to support both KDE3 and KDE4.
 ],,)
 AC_ARG_ENABLE(binfilter,
-[  --disable-binfilter     Disable legacy binary file formats filters
-],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
+[  --enable-binfilter      Enable legacy binary file formats filters
+],,)
 AC_ARG_ENABLE(rpath,
 [  --disable-rpath         Disable the use of relative paths in shared libraries
 ],,)
@@ -771,6 +771,18 @@ AC_ARG_WITH(local-solver,
 AC_ARG_ENABLE(javascript,
 [  --disable-javascript    Disables support for JavaScript macros.
 ],,)
+AC_ARG_WITH(system-apr,
+[  --with-system-apr       Use apr library already installed on the system
+],,)
+AC_ARG_WITH(system-apr-util,
+[  --with-system-apr-util  Use apr-util library already installed on the system
+],,)
+AC_ARG_WITH(system-serf,
+[  --with-system-serf      Use serf library already installed on the system
+],,)
+AC_ARG_WITH(system-coinmp,
+[  --with-system-coinmp    Use CoinMP library already installed on the system
+],,)
 AC_ARG_ENABLE(coinmp,
 [  --disable-coinmp        Do not use CoinMP as the Calc solver.
 ],,)
@@ -913,6 +925,7 @@ AC_ARG_WITH(arm-target,
 
 BUILD_TYPE="OOo"
 ADDITIONAL_REPOSITORIES="../ext_libraries"
+SCPDEFS=""
 
 dnl ===================================================================
 dnl Message.
@@ -1433,13 +1446,13 @@ dnl ====================================
 dnl Disable legacy binary file formats filters
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable filters for legacy binary file formats (StarOffice 5.2)])
-if test "$enable_binfilter" = "no"; then
-   WITH_BINFILTER="NO"
-   AC_MSG_RESULT([no])
-else
+if test "$enable_binfilter" = "yes"; then
    WITH_BINFILTER="YES"
    BUILD_TYPE="$BUILD_TYPE BINFILTER"
    AC_MSG_RESULT([yes])
+else
+   WITH_BINFILTER="NO"
+   AC_MSG_RESULT([no])
 fi
 AC_SUBST(WITH_BINFILTER)
 
@@ -1949,7 +1962,7 @@ dnl ====================================
 dnl Testing for required Perl modules
 dnl ===================================================================
 AC_MSG_CHECKING([for required Perl modules])
-if `$PERL -e 'use Archive::Zip;'`; then
+if `$PERL -e 'use Archive::Zip; use LWP::UserAgent;'`; then
 	AC_MSG_RESULT([all modules found])
 else
 	AC_MSG_ERROR([Failed to find some modules])
@@ -2027,7 +2040,8 @@ if test "$_os" = "WINNT"; then
 			dnl  Check which Microsoft C/C++ compiler is found
 			AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
 dnl      The following find microsoft, matches nn.nn.nnnn then pulls numbers out.         
-			CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
+			CCTXTVER=`$CC 2>&1 | head -n1`
+			CCNUMVER=`echo $CCTXTVER | $AWK "/Microsoft/ && /..\\...\\...../ {
 							x = match( \\\$0, /..\\...\\...../ )
 							CCversion = substr( \\\$0, RSTART, RLENGTH)
 							tokencount = split (CCversion,vertoken,\".\")
@@ -2035,21 +2049,13 @@ dnl      The following find microsoft, m
 								printf (\"%04d\",vertoken[[i]] )
 							}
 							}"`
-			AC_MSG_RESULT([found Compiler version $CCNUMVER.])
+			AC_MSG_RESULT([found Compiler version $CCNUMVER in \"$CCTXTVER\"])
 			if test "$CCNUMVER" -ge "001500000000"; then
 				COMEX=12
 				MSVSVER=2008
 				AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
-			elif test "$CCNUMVER" -ge "001400000000"; then
-				COMEX=11
-				MSVSVER=2005
-				AC_MSG_RESULT([found .NET 2005.])
-			elif test "$CCNUMVER" -ge "001300102240"; then
-				COMEX=10
-				MSVSVER=2003
-				AC_MSG_RESULT([found .NET 2003.])
 			else
-				AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.])
+				AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2008.])
 			fi
 		else
 			AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
@@ -4448,19 +4454,103 @@ AC_SUBST(ENABLE_JAVASCRIPT)
 
 
 dnl ===================================================================
+dnl Check for system apr
+dnl ===================================================================
+SYSTEM_APR=NO
+APR_CFLAGS=
+APR_LIBS=
+AC_MSG_CHECKING([which libapr to use])
+if test "x$with_system_apr" = "xyes" -o -n "$with_system_libs"; then
+    AC_MSG_RESULT([system])
+    PKG_CHECK_MODULES([APR], [apr-1 >= 1.0])
+    SYSTEM_APR=YES
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_APR=NO
+    BUILD_TYPE="$BUILD_TYPE APR"
+fi
+AC_SUBST(SYSTEM_APR)
+AC_SUBST(APR_CFLAGS)
+AC_SUBST(APR_LIBS)
+
+
+dnl ===================================================================
+dnl Check for system apr-util
+dnl ===================================================================
+SYSTEM_APRUTIL=NO
+APRUTIL_CFLAGS=
+APRUTIL_LIBS=
+AC_MSG_CHECKING([which libapr-util to use])
+if test "x$with_system_apr_util" = "xyes" -o -n "$with_system_libs"; then
+    AC_MSG_RESULT([system])
+    PKG_CHECK_MODULES([APRUTIL], [apr-util-1 >= 1.0])
+    SYSTEM_APRUTIL=YES
+else
+    AC_MSG_RESULT([internal])
+    SYSTEMAPR_UTIL=NO
+    BUILD_TYPE="$BUILD_TYPE APR_UTIL"
+fi
+AC_SUBST(SYSTEM_APRUTIL)
+AC_SUBST(APRUTIL_CFLAGS)
+AC_SUBST(APRUTIL_LIBS)
+
+
+dnl ===================================================================
+dnl Check for system serf
+dnl ===================================================================
+SYSTEM_SERF=NO
+SERF_CFLAGS=
+SERF_LIBS=
+AC_MSG_CHECKING([which libserf to use])
+if test "x$with_system_serf" = "xyes" -o -n "$with_system_libs"; then
+    AC_MSG_RESULT([system])
+    PKG_CHECK_MODULES([SERF], [serf-1 >= 1.1])
+    SYSTEM_SERF=YES
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_SERF=NO
+    BUILD_TYPE="$BUILD_TYPE SERF"
+fi
+AC_SUBST(SYSTEM_SERF)
+AC_SUBST(SERF_CFLAGS)
+AC_SUBST(SERF_LIBS)
+
+
+dnl ===================================================================
 dnl Check for CoinMP
 dnl ===================================================================
 ENABLE_COINMP=
+SYSTEM_COINMP=NO
+COINMP_CFLAGS=
+COINMP_LIBS=
 AC_MSG_CHECKING([whether to enable support for CoinMP])
 if test "x$enable_coinmp" = "xyes"; then
-   BUILD_TYPE="$BUILD_TYPE COINMP"
-   AC_MSG_RESULT([yes])
-   ENABLE_COINMP=YES
+    BUILD_TYPE="$BUILD_TYPE COINMP"
+    AC_MSG_RESULT([yes])
+    ENABLE_COINMP=YES
+
+    dnl Check wether to use system or internal CoinMP
+    AC_MSG_CHECKING([which coinmp to use])
+    if test "x$with_system_coinmp" = "xyes" -o -n "$with_system_libs"; then
+        AC_MSG_RESULT([system])
+	PKG_CHECK_MODULES([COINMP], [coinmp])
+        SYSTEM_COINMP=YES
+        # some systems need this. Like Ubuntu....
+        AC_CHECK_LIB(m, floor)
+        AC_CHECK_LIB(dl, dlopen)
+    else
+        AC_MSG_RESULT([internal])
+        SYSTEM_COINMP=NO
+        BUILD_TYPE="$BUILD_TYPE COINMP"
+    fi
 else
-   AC_MSG_RESULT([no])
-   ENABLE_COINMP=NO
+    AC_MSG_RESULT([no])
+    ENABLE_COINMP=NO
 fi
 AC_SUBST(ENABLE_COINMP)
+AC_SUBST(SYSTEM_COINMP)
+AC_SUBST(COINMP_CFLAGS)
+AC_SUBST(COINMP_LIBS)
 
 
 dnl ===================================================================
@@ -4863,31 +4953,6 @@ if test "$BUILD_MOZAB" = "TRUE"; then
    if test -z "$MOZILLA_VERSION"; then
       MOZILLA_VERSION=1.1.14
    fi
-   MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
-   MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
-   AC_MSG_CHECKING([for mozilla sources])
-   if test -z "$MOZILLA_FETCH_FILE"; then
-      AC_MSG_RESULT([not found])
-      HAVE_MOZILLA_TARBALL=n
-   else
-      AC_MSG_CHECKING([for $MOZILLA_FETCH_FILE])
-      if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then
-         if test -z "$DO_FETCH"; then
-            AC_MSG_RESULT([will be fetched])
-            HAVE_MOZILLA_TARBALL=y
-         else
-            AC_MSG_RESULT([not found])
-            HAVE_MOZILLA_TARBALL=n
-         fi
-      else
-         AC_MSG_RESULT([found])
-         HAVE_MOZILLA_TARBALL=y
-      fi
-   fi
-   if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-      AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
-Use "./fetch_tarballs.sh ooo.lst" to download.])
-   fi
    if test "$_os" = "WINNT"; then
       AC_MSG_CHECKING([for moztools binaries])
       if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then
@@ -5961,7 +6026,7 @@ if test  "$test_gtk" = "yes"; then
       BUILD_TYPE="$BUILD_TYPE GTK"
 
       if test "x$enable_systray" = "xyes"; then
-         PKG_CHECK_MODULES(GTK_2_16,gtk+-2.0 >= 2.16.0,
+         PKG_CHECK_MODULES(GTK_2_10,gtk+-2.0 >= 2.10.0,
                            [ENABLE_SYSTRAY_GTK="TRUE"
                             BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"],
                            [ENABLE_SYSTRAY_GTK=""])

Modified: incubator/ooo/branches/alg/aw080/main/cosv/inc/cosv/stringdata.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cosv/inc/cosv/stringdata.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/cosv/inc/cosv/stringdata.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/cosv/inc/cosv/stringdata.hxx Wed Jun 27 13:44:09 2012
@@ -26,7 +26,7 @@
 
 
 #include <cosv/str_types.hxx>
-
+#include <cstring>
 
 
 namespace csv

Modified: incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/SpellDialog.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/SpellDialog.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/SpellDialog.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/SpellDialog.cxx Wed Jun 27 13:44:09 2012
@@ -256,6 +256,9 @@ SpellDialog::SpellDialog(
     aChangePB.      SetHelpId(HID_SPLDLG_BUTTON_CHANGE   );
     aChangeAllPB.   SetHelpId(HID_SPLDLG_BUTTON_CHANGEALL);
     aExplainPB.     SetHelpId(HID_SPLDLG_BUTTON_EXPLAIN );
+
+    aAddToDictMB.SetPopupMenu( new PopupMenu );
+
 	Init_Impl();
 
 	// disable controls if service is missing
@@ -301,6 +304,7 @@ void SpellDialog::Init_Impl()
     aSuggestionLB.SetDoubleClickHdl( LINK( this, SpellDialog, ChangeHdl ) );
 
     aSentenceED.SetModifyHdl(LINK ( this, SpellDialog, ModifyHdl) );
+    aAddToDictMB.SetActivateHdl(LINK ( this, SpellDialog, MenuButtonActivateHdl ) );
     aAddToDictMB.SetSelectHdl(LINK ( this, SpellDialog, AddToDictionaryHdl ) );
     aLanguageLB.SetSelectHdl(LINK( this, SpellDialog, LanguageSelectHdl ) );
 
@@ -310,9 +314,6 @@ void SpellDialog::Init_Impl()
     // get current language
 	UpdateBoxes_Impl();
 
-    // fill dictionary PopupMenu
-	InitUserDicts();
-
     aSentenceED.ClearModifyFlag();
 	SvxGetChangeAllList()->clear();
 }
@@ -347,8 +348,11 @@ void SpellDialog::UpdateBoxes_Impl()
     }
     else
         SetTitle_Impl( nAltLanguage );
-	SetSelectedLang_Impl( nAltLanguage );
 
+    SetSelectedLang_Impl( nAltLanguage );
+
+    // Initialize/update user dictionaries after setting the language in the listbox
+    InitUserDicts();
 
 	// Alternativen eintragen
 	const ::rtl::OUString *pNewWords = aNewWords.getConstArray();
@@ -853,6 +857,8 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl
 
          aSentenceED.AddUndoAction(new SpellUndoAction_Impl(SPELLUNDO_CHANGE_LANGUAGE, aDialogUndoLink));
     }
+
+    // Update listboxes and user dictionaries when selected language changes
     SpellDialog::UpdateBoxes_Impl();
     return 0;
 }
@@ -930,34 +936,46 @@ void SpellDialog::SetTitle_Impl(Language
   -----------------------------------------------------------------------*/
 void SpellDialog::InitUserDicts()
 {
-    const LanguageType nLang = aLanguageLB.GetSelectLanguage();
-
-	const Reference< XDictionary >  *pDic = 0;
+    bool bEnable = false;
 
     // get list of dictionaries
     Reference< XDictionaryList >  xDicList( SvxGetDictionaryList() );
     if (xDicList.is())
     {
         // add active, positive dictionary to dic-list (if not already done).
-        // This is to ensure that there is at least on dictionary to which
+        // This is to ensure that there is at least one dictionary to which
         // words could be added.
         Reference< XDictionary >  xDic( SvxGetOrCreatePosDic( xDicList ) );
         if (xDic.is())
             xDic->setActive( sal_True );
 
         pImpl->aDics = xDicList->getDictionaries();
+
+        // this is redundant, there will always be *at least* one dictionary
+        bEnable = pImpl->aDics.getLength();
     }
 
+    aAddToDictMB.Enable( bEnable );
+}
+
+IMPL_LINK(SpellDialog, MenuButtonActivateHdl, MenuButton*, )
+{
+    bool bEnable = false;
+    const LanguageType nLang = aLanguageLB.GetSelectLanguage();
+    const Reference< XDictionary >  *pDic = 0;
+
     SvtLinguConfig aCfg;
     const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
     // list suitable dictionaries
-    bool bEnable = false;
     const sal_Int32 nSize = pImpl->aDics.getLength();
     pDic = pImpl->aDics.getConstArray();
-    delete aAddToDictMB.GetPopupMenu();
-    PopupMenu* pMenu = new PopupMenu;
+
+    PopupMenu* pMenu = aAddToDictMB.GetPopupMenu();
+    OSL_ENSURE( pMenu, "svx::SpellDialog::MenuButtonActivateHdl - no PopupMenu!" );
+    pMenu->Clear();
     pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
+
     sal_uInt16 nItemId = 1;     // menu items should be enumerated from 1 and not 0
     for (sal_Int32 i = 0; i < nSize; ++i)
     {
@@ -990,9 +1008,12 @@ void SpellDialog::InitUserDicts()
             ++nItemId;
         }
     }
-    aAddToDictMB.SetPopupMenu(pMenu);
+
     aAddToDictMB.Enable( bEnable );
+
+    return 0;
 }
+
 /*-- 20.10.2003 15:31:06---------------------------------------------------
 
   -----------------------------------------------------------------------*/



Mime
View raw message