You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2012/02/22 13:59:40 UTC
svn commit: r1292267 - in /poi/trunk/src:
documentation/content/xdocs/status.xml
scratchpad/src/org/apache/poi/hslf/model/Slide.java
Author: yegor
Date: Wed Feb 22 12:59:40 2012
New Revision: 1292267
URL: http://svn.apache.org/viewvc?rev=1292267&view=rev
Log:
Bugzilla 52598 - respect slide background when rendering slides in HSLF
Modified:
poi/trunk/src/documentation/content/xdocs/status.xml
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java
Modified: poi/trunk/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/status.xml?rev=1292267&r1=1292266&r2=1292267&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/status.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/status.xml Wed Feb 22 12:59:40 2012
@@ -34,6 +34,7 @@
<changes>
<release version="3.8-beta6" date="2012-??-??">
+ <action dev="poi-developers" type="fix">52598 - respect slide background when rendering slides in HSLF</action>
<action dev="poi-developers" type="fix">51731 - fixed painting shape outlines in HSLF</action>
<action dev="poi-developers" type="fix">52701 - fixed seting vertical alignment for XSLFTableCell</action>
<action dev="poi-developers" type="fix">52687 - fixed merging slides with pictures with associated custom tags</action>
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java?rev=1292267&r1=1292266&r2=1292267&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java Wed Feb 22 12:59:40 2012
@@ -419,7 +419,9 @@ public final class Slide extends Sheet
public void draw(Graphics2D graphics){
MasterSheet master = getMasterSheet();
- if(getFollowMasterBackground()) master.getBackground().draw(graphics);
+ Background bg = getBackground();
+ if(bg != null)bg.draw(graphics);
+
if(getFollowMasterObjects()){
Shape[] sh = master.getShapes();
for (int i = 0; i < sh.length; i++) {
@@ -428,6 +430,7 @@ public final class Slide extends Sheet
sh[i].draw(graphics);
}
}
+
Shape[] sh = getShapes();
for (int i = 0; i < sh.length; i++) {
sh[i].draw(graphics);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org