From 0b3b907e96a8bbc477b8755a5bcffc350c53ce2b Mon Sep 17 00:00:00 2001 From: rbuj Date: Sun, 14 Sep 2014 13:36:23 +0200 Subject: bean: encode(String) in URLEncoder has been deprecated Change-Id: Ib2be5d3369d6568056d47ad1da59bfa08c8ecd77 Reviewed-on: https://gerrit.libreoffice.org/11442 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- .../sun/star/comp/beans/LocalOfficeConnection.java | 35 +++++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'bean/com/sun') diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index e289fb143495..f1299cdfbaf4 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -20,6 +20,7 @@ package com.sun.star.comp.beans; import java.awt.Container; import java.io.File; +import java.io.UnsupportedEncodingException; import java.util.Iterator; import java.util.List; import java.util.ArrayList; @@ -131,7 +132,17 @@ public class LocalOfficeConnection setUnoUrl( "uno:pipe,name=" + getPipeName() + ";urp;StarOffice.ServiceManager" ); } catch ( java.net.MalformedURLException e ) - {} + { + com.sun.star.uno.RuntimeException e2 = new com.sun.star.uno.RuntimeException(); + e2.initCause(e); + throw e2; + } + catch ( UnsupportedEncodingException e) + { + com.sun.star.uno.RuntimeException e2 = new com.sun.star.uno.RuntimeException(); + e2.initCause(e); + throw e2; + } } /** @@ -632,12 +643,12 @@ public class LocalOfficeConnection /** creates a unique pipe name. */ - private static String getPipeName() + private static String getPipeName() throws UnsupportedEncodingException { // turn user name into a URL and file system safe name (% chars will not work) String aPipeName = System.getProperty("user.name") + OFFICE_ID_SUFFIX; aPipeName = aPipeName.replace( "_", "%B7" ); - return java.net.URLEncoder.encode(aPipeName).replace( "+", "%20" ).replace( "%", "_" ); + return java.net.URLEncoder.encode( aPipeName, "UTF-8" ).replace( "+", "%20" ).replace( "%", "_" ); } /** @@ -653,10 +664,18 @@ public class LocalOfficeConnection */ public String getIdentifier() { - if ( mPipe == null) - return getPipeName(); - else - return mPipe; + String identifier = null; + try + { + identifier = ( mPipe == null) ? getPipeName() : mPipe; + } + catch (UnsupportedEncodingException e) + { + com.sun.star.uno.RuntimeException e2 = new com.sun.star.uno.RuntimeException(); + e2.initCause(e); + throw e2; + } + return identifier; } /** @@ -706,7 +725,7 @@ public class LocalOfficeConnection // start process mProcess = Runtime.getRuntime().exec(cmdArray); if ( mProcess == null ) - throw new RuntimeException( "cannot start soffice: " + cmdArray ); + throw new com.sun.star.uno.RuntimeException( "cannot start soffice: " + cmdArray ); new StreamProcessor(mProcess.getInputStream(), System.out); new StreamProcessor(mProcess.getErrorStream(), System.err); } -- cgit v1.2.3