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 [32/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...
Date Wed, 27 Jun 2012 13:45:34 GMT
Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/oleobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/oleobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/oleobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/oleobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,30 +23,30 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:helpid="20475"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:helpid="20477"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:helpid="20476"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:helpid="20478"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:helpid="20480"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:helpid="20479"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false" toolbar:helpid="20572"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false" toolbar:helpid="20573"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:helpid="20472"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:helpid="20474"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false" toolbar:helpid="20563"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="10187"/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="10200"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="10201"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapOff"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapOn"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/optimizetablebar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/optimizetablebar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/optimizetablebar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/optimizetablebar.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:DistributeColumns" toolbar:helpid="helpid:20582"  />
- <toolbar:toolbaritem xlink:href=".uno:DistributeRows" toolbar:helpid="helpid:20583"  />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight" toolbar:helpid="helpid:20528"  />
- <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth" toolbar:helpid="helpid:20521"  />
+ <toolbar:toolbaritem xlink:href=".uno:DistributeColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/previewobjectbar.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:toolbaritem xlink:href=".uno:PageUp" toolbar:helpid="20937"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown" toolbar:helpid="20938"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowBookview" toolbar:helpid="helpid:21255"  />
+ <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus" toolbar:helpid="10097"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PreviewZoom" toolbar:helpid="53071"/>
+ <toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/>
+ <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/>
+ <toolbar:toolbaritem xlink:href=".uno:ClosePreview"/>
 </toolbar:toolbar>

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/standardbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/standardbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/standardbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/standardbar.xml Wed Jun 27 13:44:09 2012
@@ -24,41 +24,41 @@
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
  <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="5501"/>
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:helpid="20622"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="5710"/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="5711"/>
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="5712"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="5715"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/>
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="5961"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
- <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
- <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="10000"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
+ <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintPreview"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SpellDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpellOnline"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertDraw"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
+ <toolbar:toolbaritem xlink:href=".uno:Gallery"/>
+ <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlCodes"/>
+ <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" toolbar:helpid="5402"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
 </toolbar:toolbar>

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/starshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/starshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/starshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/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/sw/uiconfig/swxform/toolbar/symbolshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/symbolshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/symbolshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/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/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/tableobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/tableobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/tableobjectbar.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:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330"  />
+ <toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200"  />
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201"  />
+ <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="helpid:10187"  />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185"  toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:style="dropdown"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MergeCells" toolbar:helpid="helpid:20506"  />
- <toolbar:toolbaritem xlink:href=".uno:SplitCell" toolbar:helpid="helpid:20505"  />
- <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:helpid="helpid:20510"  toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:MergeCells"/>
+ <toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
+ <toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:style="dropdown"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:helpid="helpid:20585"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:helpid="helpid:20586"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:helpid="helpid:20587"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRows" toolbar:helpid="helpid:20501"  />
- <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:20502"  />
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:20503"  />
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:20504"  />
+ <toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:helpid="helpid:20515"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:helpid="helpid:20514"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:helpid="helpid:20513"  toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat" toolbar:helpid="helpid:20595"  />
- <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:helpid="helpid:20459"  />
+ <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/>
+ <toolbar:toolbaritem xlink:href=".uno:TableDialog"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableSort" toolbar:helpid="helpid:20533"  />
+ <toolbar:toolbaritem xlink:href=".uno:TableSort"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoSum" toolbar:helpid="helpid:20595"  />
+ <toolbar:toolbaritem xlink:href=".uno:AutoSum"/>
 </toolbar:toolbar>

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/textobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/textobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/textobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/textobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,44 +23,44 @@
 
 
 <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:DesignerDialog" toolbar:helpid="5539"/>
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="helpid:5552" />
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="helpid:10007" />
+ <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:helpid="helpid:10015" />
+ <toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:helpid="helpid:10009" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:helpid="helpid:10008" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:helpid="helpid:10014" />
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:helpid="helpid:20411"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:helpid="helpid:20412"  toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="helpid:10028"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="helpid:10030"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:helpid="helpid:10029"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031"  toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:helpid="helpid:10950"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:helpid="helpid:10951"  toolbar:style="radio" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:helpid="helpid:10034"  toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:helpid="helpid:10035"  toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:helpid="helpid:10036"  toolbar:style="radio" toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="helpid:20144" />
- <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="helpid:20138" />
- <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" toolbar:helpid="helpid:10461" />
- <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" toolbar:helpid="helpid:10462" />
- <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:helpid="helpid:20403"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:helpid="helpid:20404"  toolbar:visible="false" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:helpid="helpid:10017"  toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:helpid="helpid:10489"  toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:helpid="helpid:10185"  toolbar:style="dropdown" />
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:helpid="helpid:5723"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="helpid:10296"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="helpid:10297"  toolbar:visible="false" />
+ <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:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false"/>
+ <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:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering"/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultBullet"/>
+ <toolbar:toolbaritem xlink:href=".uno:DecrementIndent"/>
+ <toolbar:toolbaritem xlink:href=".uno:IncrementIndent"/>
+ <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:style="dropdown"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:visible="false"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/toolbar.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:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:helpid="52822"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCtrl"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShadowCursor" toolbar:helpid="22204"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShadowCursor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
- <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="20603"/>
+ <toolbar:toolbaritem xlink:href=".uno:Hyphenate"/>
+ <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
- <toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
+ <toolbar:toolbaritem xlink:href=".uno:Graphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:BrowseView"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/viewerbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/viewerbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/viewerbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/swxform/toolbar/viewerbar.xml Wed Jun 27 13:44:09 2012
@@ -23,18 +23,18 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502"  />
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312"  />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331"  />
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674"  />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509"  />
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711"  />
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961"  />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366"  />
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000"  />
+ <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sysui/desktop/productversion.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sysui/desktop/productversion.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/sysui/desktop/productversion.mk Wed Jun 27 13:44:09 2012
@@ -46,7 +46,7 @@ PRODUCTLIST = openoffice.org
 # default values to minimize maintainance effort
 
 # CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 3.4
+PRODUCTVERSION = 3.5
 
 # CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
 PRODUCTVERSIONSHORT = 3

Modified: incubator/ooo/branches/alg/aw080/main/toolkit/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/toolkit/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/toolkit/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/toolkit/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/toolkit/source/awt/animatedimagespeer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/toolkit/source/awt/animatedimagespeer.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/toolkit/source/awt/animatedimagespeer.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/toolkit/source/awt/animatedimagespeer.cxx Wed Jun 27 13:44:09 2012
@@ -111,28 +111,7 @@ namespace toolkit
 	//==================================================================================================================
     namespace
     {
-	    //--------------------------------------------------------------------------------------------------------------
-        ::rtl::OUString lcl_getHighContrastURL( ::rtl::OUString const& i_imageURL )
-        {
-            INetURLObject aURL( i_imageURL );
-            if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE )
-            {
-                OSL_VERIFY( aURL.insertName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hicontrast" ) ), false, 0 ) );
-                return aURL.GetMainURL( INetURLObject::NO_DECODE );
-            }
-            // the private: scheme is not considered to be hierarchical by INetURLObject, so manually insert the
-            // segment
-            const sal_Int32 separatorPos = i_imageURL.indexOf( '/' );
-            ENSURE_OR_RETURN( separatorPos != -1, "lcl_getHighContrastURL: unsipported URL scheme - cannot automatically determine HC version!", i_imageURL );
-
-            ::rtl::OUStringBuffer composer;
-            composer.append( i_imageURL.copy( 0, separatorPos ) );
-            composer.appendAscii( "/hicontrast" );
-            composer.append( i_imageURL.copy( separatorPos ) );
-            return composer.makeStringAndClear();
-        }
-
-	    //--------------------------------------------------------------------------------------------------------------
+        //--------------------------------------------------------------------------------------------------------------
         bool lcl_ensureImage_throw( Reference< XGraphicProvider > const& i_graphicProvider, const bool i_isHighContrast, const CachedImage& i_cachedImage )
         {
             if ( !i_cachedImage.xGraphic.is() )
@@ -141,8 +120,22 @@ namespace toolkit
                 if ( i_isHighContrast )
                 {
                     // try (to find) the high-contrast version of the graphic first
-                    aMediaProperties.put( "URL", lcl_getHighContrastURL( i_cachedImage.sImageURL ) );
-                    i_cachedImage.xGraphic.set( i_graphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ), UNO_QUERY );
+                    INetURLObject aURL( i_cachedImage.sImageURL );
+                    if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE )
+                    {
+                        rtl::OUString sURL( i_cachedImage.sImageURL );
+                        const sal_Int32 separatorPos = sURL.lastIndexOf( '/' );
+                        if ( separatorPos != -1 )
+                        {
+                            ::rtl::OUStringBuffer composer;
+                            composer.append( sURL.copy( 0, separatorPos ) );
+                            composer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "/hicontrast" ) );
+                            composer.append( sURL.copy( separatorPos ) );
+
+                            aMediaProperties.put( "URL", composer.makeStringAndClear() );
+                            i_cachedImage.xGraphic.set( i_graphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ), UNO_QUERY );
+                        }
+                    }
                 }
                 if ( !i_cachedImage.xGraphic.is() )
                 {

Modified: incubator/ooo/branches/alg/aw080/main/tools/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/tools/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/tools/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/tools/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/ucb/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/prj/build.lst?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/prj/build.lst (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/prj/build.lst Wed Jun 27 13:44:09 2012
@@ -1,4 +1,4 @@
-uc ucb : cppuhelper CURL:curl OPENSSL:openssl LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper serf tools NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper SERF:serf tools NULL
 uc	ucb							usr1	-	all	uc_mkout NULL
 uc	ucb\inc					    nmake	-	all	uc_inc NULL
 uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/gvfs/gvfs_content.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/gvfs/gvfs_content.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/gvfs/gvfs_content.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/gvfs/gvfs_content.hxx Wed Jun 27 13:44:09 2012
@@ -30,7 +30,7 @@
 #include <com/sun/star/ucb/XContentCreator.hpp>
 #include <ucbhelper/contenthelper.hxx>
 
-#include <glib/gthread.h>
+#include <glib.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-directory.h>
 

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/AprEnv.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/AprEnv.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/AprEnv.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/AprEnv.hxx Wed Jun 27 13:44:09 2012
@@ -23,11 +23,7 @@
 #ifndef INCLUDED_APRENV_HXX
 #define INCLUDED_APRENV_HXX
 
-#ifdef OS2 // use system apr headers
 #include <apr_pools.h>
-#else
-#include <apr/apr_pools.h>
-#endif
 
 namespace apr_environment
 {

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfCallbacks.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfCallbacks.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfCallbacks.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfCallbacks.cxx Wed Jun 27 13:44:09 2012
@@ -64,8 +64,9 @@ extern "C" apr_status_t Serf_Credentials
 extern "C" apr_status_t Serf_CertificateChainValidation(
     void* pSerfSession,
     int nFailures,
-    const char** pCertificateChainBase64Encoded,
-    int nCertificateChainLength)
+    int nErrorCode,
+    const serf_ssl_certificate_t * const * pCertificateChainBase64Encoded,
+    apr_size_t nCertificateChainLength)
 {
     return static_cast<SerfSession*>(pSerfSession)
         ->verifySerfCertificateChain(nFailures, pCertificateChainBase64Encoded, nCertificateChainLength);

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfCallbacks.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfCallbacks.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfCallbacks.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfCallbacks.hxx Wed Jun 27 13:44:09 2012
@@ -43,8 +43,9 @@ extern "C" apr_status_t Serf_Credentials
 extern "C" apr_status_t Serf_CertificateChainValidation(
     void* pSerfSession,
     int nFailures,
-    const char** pCertificateChainBase64Encoded,
-    int nCertificateChainLength);
+    int error_depth,
+    const serf_ssl_certificate_t * const * pCertificateChainBase64Encoded,
+    apr_size_t nCertificateChainLength);
 
 extern "C" apr_status_t Serf_SetupRequest( serf_request_t *request,
                                            void *setup_baton,

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx Wed Jun 27 13:44:09 2012
@@ -78,10 +78,6 @@ serf_bucket_t * SerfPostReqProcImpl::cre
     if ( mpPostData != 0 && mnPostDataLen > 0 )
     {
         body_bkt = SERF_BUCKET_SIMPLE_STRING_LEN( mpPostData, mnPostDataLen, pSerfBucketAlloc );
-        if ( useChunkedEncoding() )
-        {
-            body_bkt = serf_bucket_chunk_create( body_bkt, pSerfBucketAlloc );
-        }
     }
 
     // create serf request
@@ -90,6 +86,7 @@ serf_bucket_t * SerfPostReqProcImpl::cre
                                                                  getPathStr(),
                                                                  body_bkt,
                                                                  serf_request_get_alloc( inSerfRequest ) );
+    handleChunkedEncoding(req_bkt, mnPostDataLen);
 
     // set request header fields
     serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt );
@@ -97,15 +94,6 @@ serf_bucket_t * SerfPostReqProcImpl::cre
     setRequestHeaders( hdrs_bkt );
 
     // request specific header fields
-    if ( body_bkt != 0 )
-    {
-        if ( useChunkedEncoding() )
-        {
-            serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked");
-        }
-        serf_bucket_headers_set( hdrs_bkt, "Content-Length", 
-                                 rtl::OUStringToOString( rtl::OUString::valueOf( (sal_Int32)mnPostDataLen ), RTL_TEXTENCODING_UTF8 ) );
-    }
     if ( mpContentType != 0 )
     {
         serf_bucket_headers_set( hdrs_bkt, "Content-Type", mpContentType );

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx Wed Jun 27 13:44:09 2012
@@ -138,10 +138,6 @@ serf_bucket_t * SerfPropFindReqProcImpl:
                     rtl::OUString::createFromAscii( PROPFIND_TRAILER );
         body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), 
                                               pSerfBucketAlloc );
