From b8ae7910095aba8533fc3446b15eb94158a5d95b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 18 Sep 2018 16:55:29 +0000 Subject: [PATCH] [bug-62733] XSLFBackground setFill() can corrupt the document git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1841240 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/xslf/usermodel/XSLFBackground.java | 15 +- .../xslf/usermodel/TestXSLFBackground.java | 158 ++++++++++++++++++ 2 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java index 32a31d6ac0..dbc623b141 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java @@ -77,7 +77,20 @@ public class XSLFBackground extends XSLFSimpleShape public void setFillColor(Color color) { CTBackgroundProperties bgPr = getBgPr(true); - + + if (bgPr.isSetBlipFill()) { + bgPr.unsetBlipFill(); + } + if (bgPr.isSetGradFill()) { + bgPr.unsetGradFill(); + } + if (bgPr.isSetGrpFill()) { + bgPr.unsetGrpFill(); + } + if (bgPr.isSetPattFill()) { + bgPr.unsetPattFill(); + } + if (color == null) { if (bgPr.isSetSolidFill()) { bgPr.unsetSolidFill(); diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java new file mode 100644 index 0000000000..1e0467fefd --- /dev/null +++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java @@ -0,0 +1,158 @@ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ +package org.apache.poi.xslf.usermodel; + +import org.apache.poi.xslf.XSLFTestDataSamples; +import org.junit.Test; +import org.openxmlformats.schemas.presentationml.x2006.main.CTBackgroundProperties; +import org.openxmlformats.schemas.presentationml.x2006.main.impl.CTBackgroundImpl; + +import java.awt.*; +import java.io.IOException; + +import static org.junit.Assert.*; + +public class TestXSLFBackground { + @Test + public void testNoFillBackground() throws IOException { + XMLSlideShow pptx = new XMLSlideShow(); + XSLFSlide slide = pptx.createSlide(); + + slide.getBackground().setFillColor(null); + + CTBackgroundImpl bg = (CTBackgroundImpl) slide.getBackground().getXmlObject(); + CTBackgroundProperties bgPr = bg.getBgPr(); + + assertFalse(bgPr.isSetBlipFill()); + assertFalse(bgPr.isSetGradFill()); + assertFalse(bgPr.isSetGrpFill()); + assertFalse(bgPr.isSetPattFill()); + assertFalse(bgPr.isSetSolidFill()); + assertTrue(bgPr.isSetNoFill()); + + pptx.close(); + } + + @Test + public void testSolidFillBackground() throws IOException { + XMLSlideShow pptx = new XMLSlideShow(); + XSLFSlide slide = pptx.createSlide(); + + Color color = Color.RED; + + slide.getBackground().setFillColor(color); + + CTBackgroundImpl bg = (CTBackgroundImpl) slide.getBackground().getXmlObject(); + CTBackgroundProperties bgPr = bg.getBgPr(); + + assertFalse(bgPr.isSetBlipFill()); + assertFalse(bgPr.isSetGradFill()); + assertFalse(bgPr.isSetGrpFill()); + assertFalse(bgPr.isSetPattFill()); + assertTrue(bgPr.isSetSolidFill()); + assertFalse(bgPr.isSetNoFill()); + + assertEquals(slide.getBackground().getFillColor(), color); + + pptx.close(); + } + + @Test + public void testBlipFillBackground() throws IOException { + XMLSlideShow pptx = XSLFTestDataSamples.openSampleDocument("pptx2svg.pptx"); + XSLFSlide slide = pptx.getSlides().get(0); + + Color color = Color.WHITE; + + CTBackgroundImpl bg = (CTBackgroundImpl) slide.getBackground().getXmlObject(); + CTBackgroundProperties bgPr = bg.getBgPr(); + + assertTrue(bgPr.isSetBlipFill()); + assertFalse(bgPr.isSetGradFill()); + assertFalse(bgPr.isSetGrpFill()); + assertFalse(bgPr.isSetPattFill()); + assertFalse(bgPr.isSetSolidFill()); + assertFalse(bgPr.isSetNoFill()); + + slide.getBackground().setFillColor(color); + + assertFalse(bgPr.isSetBlipFill()); + assertFalse(bgPr.isSetGradFill()); + assertFalse(bgPr.isSetGrpFill()); + assertFalse(bgPr.isSetPattFill()); + assertTrue(bgPr.isSetSolidFill()); + assertFalse(bgPr.isSetNoFill()); + + assertEquals(slide.getBackground().getFillColor(), color); + + slide.getBackground().setFillColor(null); + + assertFalse(bgPr.isSetBlipFill()); + assertFalse(bgPr.isSetGradFill()); + assertFalse(bgPr.isSetGrpFill()); + assertFalse(bgPr.isSetPattFill()); + assertFalse(bgPr.isSetSolidFill()); + assertTrue(bgPr.isSetNoFill()); + + assertNull(slide.getBackground().getFillColor()); + + pptx.close(); + } + + @Test + public void testGradFillBackground() throws IOException { + XMLSlideShow pptx = XSLFTestDataSamples.openSampleDocument("themes.pptx"); + XSLFSlide slide = pptx.getSlides().get(9); + + Color color = Color.GREEN; + + CTBackgroundImpl bg = (CTBackgroundImpl) slide.getBackground().getXmlObject(); + CTBackgroundProperties bgPr = bg.getBgPr(); + + assertFalse(bgPr.isSetBlipFill()); + assertTrue(bgPr.isSetGradFill()); + assertFalse(bgPr.isSetGrpFill()); + assertFalse(bgPr.isSetPattFill()); + assertFalse(bgPr.isSetSolidFill()); + assertFalse(bgPr.isSetNoFill()); + + slide.getBackground().setFillColor(color); + + assertFalse(bgPr.isSetBlipFill()); + assertFalse(bgPr.isSetGradFill()); + assertFalse(bgPr.isSetGrpFill()); + assertFalse(bgPr.isSetPattFill()); + assertTrue(bgPr.isSetSolidFill()); + assertFalse(bgPr.isSetNoFill()); + + assertEquals(slide.getBackground().getFillColor(), color); + + slide.getBackground().setFillColor(null); + + assertFalse(bgPr.isSetBlipFill()); + assertFalse(bgPr.isSetGradFill()); + assertFalse(bgPr.isSetGrpFill()); + assertFalse(bgPr.isSetPattFill()); + assertFalse(bgPr.isSetSolidFill()); + assertTrue(bgPr.isSetNoFill()); + + assertNull(slide.getBackground().getFillColor()); + + pptx.close(); + } +} + -- 2.39.5