[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - wizards/com

[Julien Nabet]

 wizards/com/sun/star/wizards/form/StyleApplier.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77041f33fb0473c97bfe781c60d9e303df170d19
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Dec 7 22:39:27 2014 +0100

    We need to call decode method considering this:
    
    java.lang.NumberFormatException: For input string: "#FF9966"
    	at java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
    	at java.lang.Integer.parseInt(Integer.java:481)
    	at java.lang.Integer.parseInt(Integer.java:527)
    	at com.sun.star.wizards.form.StyleApplier.getStyleColor(StyleApplier.java:321)
    
    When creating form with wizard
    
    Partly reverts http://cgit.freedesktop.org/libreoffice/core/commit/?id=10e8e10605b9c52bd7fd8a0665dd4d358c733a66
    
    Cherry-picked from c2d8fed349747f526a74cde3fcd36c494fc199b2
    
    Change-Id: Ide85566244e0dce1d30f6369d1f5d8d30534a01a
    Reviewed-on: https://gerrit.libreoffice.org/13352
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 262fc4f..23c0670 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -299,7 +299,7 @@ public class StyleApplier
                         {
                             sPropValue = JavaTools.replaceSubString(sPropValue, PropertyNames.EMPTY_STRING, PropertyNames.SEMI_COLON);
                             sPropValue = JavaTools.replaceSubString(sPropValue, PropertyNames.EMPTY_STRING, PropertyNames.SPACE);
-                            return Integer.parseInt(sPropValue);
+                            return Integer.decode(sPropValue).intValue();
                         }
                     }
                 }