-        if ( useChunkedEncoding() )
-        {
-            body_bkt = serf_bucket_chunk_create( body_bkt, pSerfBucketAlloc );
-        }
     }
 
     // create serf request
@@ -150,23 +146,25 @@ serf_bucket_t * SerfPropFindReqProcImpl:
                                                                  getPathStr(),
                                                                  body_bkt,
                                                                  pSerfBucketAlloc );
+    handleChunkedEncoding(req_bkt, aBodyText.getLength());
 
     // set request header fields
     serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt );
-    // general header fields provided by caller
-    setRequestHeaders( hdrs_bkt );
-
-    // request specific header fields
-    serf_bucket_headers_set( hdrs_bkt, "Depth", mDepthStr );
-    if ( body_bkt != 0 && aBodyText.getLength() > 0 )
+    if (hdrs_bkt != NULL)
     {
-        if ( useChunkedEncoding() )
+        // general header fields provided by caller
+        setRequestHeaders( hdrs_bkt );
+
+        // request specific header fields
+        serf_bucket_headers_set( hdrs_bkt, "Depth", mDepthStr );
+        if (hdrs_bkt!=NULL && body_bkt != 0 && aBodyText.getLength() > 0 )
         {
-            serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked");
+            serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" );
         }
-        serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" );
-        serf_bucket_headers_set( hdrs_bkt, "Content-Length", 
-                                 rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) );
+    }
+    else
+    {
+        OSL_ASSERT("Headers Bucket missing");
     }
 
     return req_bkt;

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx Wed Jun 27 13:44:09 2012
@@ -135,10 +135,6 @@ serf_bucket_t * SerfPropPatchReqProcImpl
 
             body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), 
                                                   pSerfBucketAlloc );
