Author: fanningpj
Date: Sat Sep 16 12:16:29 2017
New Revision: 1808535
URL: http://svn.apache.org/viewvc?rev=1808535&view=rev
Log:
remove some deprecated code slated for removal in 3.18
Removed:
poi/trunk/src/java/org/apache/poi/hpsf/TypeWriter.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java?rev=1808535&r1=1808534&r2=1808535&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java Sat
Sep 16 12:16:29 2017
@@ -42,7 +42,6 @@ implements Notes<XSLFShape,XSLFTextParag
XSLFNotes() {
super();
_notes = prototype();
- setCommonSlideData(_notes.getCSld());
}
/**
@@ -61,7 +60,6 @@ implements Notes<XSLFShape,XSLFTextParag
NotesDocument doc =
NotesDocument.Factory.parse(getPackagePart().getInputStream(),
DEFAULT_XML_OPTIONS);
_notes = doc.getNotes();
- setCommonSlideData(_notes.getCSld());
}
private static CTNotesSlide prototype(){
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java?rev=1808535&r1=1808534&r2=1808535&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
Sat Sep 16 12:16:29 2017
@@ -66,7 +66,6 @@ import org.openxmlformats.schemas.presen
NotesMasterDocument doc =
NotesMasterDocument.Factory.parse(getPackagePart().getInputStream(),
DEFAULT_XML_OPTIONS);
_slide = doc.getNotesMaster();
- setCommonSlideData(_slide.getCSld());
}
private static CTNotesMaster prototype() {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java?rev=1808535&r1=1808534&r2=1808535&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java Sat
Sep 16 12:16:29 2017
@@ -58,7 +58,6 @@ public abstract class XSLFSheet extends
implements XSLFShapeContainer, Sheet<XSLFShape,XSLFTextParagraph> {
private static POILogger LOG = POILogFactory.getLogger(XSLFSheet.class);
- private XSLFCommonSlideData _commonSlideData;
private XSLFDrawing _drawing;
private List<XSLFShape> _shapes;
private CTGroupShape _spTree;
@@ -141,18 +140,6 @@ implements XSLFShapeContainer, Sheet<XSL
*/
public abstract XmlObject getXmlObject();
- /*
- * @deprecated POI 3.16 beta 1. use {@link XSLFTable} instead
- */
- @Removal(version="3.18")
- protected void setCommonSlideData(CTCommonSlideData data) {
- if(data == null) {
- _commonSlideData = null;
- } else {
- _commonSlideData = new XSLFCommonSlideData(data);
- }
- }
-
private XSLFDrawing getDrawing(){
initDrawingAndShapes();
return _drawing;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java?rev=1808535&r1=1808534&r2=1808535&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java Sat
Sep 16 12:16:29 2017
@@ -60,7 +60,6 @@ implements Slide<XSLFShape,XSLFTextParag
XSLFSlide() {
super();
_slide = prototype();
- setCommonSlideData(_slide.getCSld());
}
/**
@@ -83,7 +82,6 @@ implements Slide<XSLFShape,XSLFTextParag
SldDocument doc = SldDocument.Factory.parse(_doc, DEFAULT_XML_OPTIONS);
_slide = doc.getSld();
- setCommonSlideData(_slide.getCSld());
}
private static CTSlide prototype(){
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java?rev=1808535&r1=1808534&r2=1808535&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
Sat Sep 16 12:16:29 2017
@@ -51,7 +51,6 @@ implements MasterSheet<XSLFShape,XSLFTex
SldLayoutDocument doc =
SldLayoutDocument.Factory.parse(getPackagePart().getInputStream(),
DEFAULT_XML_OPTIONS);
_layout = doc.getSldLayout();
- setCommonSlideData(_layout.getCSld());
}
public String getName() {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java?rev=1808535&r1=1808534&r2=1808535&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
Sat Sep 16 12:16:29 2017
@@ -76,7 +76,6 @@ import org.openxmlformats.schemas.presen
SldMasterDocument doc =
SldMasterDocument.Factory.parse(getPackagePart().getInputStream(),
DEFAULT_XML_OPTIONS);
_slide = doc.getSldMaster();
- setCommonSlideData(_slide.getCSld());
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
