Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

XSLF: do not display Master Slide objects by default 

XSLF: fix alternate content handling for picture shapes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1736935 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2016-03-28 22:52:01 +00:00
parent 1e65636048
commit 57aa67b524
7 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
View File

@ -31,6 +31,7 @@ import org.apache.poi.sl.usermodel.PictureShape;
import org.apache.poi.sl.usermodel.Placeholder;
import org.apache.poi.util.Beta;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.openxmlformats.schemas.drawingml.x2006.main.CTBlip;
import org.openxmlformats.schemas.drawingml.x2006.main.CTBlipFillProperties;
@ -110,7 +111,7 @@ public class XSLFPictureShape extends XSLFSimpleShape
if (rel != null) {
try {
PackagePart imgPart = p.getRelatedPart(rel);
_data = new XSLFPictureData(imgPart, rel);
_data = new XSLFPictureData(imgPart);
}
catch (Exception e) {
throw new POIXMLException(e);
@ -151,9 +152,29 @@ public class XSLFPictureShape extends XSLFSimpleShape
return null;
}
protected CTBlip getBlip(){
protected CTBlipFillProperties getBlipFill() {
CTPicture ct = (CTPicture)getXmlObject();
return ct.getBlipFill().getBlip();
CTBlipFillProperties bfp = ct.getBlipFill();
if (bfp != null) {
return bfp;
}
String xquery =
"declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main'; "
+ "declare namespace mc='http://schemas.openxmlformats.org/markup-compatibility/2006' "
+ ".//mc:Fallback/p:blipFill"
;
XmlObject xo = selectProperty(XmlObject.class, xquery);
try {
xo = CTPicture.Factory.parse(xo.getDomNode());
} catch (XmlException xe) {
return null;
}
return ((CTPicture)xo).getBlipFill();
}
protected CTBlip getBlip(){
return getBlipFill().getBlip();
}
protected String getBlipLink(){
@ -170,8 +191,7 @@ public class XSLFPictureShape extends XSLFSimpleShape
@Override
public Insets getClipping(){
CTPicture ct = (CTPicture)getXmlObject();
CTRelativeRect r = ct.getBlipFill().getSrcRect();
CTRelativeRect r = getBlipFill().getSrcRect();
return (r == null) ? null : new Insets(r.getT(), r.getL(), r.getB(), r.getR());
}
@ -184,7 +204,7 @@ public class XSLFPictureShape extends XSLFSimpleShape
String relId = getSheet().importBlip(blipId, p.getSheet().getPackagePart());
CTPicture ct = (CTPicture)getXmlObject();
CTBlip blip = ct.getBlipFill().getBlip();
CTBlip blip = getBlipFill().getBlip();
blip.setEmbed(relId);
CTApplicationNonVisualDrawingProps nvPr = ct.getNvPicPr().getNvPr();
@ -209,4 +229,4 @@ public class XSLFPictureShape extends XSLFSimpleShape
}
}
}
}

7
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
View File

@ -215,12 +215,9 @@ implements Slide<XSLFShape,XSLFTextParagraph> {
}
}
/**
*
* @return whether shapes on the master slide should be shown or not.
*/
@Override
public boolean getFollowMasterGraphics(){
return !_slide.isSetShowMasterSp() || _slide.getShowMasterSp();
return _slide.isSetShowMasterSp() && _slide.getShowMasterSp();
}
/**

2
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
View File

@ -113,7 +113,7 @@ implements MasterSheet<XSLFShape,XSLFTextParagraph> {
@Override
public boolean getFollowMasterGraphics() {
return !_layout.isSetShowMasterSp() || _layout.getShowMasterSp();
return _layout.isSetShowMasterSp() && _layout.getShowMasterSp();
}
/**

14
src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
View File

@ -18,7 +18,10 @@ package org.apache.poi.xslf;
import static junit.framework.TestCase.assertEquals;
import static org.apache.poi.POITestCase.assertContains;
import static org.junit.Assert.*;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.awt.Color;
import java.awt.Dimension;
@ -36,6 +39,7 @@ import javax.imageio.ImageIO;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLDocumentPart.RelationPart;
import org.apache.poi.sl.usermodel.PaintStyle;
import org.apache.poi.sl.usermodel.PictureData.PictureType;
import org.apache.poi.xslf.usermodel.DrawingParagraph;
import org.apache.poi.xslf.usermodel.DrawingTextBody;
@ -428,4 +432,12 @@ public class TestXSLFBugs {
ppt.removeSlide(1);
assertNotNull(ppt.createSlide());
}
@Test
public void blibFillAlternateContent() throws IOException {
XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("2411-Performance_Up.pptx");
XSLFPictureShape ps = (XSLFPictureShape)ppt.getSlides().get(4).getShapes().get(0);
assertNotNull(ps.getPictureData());
ppt.close();
}
}

2
src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
View File

@ -111,7 +111,7 @@ public class TestXSLFSlide {
assertEquals(0, ppt.getSlides().size());
XSLFSlide slide = ppt.createSlide();
assertTrue(slide.getFollowMasterGraphics());
assertFalse(slide.getFollowMasterGraphics());
slide.setFollowMasterGraphics(false);
assertFalse(slide.getFollowMasterGraphics());
slide.setFollowMasterGraphics(true);

4
src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
View File

@ -99,7 +99,7 @@ public class TestXSLFTheme {
assertTrue(sameColor(new Color(148, 198, 0), run2.getFontColor()));
assertNull(sh2.getFillColor()); // no fill
assertTrue(slide.getSlideLayout().getFollowMasterGraphics());
assertFalse(slide.getSlideLayout().getFollowMasterGraphics());
}
void slide5(XSLFSlide slide){
@ -113,7 +113,7 @@ public class TestXSLFTheme {
// font size is 40pt and scale factor is 90%
assertEquals(36.0, run2.getFontSize(), 0);
assertTrue(slide.getSlideLayout().getFollowMasterGraphics());
assertFalse(slide.getSlideLayout().getFollowMasterGraphics());
}
void slide6(XSLFSlide slide){

BIN
test-data/slideshow/2411-Performance_Up.pptx Normal file
View File

Binary file not shown.