diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:54:39 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:54:39 +0000 |
| commit | 267c6f2ac71f92999e969232431ba04678e7437e (patch) | |
| tree | 358c9467650e1d0a1d7227a21dac2e3d08b622b2 /external/jfreereport/patches/libloader-1.1.6-deprecated.patch | |
| parent | Initial commit. (diff) | |
| download | libreoffice-267c6f2ac71f92999e969232431ba04678e7437e.tar.xz libreoffice-267c6f2ac71f92999e969232431ba04678e7437e.zip | |
Adding upstream version 4:24.2.0.upstream/4%24.2.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/jfreereport/patches/libloader-1.1.6-deprecated.patch')
| -rw-r--r-- | external/jfreereport/patches/libloader-1.1.6-deprecated.patch | 34 |
1 files changed, 34 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 new file mode 100644 index 0000000000..79fa046fd0 --- /dev/null +++ b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch @@ -0,0 +1,34 @@ +--- misc/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2010-04-27 16:07:00.000000000 +0200 ++++ misc/build/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2011-06-13 02:00:46.000000000 +0200 +@@ -42,7 +42,7 @@ + */ + public ResourceException(final String message, final Exception ex) + { +- super(message, ex); ++ super(message, (Throwable) ex); + } + + /** +--- 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) + { |