litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Fixed unit multiplication

Browse source
This commit is contained in:
George Litvinov 2019-10-23 15:27:42 +03:00 • committed by Georgy Litvinov
parent 04cd1bb781
commit a3a739b991
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/writer2latex/util/Calc.java
View file

@ -168,8 +168,8 @@ public class Calc {
public static final String multiply(String sPercent, String sLength){
if (sLength.equals("0")) { return "0"; }
float fPercent=getFloat(sPercent.substring(0,sPercent.length()-1),1);
float fLength=getFloat(sLength.substring(0,sLength.length()-2),1);
String sUnit=sLength.substring(sLength.length()-2);
float fLength=getFloat(sLength.replaceAll("[^0-9,.,-]", ""),1);
String sUnit=sLength.replaceAll("[0-9,.,-]", "");
return Float.toString(fPercent*fLength/100)+sUnit;
}