Author: liuzhe
Date: Fri Aug 31 05:34:23 2012
New Revision: 1379294
URL: http://svn.apache.org/viewvc?rev=1379294&view=rev
Log:
#120645 - [testuno]Shape Line and Rotation in Presentation
Patch By: Li Feng Wang <[email protected]>
Review By: Liu Zhe <[email protected]>
Added:
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/shape/ShapeProperties.java
Removed:
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ShapeProperties.java
Modified:
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ParagraphStyle.java
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ParagraphTextProperty.java
incubator/ooo/trunk/test/testuno/source/testlib/uno/ShapeUtil.java
Modified:
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ParagraphStyle.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ParagraphStyle.java?rev=1379294&r1=1379293&r2=1379294&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ParagraphStyle.java
(original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ParagraphStyle.java
Fri Aug 31 05:34:23 2012
@@ -93,7 +93,7 @@ public class ParagraphStyle {
XPropertySet xTextPropSet2 = addPortion(xRectangle, "And
another text paragraph", true);
xTextPropSet2.setPropertyValue("CharColor", new
Integer(0xff0000));
- xRectangle = saveAndLoadShape(po,
"com.sun.star.drawing.EllipseShape");
+ xRectangle = saveAndLoadShape(1, 0);
Assert.assertEquals("Paragraph Left Margin is 1000",1000,
xTextPropSet1.getPropertyValue("ParaLeftMargin"));
@@ -164,17 +164,11 @@ public class ParagraphStyle {
* @return
* @throws Exception
*/
- public XShape saveAndLoadShape(Point po, String shapeType) throws
Exception {
+ public XShape saveAndLoadShape(int pageIndex, int shapeIndex) throws
Exception {
reLoadFile = saveAndReloadDoc(impressDocument,
- "StarOffice XML (Impress)", "odp");
- drawsupplier = (XDrawPagesSupplier) UnoRuntime.queryInterface(
- XDrawPagesSupplier.class, reLoadFile);
- drawpages = drawsupplier.getDrawPages();
- xpage = PageUtil.getDrawPageByIndex(impressDocument, 1);
- xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class,
xpage);
- XShape shap = ShapeUtil.getShape(impressDocument, po,
- "com.sun.star.drawing.EllipseShape");
- return shap;
+ "impress8", "odp");
+ xShapes=ShapeUtil.getShapes(reLoadFile, pageIndex);
+ return (XShape) UnoRuntime.queryInterface(XShape.class,
xShapes.getByIndex(shapeIndex));
}
/**
Modified:
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ParagraphTextProperty.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ParagraphTextProperty.java?rev=1379294&r1=1379293&r2=1379294&view=diff
==============================================================================
---
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ParagraphTextProperty.java
(original)
+++
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/ParagraphTextProperty.java
Fri Aug 31 05:34:23 2012
@@ -83,7 +83,7 @@ public class ParagraphTextProperty {
XPropertySet xTextPropSet = addPortion(xRectangle, "using
TextFitToSize", false);
xTextPropSet = addPortion(xRectangle, "and a Border distance
of 2,5 cm", true);
- xRectangle = saveAndLoadShape(po,
"com.sun.star.drawing.EllipseShape");
+ xRectangle = saveAndLoadShape(1,0);
Assert.assertEquals("TextLeftDistance is 2500", 2500,
xShapePropSet.getPropertyValue("TextLeftDistance"));
Assert.assertEquals("TextRightDistance is 2500", 2500,
xShapePropSet.getPropertyValue("TextRightDistance"));
@@ -131,17 +131,11 @@ public class ParagraphTextProperty {
* @return
* @throws Exception
*/
- public XShape saveAndLoadShape(Point po, String shapeType) throws
Exception {
+ public XShape saveAndLoadShape(int pageIndex, int shapeIndex) throws
Exception {
reLoadFile = saveAndReloadDoc(impressDocument,
- "StarOffice XML (Impress)", "odp");
- drawsupplier = (XDrawPagesSupplier) UnoRuntime.queryInterface(
- XDrawPagesSupplier.class, reLoadFile);
- drawpages = drawsupplier.getDrawPages();
- xpage = PageUtil.getDrawPageByIndex(impressDocument, 1);
- xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class,
xpage);
- XShape shap = ShapeUtil.getShape(impressDocument, po,
- "com.sun.star.drawing.EllipseShape");
- return shap;
+ "impress8", "odp");
+ xShapes=ShapeUtil.getShapes(reLoadFile, pageIndex);
+ return (XShape) UnoRuntime.queryInterface(XShape.class,
xShapes.getByIndex(shapeIndex));
}
/**
Added:
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/shape/ShapeProperties.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/shape/ShapeProperties.java?rev=1379294&view=auto
==============================================================================
---
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/shape/ShapeProperties.java
(added)
+++
incubator/ooo/trunk/test/testuno/source/testcase/uno/sd/shape/ShapeProperties.java
Fri Aug 31 05:34:23 2012
@@ -0,0 +1,405 @@
+/**************************************************************
+ *
+ * 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 testcase.uno.sd.shape;
+
+import java.awt.geom.AffineTransform;
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.After;
+import static org.junit.Assert.*;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.openoffice.test.uno.UnoApp;
+import org.openoffice.test.common.FileUtil;
+import org.openoffice.test.common.Testspace;
+
+import testlib.uno.PageUtil;
+import testlib.uno.ShapeUtil;
+import testlib.uno.TestUtil;
+
+import com.sun.star.text.WrapTextMode;
+import com.sun.star.text.XText;
+import com.sun.star.text.XTextContent;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.presentation.XPresentation;
+import com.sun.star.presentation.XPresentationSupplier;
+import com.sun.star.awt.Gradient;
+import com.sun.star.awt.GradientStyle;
+import com.sun.star.awt.Size;
+import com.sun.star.awt.Point;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.drawing.DashStyle;
+import com.sun.star.drawing.FillStyle;
+import com.sun.star.drawing.Hatch;
+import com.sun.star.drawing.HatchStyle;
+import com.sun.star.drawing.HomogenMatrix3;
+import com.sun.star.drawing.LineDash;
+import com.sun.star.drawing.LineStyle;
+import com.sun.star.drawing.XDrawPage;
+import com.sun.star.drawing.XDrawPages;
+import com.sun.star.drawing.XDrawPagesSupplier;
+import com.sun.star.drawing.XShape;
+import com.sun.star.drawing.XShapes;
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XStorable;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+
+public class ShapeProperties {
+ UnoApp unoApp = new UnoApp();
+ XPresentationSupplier sdDocument = null;
+ XPresentation pre = null;
+ XComponent precomp = null;
+ XComponent impressDocument = null;
+ XComponent reLoadFile = null;
+ XDrawPagesSupplier drawsupplier = null;
+ XDrawPages drawpages = null;
+ XShapes xShapes = null;
+ XDrawPage xpage = null;
+ String filePath = null;
+
+ @Before
+ public void setUp() throws Exception {
+ unoApp.start();
+ createDocumentAndSlide();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ unoApp.closeDocument(impressDocument);
+ unoApp.closeDocument(reLoadFile);
+ unoApp.close();
+ if (filePath != null)
+ FileUtil.deleteFile(filePath);
+ }
+
+ /**
+ * test Insert a new slide and Insert a new EllipseShape
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testInsertShape() throws Exception {
+ Point po = new Point(1000, 8000);
+ xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class, xpage);
+ XShape xShape = ShapeUtil.createShape(impressDocument, po, new Size(
+ 5000, 5000), "com.sun.star.drawing.EllipseShape");
+ xShapes.add(xShape);
+ XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet.class, xShape);
+ xPropSet.setPropertyValue("Name", "test");
+
+ xShape=saveAndLoadShape(1,0);
+ XPropertySet xPropSet2 = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet.class, xShape);
+ assertEquals("Not the same
shape","test",xPropSet2.getPropertyValue("Name"));
+ assertEquals("Not
EllopseShape","com.sun.star.drawing.EllipseShape",xShape.getShapeType());
+ }
+
+ /**
+ * test Insert text to an EllopseShape
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testInsertTextToShape() throws Exception {
+ Point po = new Point(1000, 8000);
+ xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class, xpage);
+ XShape xShape = ShapeUtil.createShape(impressDocument, po, new Size(
+ 5000, 5000), "com.sun.star.drawing.EllipseShape");
+ xShapes.add(xShape);
+ xShape=saveAndLoadShape(1,0);
+ ShapeUtil.addPortion(xShape, "test", false);
+ assertEquals("Not put text
correctly","test",ShapeUtil.getPortion(xShape));
+ }
+
+ /**
+ * test Shape fill with Gradient
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testShapeFillGradient() throws Exception {
+ Point po = new Point(1000, 8000);
+ xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class, xpage);
+ XShape xShape = ShapeUtil.createShape(impressDocument, po, new Size(
+ 5000, 5000), "com.sun.star.drawing.EllipseShape");
+ xShapes.add(xShape);
+ XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet.class, xShape);
+ xPropSet.setPropertyValue("FillStyle", FillStyle.GRADIENT);
+ Gradient aGradient = new Gradient();
+ aGradient.Style = GradientStyle.LINEAR;
+ aGradient.StartColor = 0x00ff00;
+ aGradient.EndColor = 0xffff00;
+ aGradient.Angle = 450;
+ aGradient.Border = 0;
+ aGradient.XOffset = 0;
+ aGradient.YOffset = 0;
+ aGradient.StartIntensity = 100;
+ aGradient.EndIntensity = 100;
+ aGradient.StepCount = 10;
+ xPropSet.setPropertyValue("FillGradient", aGradient);
+ // --------------------------
+ xShape=saveAndLoadShape(1,0);
+ xPropSet = (XPropertySet)
UnoRuntime.queryInterface(XPropertySet.class, xShape);
+ // ----------------------------
+ assertEquals("Not Gradient Fill
Style",FillStyle.GRADIENT,xPropSet.getPropertyValue("FillStyle"));
+ aGradient=(Gradient) xPropSet.getPropertyValue("FillGradient");
+ assertEquals("Not Linear
Gradient",GradientStyle.LINEAR,aGradient.Style);
+ }
+
+ /**
+ * test Shape fill with yellow color
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testShapeFillColor() throws Exception {
+ Point po = new Point(1000, 8000);
+ xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class, xpage);
+ XShape xShape = ShapeUtil.createShape(impressDocument, po, new Size(
+ 5000, 5000), "com.sun.star.drawing.EllipseShape");
+ xShapes.add(xShape);
+ XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet.class, xShape);
+ xPropSet.setPropertyValue("FillStyle", FillStyle.SOLID);
+ xPropSet.setPropertyValue("FillColor", 0xffff00);
+ // --------------------------
+ xShape=saveAndLoadShape(1,0);
+ xPropSet = (XPropertySet)
UnoRuntime.queryInterface(XPropertySet.class, xShape);
+ // ----------------------------------------------------
+ assertEquals("Not Color Fill
Style",FillStyle.SOLID,xPropSet.getPropertyValue("FillStyle"));
+ assertEquals("Not Yellow Color
Fill",0xffff00,xPropSet.getPropertyValue("FillColor"));
+ }
+
+ /**
+ * test shape fill with Hatch Style(Pattern in MS)
+ * @throws Exception
+ */
+ @Test
+ public void testShapeFillHatch() throws Exception {
+ Point po = new Point(1000, 8000);
+ xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class, xpage);
+ XShape xShape = ShapeUtil.createShape(impressDocument, po, new Size(
+ 5000, 5000), "com.sun.star.drawing.EllipseShape");
+ xShapes.add(xShape);
+ XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet.class, xShape);
+ xPropSet.setPropertyValue("FillStyle", FillStyle.HATCH);
+ Hatch aHatch=new Hatch();
+ aHatch.Style=HatchStyle.DOUBLE;
+ aHatch.Color=0x00ff00;
+ aHatch.Distance=100;
+ aHatch.Angle=450;
+ xPropSet.setPropertyValue("FillHatch", aHatch);
+
+ // --------------------------
+ xShape=saveAndLoadShape(1,0);
+ xPropSet = (XPropertySet)
UnoRuntime.queryInterface(XPropertySet.class, xShape);
+ // ----------------------------
+ assertEquals("Not Gradient Fill
Style",FillStyle.HATCH,xPropSet.getPropertyValue("FillStyle"));
+ aHatch=(Hatch) xPropSet.getPropertyValue("FillHatch");
+ assertEquals("Not Double Hatch",HatchStyle.DOUBLE,aHatch.Style);
+ }
+
+ // ------------Shape Line-----------------------------
+ /**
+ * test Shape Line style DASH
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testShapeLineStyle() throws Exception {
+ Point po = new Point(1000, 8000);
+ xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class, xpage);
+ XShape xShape = ShapeUtil.createShape(impressDocument, po, new Size(
+ 5000, 5000), "com.sun.star.drawing.EllipseShape");
+ xShapes.add(xShape);
+
+ XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet.class, xShape);
+ xPropSet.setPropertyValue("LineStyle", LineStyle.DASH);
+
+ LineDash aLineDash=new LineDash();
+ aLineDash.Style=DashStyle.ROUND;
+ aLineDash.Dots=2;
+ aLineDash.DashLen=100;
+ aLineDash.Distance=50;
+ xPropSet.setPropertyValue("LineDash", aLineDash);
+
+ // --------------------------
+ xShape=saveAndLoadShape(1,0);
+ xPropSet = (XPropertySet)
UnoRuntime.queryInterface(XPropertySet.class, xShape);
+ // ----------------------------
+ assertEquals("Not Dash Line
Style",LineStyle.DASH,xPropSet.getPropertyValue("LineStyle"));
+ aLineDash=(LineDash) xPropSet.getPropertyValue("LineDash");
+ assertEquals("Not Round Dash Style", DashStyle.ROUND ,aLineDash.Style);
+ }
+
+ /**
+ * test Shape Line Color
+ * @throws Exception
+ */
+
+ @Test
+ public void testShapeLineColor() throws Exception {
+ Point po = new Point(1000, 8000);
+ xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class, xpage);
+ XShape xShape = ShapeUtil.createShape(impressDocument, po, new Size(
+ 5000, 5000), "com.sun.star.drawing.EllipseShape");
+ xShapes.add(xShape);
+ XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet.class, xShape);
+ xPropSet.setPropertyValue("LineStyle", LineStyle.DASH);
+ xPropSet.setPropertyValue("LineColor", 0x00ff00);
+ xShape=saveAndLoadShape(1,0);
+ xPropSet = (XPropertySet)
UnoRuntime.queryInterface(XPropertySet.class, xShape);
+ // ----------------------------
+ assertEquals("Not Dash Line
Style",LineStyle.DASH,xPropSet.getPropertyValue("LineStyle"));
+ assertEquals("wrong line color",
0x00ff00,xPropSet.getPropertyValue("LineColor"));
+ }
+
+ /**
+ * test Shape position and size
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testShapePositionSize() throws Exception {
+ Point po = new Point(1000, 8000);
+ xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class, xpage);
+ XShape xShape = ShapeUtil.createShape(impressDocument, po, new Size(
+ 5000, 5000), "com.sun.star.drawing.EllipseShape");
+ xShapes.add(xShape);
+ xShape=saveAndLoadShape(1,0);
+ assertEquals("wrong shape position",1000,xShape.getPosition().X);
+ assertEquals("wrong shape Height", 5000 ,xShape.getSize().Height);
+ }
+
+ /**
+ * test Shape rotate with 25 degree.
+ * @throws Exception
+ */
+ @Test
+ public void testShapeRotation() throws Exception {
+ Point po = new Point(1000, 8000);
+ xShapes = (XShapes) UnoRuntime.queryInterface(XShapes.class,
xpage);
+ XShape xShape = ShapeUtil.createShape(impressDocument, po, new
Size(
+ 5000, 5000),
"com.sun.star.drawing.RectangleShape");
+ xShapes.add(xShape);
+ XPropertySet xPropSet = (XPropertySet)
UnoRuntime.queryInterface(
+ XPropertySet.class, xShape);
+ xPropSet.setPropertyValue("RotateAngle", 2500);
+ xShape=saveAndLoadShape(1,0);
+ xPropSet = (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet.class, xShape);
+ assertEquals("RotateAngle is not 2500", 2500 ,
xPropSet.getPropertyValue("RotateAngle"));
+ }
+
+
+ // ------------------Shape Remove----------------------------
+ /**
+ * test Remove shape from impress Document
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testShapeRemove() throws Exception {
+ Point aPos=null;
+ Size aSize=new Size(4000,4000);
+ for(int i=0;i<=4;i++){
+ aPos=new Point(1000, 3000*i);
+ xShapes=ShapeUtil.getShapes(impressDocument, 0);
+ ShapeUtil.createAndInsertShape(impressDocument, xShapes, aPos, aSize,
+ "com.sun.star.drawing.EllipseShape");
+ }
+ int countBeforeRemove=ShapeUtil.getShapes(impressDocument,
0).getCount();
+ ShapeUtil.removeOneShape(impressDocument, 0, 2);
+ int countAfterRemove=ShapeUtil.getShapes(impressDocument,
0).getCount();
+ assertEquals("Not remove shape
successfully",1,countBeforeRemove-countAfterRemove);
+ reLoadFile = saveAndReloadDoc(impressDocument,
+ "impress8", "odp");
+ xShapes=ShapeUtil.getShapes(reLoadFile, 0);
+ assertEquals("Shape count is wrong after reload",6,xShapes.getCount());
+ }
+
+ /**
+ * create a new presentation document and insert a new slide.
+ *
+ * @throws Exception
+ */
+ public void createDocumentAndSlide() throws Exception {
+ impressDocument = (XComponent) UnoRuntime.queryInterface(
+ XComponent.class,
unoApp.newDocument("simpress"));
+ drawsupplier = (XDrawPagesSupplier) UnoRuntime.queryInterface(
+ XDrawPagesSupplier.class, impressDocument);
+ drawpages = drawsupplier.getDrawPages();
+ drawpages.insertNewByIndex(1);
+ xpage = PageUtil.getDrawPageByIndex(impressDocument, 1);
+ }
+
+ /**
+ * Save presentation and reLoad the presentation and shape in it.
+ *
+ * @param po
+ * @param shapeType
+ * @return
+ * @throws Exception
+ */
+ public XShape saveAndLoadShape(int pageIndex, int shapeIndex) throws
Exception {
+ reLoadFile = saveAndReloadDoc(impressDocument,
+ "impress8", "odp");
+ xShapes=ShapeUtil.getShapes(reLoadFile, pageIndex);
+ return (XShape) UnoRuntime.queryInterface(XShape.class,
xShapes.getByIndex(shapeIndex));
+ }
+ /**
+ * save and reload Presentation document.
+ *
+ * @param presentationDocument
+ * @param sFilter
+ * @param sExtension
+ * @return
+ * @throws Exception
+ */
+ private XComponent saveAndReloadDoc(XComponent presentationDocument,
+ String sFilter, String sExtension) throws Exception {
+ filePath = Testspace.getPath("tmp/presentationtest." +
sExtension);
+ PropertyValue[] aStoreProperties = new PropertyValue[2];
+ aStoreProperties[0] = new PropertyValue();
+ aStoreProperties[1] = new PropertyValue();
+ aStoreProperties[0].Name = "Override";
+ aStoreProperties[0].Value = true;
+ aStoreProperties[1].Name = "FilterName";
+ aStoreProperties[1].Value = sFilter;
+ XStorable xStorable = (XStorable) UnoRuntime.queryInterface(
+ XStorable.class, presentationDocument);
+ xStorable.storeToURL(FileUtil.getUrl(filePath),
aStoreProperties);
+
+ return UnoRuntime.queryInterface(XComponent.class,
+ unoApp.loadDocument(filePath));
+ }
+
+}
Modified: incubator/ooo/trunk/test/testuno/source/testlib/uno/ShapeUtil.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testlib/uno/ShapeUtil.java?rev=1379294&r1=1379293&r2=1379294&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testlib/uno/ShapeUtil.java
(original)
+++ incubator/ooo/trunk/test/testuno/source/testlib/uno/ShapeUtil.java Fri Aug
31 05:34:23 2012
@@ -37,7 +37,9 @@ import com.sun.star.beans.XPropertySet;
import com.sun.star.container.NoSuchElementException;
import com.sun.star.container.XEnumeration;
import com.sun.star.container.XEnumerationAccess;
-
+import com.sun.star.drawing.XDrawPage;
+import com.sun.star.drawing.XDrawPages;
+import com.sun.star.drawing.XDrawPagesSupplier;
import com.sun.star.drawing.XShape;
import com.sun.star.drawing.XShapes;
@@ -75,26 +77,6 @@ public class ShapeUtil {
return xShape;
}
- /**
- * try to get shape according position
- *
- * @param aPos
- * @return
- */
- public static XShape getShape(XComponent xDrawDoc, Point aPos,
- String sShapeType) {
- XShape xShape = null;
- try {
- XMultiServiceFactory xFactory = (XMultiServiceFactory)
UnoRuntime
-
.queryInterface(XMultiServiceFactory.class, xDrawDoc);
- Object xObj = xFactory.createInstance(sShapeType);
- xShape = (XShape)
UnoRuntime.queryInterface(XShape.class, xObj);
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return xShape;
- }
/**
* add text to a shape. the return value is the PropertySet of the text
@@ -187,4 +169,39 @@ public class ShapeUtil {
}
}
}
+ /**
+ * Get shapes in specific page
+ * @param impressDocument
+ * @param pageIndex
+ * @return
+ * @throws Exception
+ */
+ public static XShapes getShapes(XComponent impressDocument, int
pageIndex) throws Exception{
+
+ XDrawPagesSupplier drawsupplier = (XDrawPagesSupplier)
UnoRuntime.queryInterface(
+ XDrawPagesSupplier.class, impressDocument);
+ XDrawPages drawpages = drawsupplier.getDrawPages();
+ XDrawPage
xpage=(XDrawPage)UnoRuntime.queryInterface(XDrawPage.class,
drawpages.getByIndex(pageIndex));
+ XShapes xShapes = (XShapes)
UnoRuntime.queryInterface(XShapes.class, xpage);
+ return xShapes;
+
+ }
+
+ /**
+ * Remove the specific shape in specific page
+ * @param impressDocument
+ * @param pageIndex
+ * @param shapeIndex
+ * @throws Exception
+ */
+ public static void removeOneShape(XComponent impressDocument, int
pageIndex, int shapeIndex) throws Exception{
+ XDrawPagesSupplier drawsupplier = (XDrawPagesSupplier)
UnoRuntime.queryInterface(
+ XDrawPagesSupplier.class, impressDocument);
+ XDrawPages drawpages = drawsupplier.getDrawPages();
+ XDrawPage
xpage=(XDrawPage)UnoRuntime.queryInterface(XDrawPage.class,
drawpages.getByIndex(pageIndex));
+ XShapes xShapes = (XShapes)
UnoRuntime.queryInterface(XShapes.class, xpage);
+ XShape xShape = (XShape)
UnoRuntime.queryInterface(XShape.class, xShapes.getByIndex(shapeIndex));
+ xShapes.remove(xShape);
+
+ }
}
