summaryrefslogtreecommitdiff
path: root/bean/com/sun
diff options
context:
space:
mode:
authorRobert Antoni Buj i Gelonch <robert.buj@gmail.com>2014-09-16 18:15:12 +0200
committerNoel Grandin <noelgrandin@gmail.com>2014-09-17 06:11:13 +0000
commitbd21a82ea4c7499dd8401687f641d44a7593dc44 (patch)
tree2e54ac6d0f36ed03115c5669c48981666e929e08 /bean/com/sun
parentec2d5ac3718981b4d225ac831232ae4a8a7e498f (diff)
bean: encode(String) in URLEncoder has been deprecated
Change-Id: Ife3eaaaad199e79aeb6886a146324ffb145c7bc3 Reviewed-on: https://gerrit.libreoffice.org/11476 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'bean/com/sun')
-rw-r--r--bean/com/sun/star/beans/LocalOfficeConnection.java33
1 files changed, 26 insertions, 7 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java
index af2be37ad591..e972e2b9ca13 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -20,6 +20,7 @@ package com.sun.star.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;
@@ -72,7 +73,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;
+ }
// load libofficebean.so/officebean.dll
String aSharedLibName = getProgramPath() + java.io.File.separator +
@@ -525,12 +536,12 @@ public class LocalOfficeConnection
/** 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)
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( "%", "_" );
}
/**
@@ -547,10 +558,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;
}
/**