-            if ( useChunkedEncoding() )
-            {
-                body_bkt = serf_bucket_chunk_create( body_bkt, pSerfBucketAlloc );
-            }
         }
     }
 
@@ -148,22 +144,24 @@ serf_bucket_t * SerfPropPatchReqProcImpl
                                                                  getPathStr(),
                                                                  body_bkt,
                                                                  pSerfBucketAlloc ) ;
+    handleChunkedEncoding(req_bkt, aBodyText.getLength());
 
     // set request header fields
     serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt );
-    // general header fields provided by caller
-    setRequestHeaders( hdrs_bkt );
-
-    // request specific header fields
-    if ( body_bkt != 0 && aBodyText.getLength() > 0 )
+    if (hdrs_bkt != NULL)
     {
-        if ( useChunkedEncoding() )
+        // general header fields provided by caller
+        setRequestHeaders( hdrs_bkt );
+        
+        // request specific header fields
+        if ( body_bkt != 0 && aBodyText.getLength() > 0 )
         {
-            serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked");
+            serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" );
         }
-        serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" );
-        serf_bucket_headers_set( hdrs_bkt, "Content-Length", 
-                                 rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) );
+    }
+    else
+    {
+        OSL_ASSERT("Headers Bucket missing");
     }
 
     return req_bkt;

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx Wed Jun 27 13:44:09 2012
@@ -54,10 +54,6 @@ serf_bucket_t * SerfPutReqProcImpl::crea
     if ( mpData != 0 && mnDataLen > 0 )
     {
         body_bkt = SERF_BUCKET_SIMPLE_STRING_LEN( mpData, mnDataLen, pSerfBucketAlloc );
-        if ( useChunkedEncoding() )
-        {
-            body_bkt = serf_bucket_chunk_create( body_bkt, pSerfBucketAlloc );
-        }
     }
 
     // create serf request
@@ -66,23 +62,7 @@ serf_bucket_t * SerfPutReqProcImpl::crea
                                                                  getPathStr(),
                                                                  body_bkt,
                                                                  serf_request_get_alloc( inSerfRequest ) );
