diff options
| author | rbuj <robert.buj@gmail.com> | 2014-07-24 15:21:05 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-07-26 15:49:00 +0000 |
| commit | 66f4347aff8210c209d54320e3cdef3bcc55f2b1 (patch) | |
| tree | 34db6b5b95ba0ed6cbf60e58d77d71a39cfa2ad7 /external | |
| parent | d3293105512a3c25c5a17799a3bab6e0c7ff929d (diff) | |
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@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/jfreereport/patches/libloader-1.1.6-deprecated.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/external/jfreereport/patches/libloader-1.1.6-deprecated.patch b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch index c098906fcf70..79fa046fd099 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) + { |