moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Bugzilla 52598 - respect slide background when rendering slides in HSLF

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1292267 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2012-02-22 12:59:40 +00:00
parent fcd8ed18e4
commit 93c7050f8c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/documentation/content/xdocs/status.xml
View File

@ -34,6 +34,7 @@
<changes> <changes>
<release version="3.8-beta6" date="2012-??-??"> <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">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">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> <action dev="poi-developers" type="fix">52687 - fixed merging slides with pictures with associated custom tags</action>

5
src/scratchpad/src/org/apache/poi/hslf/model/Slide.java
View File

@ -419,7 +419,9 @@ public final class Slide extends Sheet
public void draw(Graphics2D graphics){ public void draw(Graphics2D graphics){
MasterSheet master = getMasterSheet(); MasterSheet master = getMasterSheet();
if(getFollowMasterBackground()) master.getBackground().draw(graphics); Background bg = getBackground();
if(bg != null)bg.draw(graphics);
if(getFollowMasterObjects()){ if(getFollowMasterObjects()){
Shape[] sh = master.getShapes(); Shape[] sh = master.getShapes();
for (int i = 0; i < sh.length; i++) { for (int i = 0; i < sh.length; i++) {
@ -428,6 +430,7 @@ public final class Slide extends Sheet
sh[i].draw(graphics); sh[i].draw(graphics);
} }
} }
Shape[] sh = getShapes(); Shape[] sh = getShapes();
for (int i = 0; i < sh.length; i++) { for (int i = 0; i < sh.length; i++) {
sh[i].draw(graphics); sh[i].draw(graphics);