You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by on...@apache.org on 2016/06/17 01:34:01 UTC
svn commit: r1748788 - in /poi/trunk/src/scratchpad:
src/org/apache/poi/hwpf/ src/org/apache/poi/hwpf/model/
src/org/apache/poi/hwpf/usermodel/ testcases/org/apache/poi/hwpf/
testcases/org/apache/poi/hwpf/usermodel/
Author: onealj
Date: Fri Jun 17 01:34:00 2016
New Revision: 1748788
URL: http://svn.apache.org/viewvc?rev=1748788&view=rev
Log:
remove deprecated o.a.p.hwpf.usermodel.Shapes (replaced by OfficeDrawing in POI 3.8 beta 4)
Removed:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Shape.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestShapes.java
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java?rev=1748788&r1=1748787&r2=1748788&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java Fri Jun 17 01:34:00 2016
@@ -42,7 +42,6 @@ import org.apache.poi.hwpf.model.Picture
import org.apache.poi.hwpf.model.RevisionMarkAuthorTable;
import org.apache.poi.hwpf.model.SavedByTable;
import org.apache.poi.hwpf.model.SectionTable;
-import org.apache.poi.hwpf.model.ShapesTable;
import org.apache.poi.hwpf.model.SinglentonTextPiece;
import org.apache.poi.hwpf.model.StyleSheet;
import org.apache.poi.hwpf.model.SubdocumentType;
@@ -121,12 +120,6 @@ public final class HWPFDocument extends
/** Holds pictures table */
protected PicturesTable _pictures;
- /** Holds Office Art objects
- * @deprecated POI 3.8.
- */
- @Deprecated
- protected ShapesTable _officeArts;
-
/** Holds Office Art objects */
protected OfficeDrawingsImpl _officeDrawingsHeaders;
@@ -318,8 +311,6 @@ public final class HWPFDocument extends
// read in the pictures stream
_pictures = new PicturesTable(this, _dataStream, _mainStream, _fspaMain, _escherRecordHolder);
- // And the art shapes stream
- _officeArts = new ShapesTable(_tableStream, _fib);
// And escher pictures
_officeDrawingsHeaders = new OfficeDrawingsImpl( _fspaHeaders, _escherRecordHolder, _mainStream );
@@ -535,18 +526,6 @@ public final class HWPFDocument extends
return _escherRecordHolder;
}
- /**
- * @return ShapesTable object, that is able to extract office are shapes
- * from this document
- * @deprecated POI 3.8. Use {@link #getOfficeDrawingsMain()} instead.
- */
- @Deprecated
- @Internal
- public ShapesTable getShapesTable()
- {
- return _officeArts;
- }
-
public OfficeDrawings getOfficeDrawingsHeaders()
{
return _officeDrawingsHeaders;
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java?rev=1748788&r1=1748787&r2=1748788&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java Fri Jun 17 01:34:00 2016
@@ -54,7 +54,6 @@ import org.apache.poi.hwpf.usermodel.Tes
import org.apache.poi.hwpf.usermodel.TestRangeProperties;
import org.apache.poi.hwpf.usermodel.TestRangeReplacement;
import org.apache.poi.hwpf.usermodel.TestRangeSymbols;
-import org.apache.poi.hwpf.usermodel.TestShapes;
import org.apache.poi.hwpf.usermodel.TestTableRow;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -113,7 +112,6 @@ import org.junit.runners.Suite;
TestRangeProperties.class,
TestRangeReplacement.class,
TestRangeSymbols.class,
- TestShapes.class,
TestTableRow.class
})
public final class AllHWPFTests {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org