-
-    // set request header fields
-    serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt );
-    // general header fields provided by caller
-    setRequestHeaders( hdrs_bkt );
-
-    // request specific header fields
-    if ( body_bkt != 0 )
-    {
-        if ( useChunkedEncoding() )
-        {
-            serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked");
-        }
-        serf_bucket_headers_set( hdrs_bkt, "Content-Length", 
-                                 rtl::OUStringToOString( rtl::OUString::valueOf( (sal_Int32)mnDataLen ), RTL_TEXTENCODING_UTF8 ) );
-    }
-
+    handleChunkedEncoding(req_bkt, mnDataLen);
 
     return req_bkt;
 }

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx Wed Jun 27 13:44:09 2012
@@ -21,6 +21,14 @@
 
 #include <SerfRequestProcessorImpl.hxx>
 
+namespace
+{
+// Define a magic value that is used by serf to reset chunked
+// encoding.  The value definition is not supported by serf, hence the
+// definition here.
+static const apr_int64_t SERF_UNKNOWN_LENGTH (-1);
+}
+
 namespace http_dav_ucp
 {
 
@@ -51,6 +59,27 @@ const bool SerfRequestProcessorImpl::use
     return mbUseChunkedEncoding;
 }
 
+
+void SerfRequestProcessorImpl::handleChunkedEncoding (
+    serf_bucket_t* pRequestBucket,
+    apr_int64_t nLength) const
+{
+    if (pRequestBucket != NULL)
+    {
+        if (useChunkedEncoding())
+        {
+            // Activate chunked encoding.
+            serf_bucket_request_set_CL(pRequestBucket, SERF_UNKNOWN_LENGTH);
+        }
+        else
+        {
+            // Deactivate chunked encoding by setting the length.
+            serf_bucket_request_set_CL(pRequestBucket, nLength);
+        }
+    }
+}
+
+
 void SerfRequestProcessorImpl::setRequestHeaders( serf_bucket_t* inoutSerfHeaderBucket )
 {
     DAVRequestHeaders::const_iterator aHeaderIter( mrRequestHeaders.begin() );

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx Wed Jun 27 13:44:09 2012
@@ -49,6 +49,13 @@ public:
 
     void activateChunkedEncoding();
 
+    /** Turn chunked encoding on or off, dependeing on the result of
+        useChunkedEncoding().
+    */
+    void handleChunkedEncoding (
+        serf_bucket_t* pRequestBucket,
+        apr_int64_t nLength) const;
+
 protected:
     void setRequestHeaders( serf_bucket_t* inoutSerfHeaderBucket );
 

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfSession.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfSession.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfSession.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfSession.cxx Wed Jun 27 13:44:09 2012
@@ -162,7 +162,7 @@ void SerfSession::Init()
         if ( m_aProxyName.getLength() )
         {
             apr_sockaddr_t *proxy_address = NULL;
-            const apr_status_t status = apr_sockaddr_info_get( &proxy_address, 
+            status = apr_sockaddr_info_get( &proxy_address, 
                                                                rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), 
                                                                APR_UNSPEC,
                                                                static_cast<apr_port_t>(m_nProxyPort), 
@@ -269,6 +269,7 @@ apr_status_t SerfSession::setupSerfConne
         */
         serf_ssl_server_cert_chain_callback_set(
             serf_bucket_ssl_decrypt_context_get(tmpInputBkt),
+            NULL,
             Serf_CertificateChainValidation,
             this);
         serf_ssl_set_hostname( serf_bucket_ssl_decrypt_context_get( tmpInputBkt ), 
@@ -367,7 +368,7 @@ namespace {
 
 apr_status_t SerfSession::verifySerfCertificateChain (
     int,
-    const char** pCertificateChainBase64Encoded,
+    const serf_ssl_certificate_t * const * pCertificateChainBase64Encoded,
     int nCertificateChainLength)
 {
     // Check arguments.
@@ -414,9 +415,13 @@ apr_status_t SerfSession::verifySerfCert
     }
 
     // Decode the server certificate.
+    const char* sBase64EncodedServerCertificate (
+        serf_ssl_cert_export(
+            pCertificateChainBase64Encoded[0],
+            getAprPool()));
     uno::Reference< security::XCertificate > xServerCertificate(
         xSecurityEnv->createCertificateFromAscii(
-            rtl::OUString::createFromAscii(pCertificateChainBase64Encoded[0])));
+            rtl::OUString::createFromAscii(sBase64EncodedServerCertificate)));
     if ( ! xServerCertificate.is())
         return SERF_SSL_CERT_UNKNOWN_FAILURE;
 
@@ -455,11 +460,15 @@ apr_status_t SerfSession::verifySerfCert
     // done outside the isDomainMatch() block because the result is
     // used by the interaction handler.
     std::vector< uno::Reference< security::XCertificate > > aChain;
-    for (int nIndex=1; nIndex<nCertificateChainLength; ++nIndex)
+    for (nIndex=1; nIndex<nCertificateChainLength; ++nIndex)
     {
+        const char* sBase64EncodedCertificate (
+            serf_ssl_cert_export(
+                pCertificateChainBase64Encoded[nIndex],
+                getAprPool()));
         uno::Reference< security::XCertificate > xCertificate(
             xSecurityEnv->createCertificateFromAscii(
-                rtl::OUString::createFromAscii(pCertificateChainBase64Encoded[nIndex])));
+                rtl::OUString::createFromAscii(sBase64EncodedCertificate)));
         if ( ! xCertificate.is())
             return SERF_SSL_CERT_UNKNOWN_FAILURE;
         aChain.push_back(xCertificate);

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfSession.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfSession.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfSession.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfSession.hxx Wed Jun 27 13:44:09 2012
@@ -99,7 +99,7 @@ public:
 
     apr_status_t verifySerfCertificateChain (
         int nFailures,
-        const char** pCertificateChainBase64Encoded,
+        const serf_ssl_certificate_t * const * pCertificateChainBase64Encoded,
         int nCertificateChainLength);
 
     serf_bucket_t* acceptSerfResponse( serf_request_t * inSerfRequest,

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfUri.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfUri.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfUri.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/SerfUri.hxx Wed Jun 27 13:44:09 2012
@@ -23,11 +23,7 @@
 #ifndef INCLUDED_SERFURI_HXX
 #define INCLUDED_SERFURI_HXX
 
-#ifdef OS2 // use system apr headers
 #include <apr_uri.h>
-#else
-#include <apr-util/apr_uri.h>
-#endif
 #include <rtl/ustring.hxx>
 #include <DAVException.hxx>
 

Modified: incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/ucb/source/ucp/webdav/makefile.mk Wed Jun 27 13:44:09 2012
@@ -48,18 +48,6 @@ APRINCDIR=apr
 APRUTILINCDIR=apr-util
 SERFINCDIR=serf
 
-#.IF "$(SYSTEM_APR)" != "YES"
-#.INCLUDE: $(SOLARINCDIR)$/$(APRINCDIR)$/version.mk
-#.ENDIF
-#.IF "$(SYSTEM_APRUTIL)" != "YES"
-#.INCLUDE: $(SOLARINCDIR)$/$(APRUTILINCDIR)$/version.mk
-#.ENDIF
-#.IF "$(SYSTEM_SERF)" != "YES"
-#.INCLUDE: $(SOLARINCDIR)$/$(SERFINCDIR)$/version.mk
-#.ENDIF
-
-#CFLAGS+= -DAPR_VERSION=0x$(APR_VERSION) -DAPRUTIL_VERSION=0x$(APRUTIL_VERSION) -DSERF_VERSION=0x$(SERF_VERSION)
-
 #
 # Extend the list of include paths depending on whether we use locally built
 # or system versions of libraries apr, apr-util, serf, libxml
@@ -69,20 +57,26 @@ SERFINCDIR=serf
 
 .IF "$(SYSTEM_APR)" == "YES"
 CFLAGS+= $(APR_CFLAGS)
+SHL1STDLIBS+=$(APR_LIBS)
 .ELSE
 CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR)
+SHL1STDLIBS+=$(INTERNAL_APR_LIBS)
 .ENDIF
 
 .IF "$(SYSTEM_APRUTIL)" == "YES"
 CFLAGS+= $(APRUTIL_CFLAGS)
+SHL1STDLIBS+=$(APRUTIL_LIBS)
 .ELSE
 CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR)
+SHL1STDLIBS+=$(INTERNAL_APRUTIL_LIBS)
 .ENDIF
 
 .IF "$(SYSTEM_SERF)" == "YES"
 CFLAGS+= $(SERF_CFLAGS)
+SHL1STDLIBS+=$(SERF_LIBS)
 .ELSE
 CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR)
