sonar fixes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1735345 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java b/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
index 1d88afb38d035c58e5cd9a68fafe9c9e3f503564..578c3a679950dbb18cdec54454d491664b1bfd24 100644 (file)
--- a/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
+++ b/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
@@ -185,7 +185,7 @@ public final class ApacheconEU08 {
 
         Dimension dim = ppt.getPageSize();
         Rectangle2D oldAnchor = table1.getAnchor();
-        table1.setAnchor(new Rectangle2D.Double((dim.width-450)/2, 100, oldAnchor.getWidth(), oldAnchor.getHeight()));
+        table1.setAnchor(new Rectangle2D.Double((dim.width-450)/2d, 100, oldAnchor.getWidth(), oldAnchor.getHeight()));
 
         TextBox<?,?> box1 = slide.createTextBox();
         box1.setHorizontalCentered(true);

diff --git a/src/java/org/apache/poi/ss/util/ImageUtils.java b/src/java/org/apache/poi/ss/util/ImageUtils.java
index 0e7de24eec71e69ab39d4c42996ade5c0bfad3dd..991a2efab358dac7aac3f2fa3ff756f237593196 100644 (file)
--- a/src/java/org/apache/poi/ss/util/ImageUtils.java
+++ b/src/java/org/apache/poi/ss/util/ImageUtils.java
@@ -189,7 +189,7 @@ public class ImageUtils {
         if (isHSSF) {\r
             h *= 1 - anchor.getDy1()/256d;\r
         } else {\r
-            h -= anchor.getDy1()/EMU_PER_PIXEL;\r
+            h -= anchor.getDy1()/(double)EMU_PER_PIXEL;\r
         }\r
 \r
         while(h < scaledHeight){\r

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
index 582e4e0643fdb8710f17fc014b1c41e357102bf2..1e10bd6e3f86e176b062ed0ae1e9be6e3ae55405 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
@@ -341,11 +341,11 @@ public class WordToHtmlConverter extends AbstractWordConverter
 
         if ( aspectRatioX > 0 )
         {
-            imageWidth = picture.getDxaGoal() * aspectRatioX / 1000
+            imageWidth = picture.getDxaGoal() * aspectRatioX / 1000.f
                     / TWIPS_PER_INCH;
-            cropRight = picture.getDxaCropRight() * aspectRatioX / 1000
+            cropRight = picture.getDxaCropRight() * aspectRatioX / 1000.f
                     / TWIPS_PER_INCH;
-            cropLeft = picture.getDxaCropLeft() * aspectRatioX / 1000
+            cropLeft = picture.getDxaCropLeft() * aspectRatioX / 1000.f
                     / TWIPS_PER_INCH;
         }
         else
@@ -357,11 +357,11 @@ public class WordToHtmlConverter extends AbstractWordConverter
 
         if ( aspectRatioY > 0 )
         {
-            imageHeight = picture.getDyaGoal() * aspectRatioY / 1000
+            imageHeight = picture.getDyaGoal() * aspectRatioY / 1000.f
                     / TWIPS_PER_INCH;
-            cropTop = picture.getDyaCropTop() * aspectRatioY / 1000
+            cropTop = picture.getDyaCropTop() * aspectRatioY / 1000.f
                     / TWIPS_PER_INCH;
-            cropBottom = picture.getDyaCropBottom() * aspectRatioY / 1000
+            cropBottom = picture.getDyaCropBottom() * aspectRatioY / 1000.f
                     / TWIPS_PER_INCH;
         }
         else

diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java b/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
index a099b3f499399fcc1b24a9ed977099d0400bb0e4..b1c3fa8b2420ca5aa438a28d93a8eb355b2e1365 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
@@ -252,11 +252,11 @@ public class TestWordToHtmlConverter
         // picture
         assertContains(result, "src=\"0.emf\"");
         // visible size
-        assertContains(result, "width:3.1305554in;height:1.7250001in;");
+        assertContains(result, "width:3.1293333in;height:1.7247736in;");
         // shift due to crop
-        assertContains(result, "left:-0.09375;top:-0.25694445;");
+        assertContains(result, "left:-0.09433333;top:-0.2573611;");
         // size without crop
-        assertContains(result, "width:3.4125in;height:2.325in;");
+        assertContains(result, "width:3.4125in;height:2.3253334in;");
     }
 
     @Test