diff options
| author | Yegor Kozlov <yegor@apache.org> | 2012-02-22 12:59:40 +0000 |
|---|---|---|
| committer | Yegor Kozlov <yegor@apache.org> | 2012-02-22 12:59:40 +0000 |
| commit | 299fbffd753b8fbbb30da0dea1cfa2abf6eb6bf9 (patch) | |
| tree | 24ff2ca98a05088d11b5a765585b03bbfc58c513 /src | |
| parent | 0e52ffc7979c0b3e539184636c693db12a812ccd (diff) | |
| download | poi-299fbffd753b8fbbb30da0dea1cfa2abf6eb6bf9.tar.gz poi-299fbffd753b8fbbb30da0dea1cfa2abf6eb6bf9.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/documentation/content/xdocs/status.xml | 1 | ||||
| -rw-r--r-- | src/scratchpad/src/org/apache/poi/hslf/model/Slide.java | 5 |
2 files changed, 5 insertions, 1 deletions
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 @@ <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 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); |