Author: kiwiwings
Date: Wed Mar 16 23:30:19 2016
New Revision: 1735345
URL: http://svn.apache.org/viewvc?rev=1735345&view=rev
Log:
sonar fixes
Modified:
poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
Modified:
poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java?rev=1735345&r1=1735344&r2=1735345&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
(original)
+++ poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
Wed Mar 16 23:30:19 2016
@@ -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);
Modified: poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java?rev=1735345&r1=1735344&r2=1735345&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java Wed Mar 16
23:30:19 2016
@@ -189,7 +189,7 @@ public class ImageUtils {
if (isHSSF) {
h *= 1 - anchor.getDy1()/256d;
} else {
- h -= anchor.getDy1()/EMU_PER_PIXEL;
+ h -= anchor.getDy1()/(double)EMU_PER_PIXEL;
}
while(h < scaledHeight){
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java?rev=1735345&r1=1735344&r2=1735345&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
Wed Mar 16 23:30:19 2016
@@ -341,11 +341,11 @@ public class WordToHtmlConverter extends
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
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
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java?rev=1735345&r1=1735344&r2=1735345&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
Wed Mar 16 23:30:19 2016
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
