Bugzilla 52598 - respect slide background when rendering slides in HSLF

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1292267 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index a2bd2f3d0b9fdecfefc837638a2c87696ab247ff..99cb798d002ec048073402a006bef1b88cb5a991 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -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>

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 0e6b0027ddc8feda2fa3bb1f14e4a3d2b153b655..7822d8cd11454a26dd3fe8b81a96d2eb834385aa 100644 (file)
--- 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);