diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index a2bd2f3d0b..99cb798d00 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 52598 - respect slide background when rendering slides in HSLF 51731 - fixed painting shape outlines in HSLF 52701 - fixed seting vertical alignment for XSLFTableCell 52687 - fixed merging slides with pictures with associated custom tags diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java b/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java index 0e6b0027dd..7822d8cd11 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java @@ -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);