summaryrefslogtreecommitdiff
path: root/bean
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-08-20 16:17:13 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-08-20 16:34:39 +0100
commitf72ff01dd3af4dab11b6e8b9a2910553e802e2fe (patch)
tree4106d368cf2e1fa2e8d9a99c9ca972df82a74695 /bean
parentfa4966a15c02c435534662b51f45cac51728640d (diff)
Remove dead java code, fields and local variables
Change-Id: If777dcb0e0142229df737c2f1e3e6ecb61f64168
Diffstat (limited to 'bean')
-rw-r--r--bean/com/sun/star/beans/LocalOfficeConnection.java2
-rw-r--r--bean/com/sun/star/comp/beans/LocalOfficeConnection.java43
-rw-r--r--bean/qa/complex/bean/OOoBeanTest.java8
3 files changed, 1 insertions, 52 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java
index 6d81ac6ae918..15f025ac6738 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -33,7 +33,7 @@ import com.sun.star.lib.uno.helper.UnoUrl;
import com.sun.star.lib.util.NativeLibraryLoader;
/**
- * This class reprecents a connection to the local office application.
+ * This class represents a connection to the local office application.
* @deprecated
*/
public class LocalOfficeConnection
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 7ab8d88befc8..a1d51f6ae18d 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -50,8 +50,6 @@ public class LocalOfficeConnection
public static final String OFFICE_LIB_NAME = "officebean";
public static final String OFFICE_ID_SUFFIX = "_Office";
- private static String mProgramPath;
-
private Process mProcess;
private ContainerFactory mContainerFactory;
private XComponentContext mContext;
@@ -119,11 +117,6 @@ public class LocalOfficeConnection
}
//-------------------------------------------------------------------------
- // debugging method
- private void dbgPrint( String aMessage )
- {
- System.err.println( aMessage );
- }
/**
* Constructor.
@@ -182,7 +175,6 @@ public class LocalOfficeConnection
try
{
UnoUrl aURL = UnoUrl.parseUnoUrl( url );
- mProgramPath = null;
mConnType = aURL.getConnection();
mPipe = (String) aURL.getConnectionParameters().get( "pipe" );
mPort = (String) aURL.getConnectionParameters().get( "port" );
@@ -464,39 +456,6 @@ public class LocalOfficeConnection
/**
- * Retrives a path to the office program folder.
- *
- * @return The path to the office program folder.
- */
- static private String getProgramPath()
- {
- if (mProgramPath == null)
- {
- // determine name of executable soffice
- String aExec = OFFICE_APP_NAME; // default for UNIX
- String aOS = System.getProperty("os.name");
-
- // running on Windows?
- if (aOS.startsWith("Windows"))
- aExec = OFFICE_APP_NAME + ".exe";
-
- // add other non-UNIX operating systems here
- // ...
-
- // find soffice executable relative to this class's class loader:
- File path = NativeLibraryLoader.getResource(
- LocalOfficeConnection.class.getClassLoader(), aExec);
- if (path != null)
- mProgramPath = path.getParent();
-
- // default is ""
- if ( mProgramPath == null )
- mProgramPath = "";
- }
- return mProgramPath;
- }
-
- /**
* Parses a connection URL.
* This method accepts a UNO URL with following format:<br />
* <pre>
@@ -674,8 +633,6 @@ public class LocalOfficeConnection
"Invalid UNO connection URL.");
// Set up the connection parameters.
- if (path != null)
- mProgramPath = path;
if (pipe != null)
mPipe = pipe;
}
diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java
index 5ef755cf33a0..a64499363877 100644
--- a/bean/qa/complex/bean/OOoBeanTest.java
+++ b/bean/qa/complex/bean/OOoBeanTest.java
@@ -688,19 +688,11 @@ public class OOoBeanTest
}
public Dimension getPreferredSize()
{
- Container c = getParent();
return new Dimension(200, 200);
}
}
-
-
- private XMultiServiceFactory getMSF()
- {
- return(UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()));
- }
-
// setup and close connections
@BeforeClass public static void setUpConnection() throws Exception {
System.out.println("setUpConnection()");