summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorrbuj <robert.buj@gmail.com>2014-09-15 12:05:02 +0200
committerNoel Grandin <noelgrandin@gmail.com>2014-09-16 06:16:49 +0000
commitf93ce4f7eb90093d0ea3115d0a1c614612676dbd (patch)
tree53f334b0e2b1462e823ae5755667c409342601e0 /scripting
parent0b3b907e96a8bbc477b8755a5bcffc350c53ce2b (diff)
scripting: decode(String) in URLDecoder has been deprecated
http://docs.oracle.com/javase/1.5.0/docs/api/java/net/URLDecoder.html#decode(java.lang.String) Change-Id: I71ecb498c93d5e8d6959bdc3ab263a5ff48c1c21 Reviewed-on: https://gerrit.libreoffice.org/11453 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'scripting')
-rw-r--r--scripting/java/com/sun/star/script/framework/container/ParcelContainer.java19
1 files changed, 14 insertions, 5 deletions
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 0b41f28fd3cd..7a3a20cdfd78 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -174,12 +174,21 @@ public class ParcelContainer implements XNameAccess
// TODO handler package ParcelContainer?
if ( !containerUrl.startsWith( "vnd.sun.star.tdoc:" ) )
{
- // return name
- String decodedUrl = java.net.URLDecoder.decode( containerUrl );
- int indexOfSlash = decodedUrl.lastIndexOf('/');
- if ( indexOfSlash != -1 )
+ try
{
- name = decodedUrl.substring( indexOfSlash + 1 );
+ // return name
+ String decodedUrl = java.net.URLDecoder.decode( containerUrl, "UTF-8" );
+ int indexOfSlash = decodedUrl.lastIndexOf('/');
+ if ( indexOfSlash != -1 )
+ {
+ name = decodedUrl.substring( indexOfSlash + 1 );
+ }
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ com.sun.star.uno.RuntimeException e2 = new com.sun.star.uno.RuntimeException();
+ e2.initCause(e);
+ throw e2;
}
}
else