+SHL1STDLIBS+=$(INTERNAL_SERF_LIBS)
 .ENDIF
 
 .IF "$(SYSTEM_LIBXML)" == "YES"
@@ -94,6 +88,9 @@ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDI
 
 .IF "$(SYSTEM_OPENSSL)" == "YES"
 CFLAGS+= -I$(OPENSSL_CFLAGS)
+SHL1STDLIBS+= $(OPENSSLLIB)
+.ELSE
+SHL1STDLIBS+= $(OPENSSLLIBST)
 .ENDIF
 
 # --- General -----------------------------------------------------
@@ -141,14 +138,13 @@ SHL1IMPLIB=i$(TARGET)
 
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
-SHL1STDLIBS=\
+SHL1STDLIBS+=\
         $(CPPUHELPERLIB) \
         $(CPPULIB)       \
         $(SALLIB)        \
         $(SALHELPERLIB)  \
         $(UCBHELPERLIB)  \
         $(COMPHELPERLIB) \
-		$(SERFLIBS)      \
         $(LIBXML2LIB)
 
 .IF "$(GUI)"=="WNT"
@@ -156,16 +152,10 @@ SHL1STDLIBS+= $(WSOCK32LIB)
 .IF "$(WINDOWS_VISTA_PSDK)" != ""
 SHL1STDLIBS+= $(WS2_32LIB)
 .ENDIF
-SHL1STDLIBS+= $(OPENSSLLIB)
 .ELSE # WNT
 .IF "$(OS)"=="SOLARIS"
 SHL1STDLIBS+= -lnsl -lsocket -ldl
 .ENDIF # SOLARIS
-.IF "$(SYSTEM_OPENSSL)"=="YES"
-SHL1STDLIBS+= $(OPENSSLLIB)
-.ELSE
-SHL1STDLIBS+= $(OPENSSLLIBST)
-.ENDIF
 .ENDIF # WNT
 
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def

Modified: incubator/ooo/branches/alg/aw080/main/unoxml/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/unoxml/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/unoxml/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/unoxml/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)
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)

Modified: incubator/ooo/branches/alg/aw080/main/vbahelper/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vbahelper/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vbahelper/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/vbahelper/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/vcl/AllLangResTarget_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/AllLangResTarget_vcl.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/AllLangResTarget_vcl.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/AllLangResTarget_vcl.mk Wed Jun 27 13:44:09 2012
@@ -43,6 +43,7 @@ $(eval $(call gb_SrsTarget_add_files,vcl
     vcl/source/src/menu.src \
     vcl/source/src/print.src \
     vcl/source/src/stdtext.src \
+    vcl/source/src/throbber.src \
     vcl/source/src/units.src \
 ))
 

Modified: incubator/ooo/branches/alg/aw080/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/Library_vcl.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/Library_vcl.mk Wed Jun 27 13:44:09 2012
@@ -27,6 +27,8 @@ ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
 else ifeq ($(OS),WNT)
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
+else ifeq ($(OS),OS2)
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
 else
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
 endif

