From: Javen O'Neal Date: Sat, 2 Jul 2016 08:40:50 +0000 (+0000) Subject: don't shadow drawing field from XSSFShape in XSSFGraphicFrame X-Git-Tag: REL_3_15_BETA3~234 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3934d1080989da061f96c7731574942f2fc9c06d;p=poi.git don't shadow drawing field from XSSFShape in XSSFGraphicFrame git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1751038 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java index e0bbc266bc..08d781bef0 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java @@ -43,8 +43,6 @@ public final class XSSFGraphicFrame extends XSSFShape { private static CTGraphicalObjectFrame prototype = null; private CTGraphicalObjectFrame graphicFrame; - // FIXME: shadows protected XSSFShape.drawing - private XSSFDrawing drawing; private XSSFClientAnchor anchor; /** @@ -54,7 +52,7 @@ public final class XSSFGraphicFrame extends XSSFShape { * @param ctGraphicFrame the XML bean that stores this frame content */ protected XSSFGraphicFrame(XSSFDrawing drawing, CTGraphicalObjectFrame ctGraphicFrame) { - this.drawing = drawing; + this.drawing = drawing; // protected field on XSSFShape this.graphicFrame = ctGraphicFrame; }