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;
/** 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;
// 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 );
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;
+++ /dev/null
-/* ====================================================================
- 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.hwpf.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hwpf.usermodel.Shape;
-import org.apache.poi.util.Internal;
-
-@Internal
-@Deprecated
-public final class ShapesTable {
- private List<Shape> _shapes;
- private List<Shape> _shapesVisibili; //holds visible shapes
-
- public ShapesTable(byte [] tblStream, FileInformationBlock fib) {
- PlexOfCps binTable = new PlexOfCps(tblStream,
- fib.getFcPlcspaMom(), fib.getLcbPlcspaMom(), 26);
-
- _shapes = new ArrayList<Shape>();
- _shapesVisibili = new ArrayList<Shape>();
-
-
- for(int i = 0; i < binTable.length(); i++) {
- GenericPropertyNode nodo = binTable.getProperty(i);
-
- Shape sh = new Shape(nodo);
- _shapes.add(sh);
- if(sh.isWithinDocument())
- _shapesVisibili.add(sh);
- }
- }
-
- public List<Shape> getAllShapes() {
- return _shapes;
- }
-
- public List<Shape> getVisibleShapes() {
- return _shapesVisibili;
- }
-}
+++ /dev/null
-/* ====================================================================
- 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.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.GenericPropertyNode;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * @deprecated Use {@link OfficeDrawing} instead
- */
-@Deprecated
-public final class Shape {
- int _id, _left, _right, _top, _bottom;
- /**
- * true if the Shape bounds are within document (for
- * example, it's false if the image left corner is outside the doc, like for
- * embedded documents)
- */
- boolean _inDoc;
-
- public Shape(GenericPropertyNode nodo) {
- byte [] contenuto = nodo.getBytes();
- _id = LittleEndian.getInt(contenuto);
- _left = LittleEndian.getInt(contenuto, 4);
- _top = LittleEndian.getInt(contenuto, 8);
- _right = LittleEndian.getInt(contenuto, 12);
- _bottom = LittleEndian.getInt(contenuto, 16);
- _inDoc = (_left >= 0 && _right >= 0 && _top >= 0 && _bottom >=
-0);
- }
-
- public int getId() {
- return _id;
- }
-
- public int getLeft() {
- return _left;
- }
-
- public int getRight() {
- return _right;
- }
-
- public int getTop() {
- return _top;
- }
-
- public int getBottom() {
- return _bottom;
- }
-
- public int getWidth() {
- return _right - _left + 1;
- }
-
- public int getHeight() {
- return _bottom - _top + 1;
- }
-
- public boolean isWithinDocument() {
- return _inDoc;
- }
-}
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;
TestRangeProperties.class,
TestRangeReplacement.class,
TestRangeSymbols.class,
- TestShapes.class,
TestTableRow.class
})
public final class AllHWPFTests {
+++ /dev/null
-/* ====================================================================
- 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.hwpf.usermodel;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-/**
- * Test the shapes handling
- */
-public final class TestShapes extends TestCase {
-
- /**
- * two shapes, second is a group
- */
- public void testShapes() throws Exception {
- HWPFDocument doc = HWPFTestDataSamples.openSampleFile("WithArtShapes.doc");
-
- List shapes = doc.getShapesTable().getAllShapes();
- List vshapes = doc.getShapesTable().getVisibleShapes();
-
- assertEquals(2, shapes.size());
- assertEquals(2, vshapes.size());
-
- Shape s1 = (Shape)shapes.get(0);
- Shape s2 = (Shape)shapes.get(1);
-
- assertEquals(3616, s1.getWidth());
- assertEquals(1738, s1.getHeight());
- assertEquals(true, s1.isWithinDocument());
-
- assertEquals(4817, s2.getWidth());
- assertEquals(2164, s2.getHeight());
- assertEquals(true, s2.isWithinDocument());
-
-
- // Re-serialisze, check still there
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- doc.write(baos);
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- doc = new HWPFDocument(bais);
-
- shapes = doc.getShapesTable().getAllShapes();
- vshapes = doc.getShapesTable().getVisibleShapes();
-
- assertEquals(2, shapes.size());
- assertEquals(2, vshapes.size());
-
- s1 = (Shape)shapes.get(0);
- s2 = (Shape)shapes.get(1);
-
- assertEquals(3616, s1.getWidth());
- assertEquals(1738, s1.getHeight());
- assertEquals(true, s1.isWithinDocument());
-
- assertEquals(4817, s2.getWidth());
- assertEquals(2164, s2.getHeight());
- assertEquals(true, s2.isWithinDocument());
- }
-}
projects / poi.git / commitdiff