Modified: incubator/ooo/branches/alg/aw080/main/vcl/Library_vclplug_gen.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/Library_vclplug_gen.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/Library_vclplug_gen.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/Library_vclplug_gen.mk Wed Jun 27 13:44:09 2012
@@ -144,6 +144,7 @@ ifneq ($(OS),SOLARIS)
 # not Solaris
 $(eval $(call gb_Library_set_defs,vclplug_gen,\
 	$$(DEFS) \
+	-DUSE_XINERAMA \
 	-DUSE_XINERAMA_XORG \
 ))
 ifeq ($(XINERAMA_LINK),dynamic)
@@ -161,6 +162,7 @@ else
 # Solaris
 $(eval $(call gb_Library_set_defs,vclplug_gen,\
 	$$(DEFS) \
+	-DUSE_XINERAMA \
 	-DUSE_XINERAMA_XSUN \
 ))
 ifeq ($(USE_XINERAMA_VERSION),Xorg)
@@ -202,4 +204,9 @@ $(eval $(call gb_Library_add_external_li
 	Xinerama Xrandr					\
 ))
 endif
+ifeq ($(OS),FREEBSD)
+$(eval $(call gb_Library_add_external_libs,vclplug_gen,	\
+	Xinerama Xrandr					\
+))
+endif
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/alg/aw080/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx Wed Jun 27 13:44:09 2012
@@ -537,8 +537,8 @@ DataFlavor DataFlavorMapper::systemToOpe
 	{
 	  if ([systemDataFlavor caseInsensitiveCompare: flavorMap[i].SystemFlavor] == NSOrderedSame)
 		{
-		  oOOFlavor.MimeType = OUString::createFromAscii(flavorMap[i].OOoFlavor);
-		  oOOFlavor.HumanPresentableName = OUString(RTL_CONSTASCII_USTRINGPARAM(flavorMap[i].HumanPresentableName));
+		  oOOFlavor.MimeType = OUString::createFromAscii( flavorMap[i].OOoFlavor);
+		  oOOFlavor.HumanPresentableName = OUString::createFromAscii( flavorMap[i].HumanPresentableName);
 		  oOOFlavor.DataType = flavorMap[i].DataType;
 		  return oOOFlavor;
 		}

Modified: incubator/ooo/branches/alg/aw080/main/vcl/inc/svids.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/inc/svids.hrc?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/inc/svids.hrc (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/inc/svids.hrc Wed Jun 27 13:44:09 2012
@@ -251,6 +251,9 @@
 #define SV_ICON_ID_MACRO                       17
 #define SV_ICON_ID_PRINTERADMIN               501
 
+#define SV_RESID_BITMAP_THROBBER_START       3000
+#define SV_RESID_BITMAP_THROBBER_END         3060
+
 #define HID_PRINTDLG                        HID_VCL_START
 
 #endif	// _SV_SVIDS_HRC

Modified: incubator/ooo/branches/alg/aw080/main/vcl/inc/unx/saldisp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/inc/unx/saldisp.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/inc/unx/saldisp.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/inc/unx/saldisp.hxx Wed Jun 27 13:44:09 2012
@@ -203,7 +203,6 @@ public:
 
 // -=-= SalXLib =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 typedef int(*YieldFunc)(int fd, void* data);
-struct YieldEntry;
 
 class VCLPLUG_GEN_PUBLIC SalXLib
 {
@@ -217,7 +216,6 @@ protected:
     int				nFDs_;
     fd_set	        aReadFDS_;
     fd_set	        aExceptionFDS_;
-    YieldEntry		*pYieldEntries_;
 
     
     struct XErrorStackEntry

Modified: incubator/ooo/branches/alg/aw080/main/vcl/inc/vcl/print.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/inc/vcl/print.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/inc/vcl/print.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/inc/vcl/print.hxx Wed Jun 27 13:44:09 2012
@@ -514,6 +514,10 @@ public:
     
     void abortJob();
     
+    // applications (well, sw) depend on a page request with "IsLastPage" = true
+    // to free resources, else they (well, sw) will crash eventually
+    void triggerAppToFreeResources();
+
     bool isShowDialogs() const;
     bool isDirectPrint() const;
     

Modified: incubator/ooo/branches/alg/aw080/main/vcl/inc/window.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/inc/window.h?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/inc/window.h (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/inc/window.h Wed Jun 27 13:44:09 2012
@@ -233,7 +233,7 @@ enum AlwaysInputMode { AlwaysInputNone =
 class WindowImpl
 {
 public:
-    WindowImpl();
+    WindowImpl( WindowType );
     ~WindowImpl();
 
     ImplWinData*        mpWinData;

Modified: incubator/ooo/branches/alg/aw080/main/vcl/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/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)
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/control/throbber.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/control/throbber.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/control/throbber.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/control/throbber.cxx Wed Jun 27 13:44:09 2012
@@ -88,28 +88,6 @@ Throbber::~Throbber()
 //----------------------------------------------------------------------------------------------------------------------
 namespace
 {
-    //..................................................................................................................
-    ::rtl::OUString lcl_getHighContrastURL( ::rtl::OUString const& i_imageURL )
-    {
-        INetURLObject aURL( i_imageURL );
-        if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE )
-        {
-            OSL_VERIFY( aURL.insertName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hicontrast" ) ), false, 0 ) );
-            return aURL.GetMainURL( INetURLObject::NO_DECODE );
-        }
-        // the private: scheme is not considered to be hierarchical by INetURLObject, so manually insert the
-        // segment
-        const sal_Int32 separatorPos = i_imageURL.indexOf( '/' );
-        ENSURE_OR_RETURN( separatorPos != -1, "lcl_getHighContrastURL: unsipported URL scheme - cannot automatically determine HC version!", i_imageURL );
-
-        ::rtl::OUStringBuffer composer;
-        composer.append( i_imageURL.copy( 0, separatorPos ) );
-        composer.appendAscii( "/hicontrast" );
-        composer.append( i_imageURL.copy( separatorPos ) );
-        return composer.makeStringAndClear();
-    }
-
-    //..................................................................................................................
     ::std::vector< Image > lcl_loadImageSet( const Throbber::ImageSet i_imageSet, const bool i_isHiContrast )
     {
         ::std::vector< Image > aImages;
@@ -130,8 +108,21 @@ namespace
             Reference< XGraphic > xGraphic;
             if ( i_isHiContrast )
             {
-                aMediaProperties.put( "URL", lcl_getHighContrastURL( *imageURL ) );
-                xGraphic.set( xGraphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ), UNO_QUERY );
+                INetURLObject aURL( *imageURL );
+                if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE )
+                {
+                    const sal_Int32 separatorPos = imageURL->lastIndexOf( '/' );
+                    if ( separatorPos != -1 )
+                    {
+                        ::rtl::OUStringBuffer composer;
+                        composer.append( imageURL->copy( 0, separatorPos ) );
+                        composer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "/hicontrast" ) );
+                        composer.append( imageURL->copy( separatorPos ) );
+
+                        aMediaProperties.put( "URL", composer.makeStringAndClear() );
+                        xGraphic.set( xGraphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ), UNO_QUERY );
+                    }
+                }
             }
             if ( !xGraphic.is() )
             {
@@ -279,7 +270,7 @@ void Throbber::setImageList( const Seque
     for ( size_t i=0; i<nImageCounts[index]; ++i )
     {
         ::rtl::OUStringBuffer aURL;
-        aURL.appendAscii( "private:graphicrepository/shared/spinner-" );
+        aURL.appendAscii( "private:graphicrepository/vcl/res/spinner-" );
         aURL.appendAscii( pResolutions[index] );
         aURL.appendAscii( "-" );
         if ( i < 9 )

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/fontsubset/cff.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/fontsubset/cff.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/fontsubset/cff.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/fontsubset/cff.cxx Wed Jun 27 13:44:09 2012
@@ -1889,20 +1889,20 @@ public:
 	void		emitAllRaw( void);
 	void		emitAllHex( void);
 	void		emitAllCrypted( void);
-	int			tellPos( void) const;
+	int		tellPos( void) const;
 	void		updateLen( int nTellPos, int nLength);
 	void		emitValVector( const char* pLineHead, const char* pLineTail, const ValVector&);
 private:
 	FILE*		mpFileOut;
 	bool		mbCloseOutfile;
 	char		maBuffer[MAX_T1OPS_SIZE];	// TODO: dynamic allocation
-	int			mnEECryptR;
+	int		mnEECryptR;
 public:
 	char*		mpPtr;
 
 	char		maSubsetName[256];
 	bool		mbPfbSubset;
-	int			mnHexLineCol;
+	int		mnHexLineCol;
 };
 
 // --------------------------------------------------------------------
@@ -1971,10 +1971,11 @@ void Type1Emitter::updateLen( int nTellP
 	cData[1] = static_cast<U8>(nLength >>  8);
 	cData[2] = static_cast<U8>(nLength >> 16);
 	cData[3] = static_cast<U8>(nLength >> 24);
-	const int nCurrPos = ftell( mpFileOut);
+	const long nCurrPos = ftell( mpFileOut);
 	fseek( mpFileOut, nTellPos, SEEK_SET);
 	fwrite( cData, 1, sizeof(cData), mpFileOut);
-	fseek( mpFileOut, nCurrPos, SEEK_SET);
+	if( nCurrPos >= 0)
+		fseek( mpFileOut, nCurrPos, SEEK_SET);
 }
 
 // --------------------------------------------------------------------
@@ -2317,6 +2318,8 @@ bool CffSubsetterContext::emitAsType1( T
 		assert( (nGlyphId >= 0) && (nGlyphId < mnCharStrCount));
 		// get privdict context matching to the glyph
 		const int nFDSelect = getFDSelect( nGlyphId);
+		if( nFDSelect < 0)
+			continue;
 		mpCffLocal = &maCffLocal[ nFDSelect];
 		// convert the Type2op charstring to its Type1op counterpart
 		const int nT2Len = seekIndexData( mnCharStrBase, nGlyphId);

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/gfxlink.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/gfxlink.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/gfxlink.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/gfxlink.cxx Wed Jun 27 13:44:09 2012
@@ -438,6 +438,11 @@ sal_uInt8* ImpSwap::GetData() const
 			pData = new sal_uInt8[ mnDataSize ];
 			pIStm->Read( pData, mnDataSize );
 			sal_Bool bError = ( ERRCODE_NONE != pIStm->GetError() );
+			sal_Size nActReadSize = pIStm->Tell();
+			if (nActReadSize != mnDataSize)
+			{
+				bError = sal_True;
+			}			
 			delete pIStm;
 
 			if( bError )

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/impgraph.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/impgraph.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/impgraph.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/impgraph.cxx Wed Jun 27 13:44:09 2012
@@ -677,7 +677,41 @@ Animation ImpGraphic::ImplGetAnimation()
 
 const GDIMetaFile& ImpGraphic::ImplGetGDIMetaFile() const
 {
-	return maMetaFile;
+    if(GRAPHIC_BITMAP == meType && !maMetaFile.GetActionCount())
+    {
+        // #119735#
+        // Use the local maMetaFile as container for a metafile-representation
+        // of the bitmap graphic. This will be done only once, thus be buffered.
+        // I checked all usages of maMetaFile, it is only used when type is not
+        // GRAPHIC_BITMAP. In operator= it will get copied, thus buffering will
+        // survive copying (change this if not wanted)
+        ImpGraphic* pThat = const_cast< ImpGraphic* >(this);
+
+        if(maSvgData.get() && !maEx)
+        {
+            // use maEx as local buffer for rendered svg
+            pThat->maEx = maSvgData->getReplacement();
+        }
+
+        VirtualDevice aVirDev;
+        const Size aSizePixel(maEx.GetSizePixel());
+
+        pThat->maMetaFile.Record(&aVirDev);
+
+        if(maEx.IsTransparent())
+        {
+            aVirDev.DrawBitmapEx(Point(), maEx);
+        }
+        else
+        {
+            aVirDev.DrawBitmap(Point(), maEx.GetBitmap());
+        }
+
+		pThat->maMetaFile.Stop();
+		pThat->maMetaFile.SetPrefSize(aSizePixel);
+    }
+
+    return maMetaFile;
 }
 
 // ------------------------------------------------------------------------

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/outmap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/outmap.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/outmap.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/outmap.cxx Wed Jun 27 13:44:09 2012
@@ -2212,10 +2212,17 @@ long* OutputDevice::LogicToLogic( long* 
 
 // -----------------------------------------------------------------------
 
+#define CHEKCMAPUNITSFORSTATIC( aMapA, aMapB ) \
+    OSL_ENSURE((MAP_PIXEL == aMapA && MAP_PIXEL != aMapB) && (MAP_PIXEL != aMapA && MAP_PIXEL == aMapB), \
+    "Caution: When using the static LogicToLogic methods to convert between pixels and logic sizes,/n\
+    not the correct system DPI is used, but a DPI of 75 is guessed. To use the correct DPI, use e.g./n\
+    the OutputDevice from Application::GetDefaultDevice() (!)");
+
 Point OutputDevice::LogicToLogic( const Point& rPtSource,
 								  const MapMode& rMapModeSource,
 								  const MapMode& rMapModeDest )
 {
+    CHEKCMAPUNITSFORSTATIC(rMapModeSource.GetMapUnit(), rMapModeDest.GetMapUnit())
 	if ( rMapModeSource == rMapModeDest )
 		return rPtSource;
 
@@ -2252,6 +2259,7 @@ Size OutputDevice::LogicToLogic( const S
 								 const MapMode& rMapModeSource,
 								 const MapMode& rMapModeDest )
 {
+    CHEKCMAPUNITSFORSTATIC(rMapModeSource.GetMapUnit(), rMapModeDest.GetMapUnit())
 	if ( rMapModeSource == rMapModeDest )
 		return rSzSource;
 
@@ -2286,6 +2294,7 @@ basegfx::B2DPolygon OutputDevice::LogicT
                                                 const MapMode& rMapModeSource,
                                                 const MapMode& rMapModeDest )
 {
+    CHEKCMAPUNITSFORSTATIC(rMapModeSource.GetMapUnit(), rMapModeDest.GetMapUnit())
 	if ( rMapModeSource == rMapModeDest )
 		return rPolySource;
 
@@ -2331,6 +2340,7 @@ basegfx::B2DPolyPolygon OutputDevice::Lo
                                                     const MapMode& rMapModeSource,
                                                     const MapMode& rMapModeDest )
 {
+    CHEKCMAPUNITSFORSTATIC(rMapModeSource.GetMapUnit(), rMapModeDest.GetMapUnit())
 	if ( rMapModeSource == rMapModeDest )
 		return rPolySource;
 
@@ -2376,6 +2386,7 @@ Rectangle OutputDevice::LogicToLogic( co
 									  const MapMode& rMapModeSource,
 									  const MapMode& rMapModeDest )
 {
+    CHEKCMAPUNITSFORSTATIC(rMapModeSource.GetMapUnit(), rMapModeDest.GetMapUnit())
 	if ( rMapModeSource == rMapModeDest )
 		return rRectSource;
 
@@ -2424,6 +2435,7 @@ long OutputDevice::LogicToLogic( long nL
 	if ( eUnitSource == eUnitDest )
 		return nLongSource;
 
+    CHEKCMAPUNITSFORSTATIC(eUnitSource, eUnitDest)
 	ENTER2( eUnitSource, eUnitDest );
 	ENTER3( eUnitSource, eUnitDest );
 
@@ -2450,6 +2462,7 @@ basegfx::B2DHomMatrix OutputDevice::GetT
 
 double OutputDevice::GetFactorLogicToLogic(MapUnit eUnitSource, MapUnit eUnitDest)
 {
+    CHEKCMAPUNITSFORSTATIC(eUnitSource, eUnitDest)
 	if ( eUnitSource == eUnitDest )
 		return 1.0;
 

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/print3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/print3.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/print3.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/print3.cxx Wed Jun 27 13:44:09 2012
@@ -499,6 +499,9 @@ void Printer::ImplPrintJob( const boost:
                 pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintCollateAsSingleJobs" ) ),
                                        makeAny( sal_True ) );
             }
+            // applications (well, sw) depend on a page request with "IsLastPage" = true
+            // to free resources, else they (well, sw) will crash eventually
+            i_pController->triggerAppToFreeResources();
         }
         catch( std::bad_alloc& )
         {
@@ -1242,9 +1245,8 @@ void PrinterController::jobFinished( vie
 {
 }
 
-void PrinterController::abortJob()
+void PrinterController::triggerAppToFreeResources()
 {
-    setJobState( view::PrintableState_JOB_ABORTED );
     // applications (well, sw) depend on a page request with "IsLastPage" = true
     // to free resources, else they (well, sw) will crash eventually
     setLastPage( sal_True );
@@ -1254,6 +1256,13 @@ void PrinterController::abortJob()
     getPageFile( 0, aMtf, false );
 }
 
+void PrinterController::abortJob()
+{
+    setJobState( view::PrintableState_JOB_ABORTED );
+
+    triggerAppToFreeResources();
+}
+
 void PrinterController::setLastPage( sal_Bool i_bLastPage )
 {
     mpImplData->mbLastPage = i_bLastPage;

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/sallayout.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/sallayout.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/sallayout.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/sallayout.cxx Wed Jun 27 13:44:09 2012
@@ -1166,7 +1166,7 @@ void GenericSalLayout::ApplyDXArray( Imp
 	}
 
     // calculate adjusted cluster widths
-    sal_Int32* pNewGlyphWidths = (sal_Int32*)alloca( mnGlyphCount * sizeof(long) );
+    sal_Int32* pNewGlyphWidths = (sal_Int32*)alloca( mnGlyphCount * sizeof(sal_Int32) );
     for( i = 0; i < mnGlyphCount; ++i )
         pNewGlyphWidths[ i ] = 0;
 



Mime
View raw message