You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2015/07/24 23:47:58 UTC

svn commit: r1692593 [17/17] - in /poi: site/src/documentation/content/xdocs/ trunk/ trunk/src/examples/src/org/apache/poi/hslf/examples/ trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/ trunk/src/examples/src/org/apache/poi/xslf/usermode...

Copied: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java (from r1691849, poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java?p2=poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java&p1=poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java&r1=1691849&r2=1692593&rev=1692593&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java Fri Jul 24 21:47:55 2015
@@ -166,28 +166,28 @@ public final class TestTextShape {
         HSLFTextShape tx;
 
         tx = map.get("TEST1");
-        assertEquals(0.1, tx.getLeftInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.1, tx.getRightInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.39, tx.getTopInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.05, tx.getBottomInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+        assertEquals(7.2, tx.getLeftInset(), 0);
+        assertEquals(7.2, tx.getRightInset(), 0);
+        assertEquals(28.34, tx.getTopInset(), 0.01);
+        assertEquals(3.6, tx.getBottomInset(), 0);
 
         tx = map.get("TEST2");
-        assertEquals(0.1, tx.getLeftInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.1, tx.getRightInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.05, tx.getTopInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.39, tx.getBottomInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+        assertEquals(7.2, tx.getLeftInset(), 0);
+        assertEquals(7.2, tx.getRightInset(), 0);
+        assertEquals(3.6, tx.getTopInset(), 0);
+        assertEquals(28.34, tx.getBottomInset(), 0.01);
 
         tx = map.get("TEST3");
-        assertEquals(0.39, tx.getLeftInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.1, tx.getRightInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.05, tx.getTopInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.05, tx.getBottomInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+        assertEquals(28.34, tx.getLeftInset(), 0.01);
+        assertEquals(7.2, tx.getRightInset(), 0);
+        assertEquals(3.6, tx.getTopInset(), 0);
+        assertEquals(3.6, tx.getBottomInset(), 0);
 
         tx = map.get("TEST4");
-        assertEquals(0.1, tx.getLeftInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.39, tx.getRightInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.05, tx.getTopInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
-        assertEquals(0.05, tx.getBottomInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+        assertEquals(7.2, tx.getLeftInset(), 0);
+        assertEquals(28.34, tx.getRightInset(), 0.01);
+        assertEquals(3.6, tx.getTopInset(), 0);
+        assertEquals(3.6, tx.getBottomInset(), 0);
     }
 
     @Test

Copied: poi/trunk/src/types/definitions/dml-shapeGeometry.xjb (from r1691849, poi/branches/common_sl/src/types/definitions/dml-shapeGeometry.xjb)
URL: http://svn.apache.org/viewvc/poi/trunk/src/types/definitions/dml-shapeGeometry.xjb?p2=poi/trunk/src/types/definitions/dml-shapeGeometry.xjb&p1=poi/branches/common_sl/src/types/definitions/dml-shapeGeometry.xjb&r1=1691849&r2=1692593&rev=1692593&view=diff
==============================================================================
--- poi/branches/common_sl/src/types/definitions/dml-shapeGeometry.xjb (original)
+++ poi/trunk/src/types/definitions/dml-shapeGeometry.xjb Fri Jul 24 21:47:55 2015
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    ====================================================================
+    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.
+    ====================================================================
+-->
 <jxb:bindings version="1.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:jxb="http://java.sun.com/xml/ns/jaxb"



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org