[Libreoffice-commits] core.git: external/jfreereport

[rbuj]

 external/jfreereport/patches/libloader-1.1.6-deprecated.patch |   23 ++++++++++
 1 file changed, 23 insertions(+)

New commits:
commit 66f4347aff8210c209d54320e3cdef3bcc55f2b1
Author: rbuj <robert.buj at gmail.com>
Date:   Thu Jul 24 15:21:05 2014 +0200

    jfreereport_libloader: [deprecation] toURL() in File has been deprecated
    
    http://docs.oracle.com/javase/6/docs/api/java/io/File.html#toURL()
    
    Change-Id: I5ff457cdbeff0049a9e31d6aa66dd973289d5f05
    Reviewed-on: https://gerrit.libreoffice.org/10506
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/external/jfreereport/patches/libloader-1.1.6-deprecated.patch b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch
index c098906..79fa046 100644
--- a/external/jfreereport/patches/libloader-1.1.6-deprecated.patch
+++ b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch
@@ -9,3 +9,26 @@
    }
  
    /**
+--- misc/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java	2010-04-27 16:07:00.000000000 +0200
++++ misc/build/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java	2014-07-24 15:11:26.000000000 +0200
+@@ -19,6 +19,7 @@
+ 
+ import java.io.File;
+ import java.io.IOException;
++import java.lang.SecurityException;
+ import java.net.MalformedURLException;
+ import java.net.URL;
+ import java.util.HashMap;
+@@ -170,7 +171,11 @@
+     final File file = (File) key.getIdentifier();
+     try
+     {
+-      return file.toURL();
++      return file.toURI().toURL();
++    }
++    catch (SecurityException e)
++    {
++      return null;
+     }
+     catch (MalformedURLException e)
+     {