Kaydet (Commit) bd21a82e authored tarafından Robert Antoni Buj i Gelonch's avatar Robert Antoni Buj i Gelonch Kaydeden (comit) Noel Grandin

bean: encode(String) in URLEncoder has been deprecated

Change-Id: Ife3eaaaad199e79aeb6886a146324ffb145c7bc3
Reviewed-on: https://gerrit.libreoffice.org/11476Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst ec2d5ac3
...@@ -20,6 +20,7 @@ package com.sun.star.beans; ...@@ -20,6 +20,7 @@ package com.sun.star.beans;
import java.awt.Container; import java.awt.Container;
import java.io.File; import java.io.File;
import java.io.UnsupportedEncodingException;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -72,7 +73,17 @@ public class LocalOfficeConnection ...@@ -72,7 +73,17 @@ public class LocalOfficeConnection
setUnoUrl( "uno:pipe,name=" + getPipeName() + ";urp;StarOffice.ServiceManager" ); setUnoUrl( "uno:pipe,name=" + getPipeName() + ";urp;StarOffice.ServiceManager" );
} }
catch ( java.net.MalformedURLException e ) 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;
}
// load libofficebean.so/officebean.dll // load libofficebean.so/officebean.dll
String aSharedLibName = getProgramPath() + java.io.File.separator + String aSharedLibName = getProgramPath() + java.io.File.separator +
...@@ -525,12 +536,12 @@ public class LocalOfficeConnection ...@@ -525,12 +536,12 @@ public class LocalOfficeConnection
/** creates a unique pipe name. /** creates a unique pipe name.
*/ */
static String getPipeName() static String getPipeName() throws UnsupportedEncodingException
{ {
// turn user name into a URL and file system safe name (% chars will not work) // turn user name into a URL and file system safe name (% chars will not work)
String aPipeName = System.getProperty("user.name") + OFFICE_ID_SUFFIX; String aPipeName = System.getProperty("user.name") + OFFICE_ID_SUFFIX;
aPipeName = aPipeName.replace( "_", "%B7" ); aPipeName = aPipeName.replace( "_", "%B7" );
return java.net.URLEncoder.encode(aPipeName).replace( "\\+", "%20" ).replace( "%", "_" ); return java.net.URLEncoder.encode(aPipeName, "UTF-8").replace( "\\+", "%20" ).replace( "%", "_" );
} }
/** /**
...@@ -547,10 +558,18 @@ public class LocalOfficeConnection ...@@ -547,10 +558,18 @@ public class LocalOfficeConnection
*/ */
public String getIdentifier() public String getIdentifier()
{ {
if ( mPipe == null) String identifier = null;
return getPipeName(); try
else {
return mPipe; 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;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment