git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1292267 13f79535-47bb-0310-9956-ffa450edef68tags/REL_3_8_FINAL
@@ -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> |
@@ -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); |