You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2021/03/11 23:17:57 UTC
[openoffice] branch AOO42X updated (084e071 -> 2210cea)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from 084e071 Fixed typos, removed whitespace
new 57df7a6 Removed whitespace, fixed typos, rebrand OOo->AOO in comments
new 2210cea Fixed typos, removed whitespace
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../com/sun/star/beans/JavaWindowPeerFake.java | 8 +-
.../com/sun/star/beans/LocalOfficeConnection.java | 127 +--
.../java/com/sun/star/beans/LocalOfficeWindow.java | 51 +-
.../java/com/sun/star/beans/NativeConnection.java | 11 +-
.../java/com/sun/star/beans/NativeService.java | 9 +-
.../main/java/com/sun/star/beans/OfficeWindow.java | 17 +-
.../com/sun/star/comp/beans/CallWatchThread.java | 1 +
.../com/sun/star/comp/beans/ContainerFactory.java | 1 +
.../java/com/sun/star/comp/beans/Controller.java | 34 +-
.../main/java/com/sun/star/comp/beans/Frame.java | 32 +-
.../star/comp/beans/HasConnectionException.java | 11 +-
.../star/comp/beans/InvalidArgumentException.java | 9 +-
.../sun/star/comp/beans/JavaWindowPeerFake.java | 1 +
.../sun/star/comp/beans/LocalOfficeConnection.java | 259 ++---
.../com/sun/star/comp/beans/LocalOfficeWindow.java | 117 +--
.../com/sun/star/comp/beans/NativeConnection.java | 1 +
.../com/sun/star/comp/beans/NativeService.java | 9 +-
.../sun/star/comp/beans/NoConnectionException.java | 13 +-
.../sun/star/comp/beans/NoDocumentException.java | 11 +-
.../main/java/com/sun/star/comp/beans/OOoBean.java | 1066 ++++++++++----------
.../com/sun/star/comp/beans/OfficeConnection.java | 1 +
.../com/sun/star/comp/beans/OfficeDocument.java | 42 +-
.../java/com/sun/star/comp/beans/OfficeWindow.java | 1 +
.../sun/star/comp/beans/SystemWindowException.java | 13 +-
.../main/java/com/sun/star/comp/beans/Wrapper.java | 29 +-
25 files changed, 938 insertions(+), 936 deletions(-)
[openoffice] 01/02: Removed whitespace, fixed typos,
rebrand OOo->AOO in comments
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 57df7a68a2f4b837a75e897b6cf225997b18d644
Author: mseidel <ms...@unknown>
AuthorDate: Tue Feb 12 15:17:52 2019 +0000
Removed whitespace, fixed typos, rebrand OOo->AOO in comments
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1853442 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 5cdb936d568d3ace068ebaa1873361a8085faeb8)
---
.../main/java/com/sun/star/comp/beans/OOoBean.java | 1067 ++++++++++----------
1 file changed, 531 insertions(+), 536 deletions(-)
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
index 9744d4d..a24ce7e 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -28,34 +28,34 @@ import com.sun.star.uno.UnoRuntime;
// @requirement FUNC.PERF.LRN/0.6
// @requirement FUNC.PERF.LOC/0.6
// @requirement FUNC.PERF.FIX/0.6
-/** This is the basic JavaBean for all OOo application modules.
-
- @requirement FUNC.RES.OTH/0.2
- No other resources are needed yet.
+/** This is the basic JavaBean for all AOO application modules.
- @since OOo 2.0.0
+ @requirement FUNC.RES.OTH/0.2
+ No other resources are needed yet.
+
+ @since OOo 2.0.0
*/
public class OOoBean
// @requirement FUNC.BEAN.VIEW/0.4
extends java.awt.Container
- implements
+ implements
// @requirement FUNC.PER/0.2
java.io.Externalizable
{
- // timeout values (milli secs)
+ // timeout values (milliseconds)
int nOOoStartTimeOut = 60000;
int nOOoCallTimeOut = 3000;
int nOOoCheckCycle = 1000;
- // This member contains the connection to an OOo instance if established.
+ // This member contains the connection to an AOO instance if established.
private transient OfficeConnection iConnection;
private transient EventListener xConnectionListener;
// @requirement FUNC.BEAN.VIEW/0.4
// @requirement FUNC.BEAN.EDIT/0.4
- // This member contains the OOo window
+ // This member contains the AOO window
// if a connection is established.
// It is a child of the OOoBean canvas.
private OfficeWindow xFrameWindow;
@@ -72,14 +72,13 @@ public class OOoBean
// slot command execution environment
private transient com.sun.star.frame.XDispatchProvider xDispatcher;
private transient com.sun.star.util.XURLTransformer xURLTransformer;
-
+
// properties
private boolean bIgnoreVisibility = false; // to show even if already visible
- private boolean bMenuBarVisible = true;
- private boolean bStandardBarVisible = true;
- private boolean bToolBarVisible = true;
- private boolean bStatusBarVisible = true;
-
+ private boolean bMenuBarVisible = true;
+ private boolean bStandardBarVisible = true;
+ private boolean bToolBarVisible = true;
+ private boolean bStatusBarVisible = true;
// debugging method
private void dbgPrint( String aMessage )
@@ -89,7 +88,7 @@ public class OOoBean
// @requirement FUNC.PER/0.2
/** @internal
- * @deprecated
+ * @deprecated
*/
public void writeExternal( java.io.ObjectOutput aObjOut )
{
@@ -98,7 +97,7 @@ public class OOoBean
// @requirement FUNC.PER/0.2
/** @internal
- * @deprecated
+ * @deprecated
*/
public void readExternal( java.io.ObjectInput aObjIn )
{
@@ -106,24 +105,24 @@ public class OOoBean
}
/** Generic constructor of the OOoBean.
-
- Neither a connection is established nor any document loaded.
+
+ Neither a connection is established nor any document loaded.
*/
public OOoBean()
{}
- // @requirement FUNC.CON.MULT/0.3
+ // @requirement FUNC.CON.MULT/0.3
/** Constructor for an OOoBean which uses a specific office connection.
-
- The connection must be established but no document is loaded.
-
- @throws NoConnectionException
- if the connection is not established.
-
- @deprecated Clients could use the getOOoConnection to obtain an OfficeConnection
- and use it as argument in a constructor for another OOoBean instance. Calling
- the dispose method of the OfficeConnection or the OOoBean's stopOOoConnection
- method would make all instances of OOoBean stop working.
+
+ The connection must be established but no document is loaded.
+
+ @throws NoConnectionException
+ if the connection is not established.
+
+ @deprecated Clients could use the getOOoConnection to obtain an OfficeConnection
+ and use it as argument in a constructor for another OOoBean instance. Calling
+ the dispose method of the OfficeConnection or the OOoBean's stopOOoConnection
+ method would make all instances of OOoBean stop working.
*/
public OOoBean( OfficeConnection iConnection )
throws NoConnectionException
@@ -133,36 +132,36 @@ public class OOoBean
{ /* impossible here */ }
}
- /** Sets the timeout for methods which launch OOo in milli seconds.
+ /** Sets the timeout for methods which launch AOO in milliseconds.
- This method does not need a connection to an OOo instance.
+ This method does not need a connection to an AOO instance.
*/
public void setOOoStartTimeOut( int nMilliSecs )
{
nOOoStartTimeOut = nMilliSecs;
}
- /** Sets the timeout for normal OOO methods calls in milli seconds.
+ /** Sets the timeout for normal AOO methods calls in milliseconds.
- This method does not need a connection to an OOo instance.
+ This method does not need a connection to an AOO instance.
*/
public void setOOoCallTimeOut( int nMilliSecs )
{
nOOoCallTimeOut = nMilliSecs;
}
- /** Sets the period length in milli seconds to check the OOo connection.
+ /** Sets the period length in milliseconds to check the AOO connection.
- This method does not need a connection to an OOo instance.
+ This method does not need a connection to an AOO instance.
*/
public void setOOoCheckCycle( int nMilliSecs )
{
nOOoCheckCycle = nMilliSecs;
}
- /** Sets the a connection to an OOo instance.
-
- @internal
+ /** Sets the a connection to an AOO instance.
+
+ @internal
*/
private synchronized void setOOoConnection( OfficeConnection iNewConnection )
throws HasConnectionException, NoConnectionException
@@ -189,7 +188,7 @@ public class OOoBean
}
// @requirement FUNC.CON.STRT/0.4
- /** Starts a connection to an OOo instance which is lauched if not running.
+ /** Starts a connection to an AOO instance which is launched if not running.
@throws HasConnectionException
if a connection was already established.
@@ -209,13 +208,13 @@ public class OOoBean
}
// @requirement FUNC.CON.CHK/0.7
- /** Returns true if this OOoBean is connected to an OOo instance,
- false otherwise.
-
- @deprecated This method is not useful in a multithreaded environment. Then
- all threads accessing the instance would have to be synchronized in order to
- make is method work. It is better
- to call OOoBean's methods and be prepared to catch a NoConnectionException.
+ /** Returns true if this OOoBean is connected to an AOO instance,
+ false otherwise.
+
+ @deprecated This method is not useful in a multithreaded environment. Then
+ all threads accessing the instance would have to be synchronized in order to
+ make is method work. It is better
+ to call OOoBean's methods and be prepared to catch a NoConnectionException.
*/
public boolean isOOoConnected()
{
@@ -223,17 +222,17 @@ public class OOoBean
}
// @requirement FUNC.CON.STOP/0.4
- /** Disconnects from the connected OOo instance.
+ /** Disconnects from the connected AOO instance.
If there was no connection yet or anymore, this method can be called
anyway.
-
- When the OOoBean is displayed in an applet by a web browser, then this
- method must be called from within java.applet.Applet.stop.
+
+ When the OOoBean is displayed in an applet by a web browser, then this
+ method must be called from within java.applet.Applet.stop.
*/
public synchronized void stopOOoConnection()
{
- // clear OOo document, frame etc.
+ // clear AOO document, frame etc.
clear();
// cut the connection
@@ -247,26 +246,26 @@ public class OOoBean
iConnection = null;
iExConnection.dispose();
}
-
+
}
// @requirement FUNC.CON.STOP/0.4 (via XComponent.dispose())
- // @requirement FUNC.CON.NTFY/0.4 (via XComponent.addEventListener())
- /** Returns the a connection to an OOo instance.
-
- If no connection exists, a default connection will be created. An OfficeConnection
- can be used to register listeners of type com.sun.star.lang.EventListener,
- which are notified when the connection to the
- office dies. One should not call the dispose method, because this may result
- in receiving com.sun.star.lang.DisposedExceptions when calling
- {@link #stopOOoConnection stopOOoConnection} or other API methods. If other instances share the
- same connection then they will stop function properly, because they loose their
- connection as well. The recommended way to end the connection is
- calling {@link #stopOOoConnection stopOOoConnection}.
+ // @requirement FUNC.CON.NTFY/0.4 (via XComponent.addEventListener())
+ /** Returns the a connection to an AOO instance.
+
+ If no connection exists, a default connection will be created. An OfficeConnection
+ can be used to register listeners of type com.sun.star.lang.EventListener,
+ which are notified when the connection to the
+ office dies. One should not call the dispose method, because this may result
+ in receiving com.sun.star.lang.DisposedExceptions when calling
+ {@link #stopOOoConnection stopOOoConnection} or other API methods. If other instances share the
+ same connection then they will stop function properly, because they loose their
+ connection as well. The recommended way to end the connection is
+ calling {@link #stopOOoConnection stopOOoConnection}.
@throws NoConnectionException
if no connection can be established
-
+
*/
public synchronized OfficeConnection getOOoConnection()
throws NoConnectionException
@@ -281,7 +280,7 @@ public class OOoBean
throw new NoConnectionException();
return iConnection;
}
-
+
/** Returns the service factory used by this OOoBean instance.
@throws NoConnectionException
@@ -300,8 +299,8 @@ public class OOoBean
{
com.sun.star.lang.XMultiComponentFactory aFactory =
iConn.getComponentContext().getServiceManager();
- xServiceFactory = (com.sun.star.lang.XMultiServiceFactory)
- UnoRuntime.queryInterface(
+ xServiceFactory = (com.sun.star.lang.XMultiServiceFactory)
+ UnoRuntime.queryInterface(
com.sun.star.lang.XMultiServiceFactory.class, aFactory );
}
};
@@ -310,13 +309,13 @@ public class OOoBean
catch ( java.lang.InterruptedException aExc )
{ throw new NoConnectionException(); }
if ( xServiceFactory == null )
- throw new NoConnectionException();
+ throw new NoConnectionException();
}
return xServiceFactory;
}
- /** Returns the XDesktop interface of the OOo instance used by this OOoBean.
+ /** Returns the XDesktop interface of the AOO instance used by this OOoBean.
@throws NoConnectionException
if no connection is established and no default connection can be established.
@@ -335,44 +334,44 @@ public class OOoBean
catch ( com.sun.star.uno.Exception aExc )
{} // TBD: what if no connection exists?
}
-
+
return xDesktop;
}
/** Resets this bean to an empty document.
-
- If a document is loaded and the content modified,
- the changes are dismissed. Otherwise nothing happens.
- This method is intended to be overridden in derived classes.
- This implementation simply calls clear.
+ If a document is loaded and the content modified,
+ the changes are dismissed. Otherwise nothing happens.
- @param bClearStateToo
- Not only the document content but also the state of the bean,
+ This method is intended to be overridden in derived classes.
+ This implementation simply calls clear.
+
+ @param bClearStateToo
+ Not only the document content but also the state of the bean,
like visibility of child components is cleared.
-
- @deprecated There is currently no way to dismiss changes, except for loading
- of the unchanged initial document. Furthermore it is unclear how derived classes
- handle this and what exactly their state is (e.g. what members make up their state).
- Calling this method on a derived class requires knowledge about their implementation.
- Therefore a deriving class should declare their own clearDocument if needed. Clients
- should call the clearDocument of the deriving class or {@link #clear} which discards
- the currently displayed document.
+
+ @deprecated There is currently no way to dismiss changes, except for loading
+ of the unchanged initial document. Furthermore it is unclear how derived classes
+ handle this and what exactly their state is (e.g. what members make up their state).
+ Calling this method on a derived class requires knowledge about their implementation.
+ Therefore a deriving class should declare their own clearDocument if needed. Clients
+ should call the clearDocument of the deriving class or {@link #clear} which discards
+ the currently displayed document.
*/
public synchronized void clearDocument( boolean bClearStateToo )
- throws
+ throws
com.sun.star.util.CloseVetoException,
NoConnectionException
{
// TBD
- clear();
+ clear();
}
- /** Resets the OOoBean to an empty status.
-
- Any loaded document is unloaded, no matter whether it is modified or not.
- After calling this method, the OOoBean has no office document and no frame
- anymore. The connection will stay, though.
+ /** Resets the OOoBean to an empty status.
+
+ Any loaded document is unloaded, no matter whether it is modified or not.
+ After calling this method, the OOoBean has no office document and no frame
+ anymore. The connection will stay, though.
This method works with or without an established connection.
*/
@@ -382,23 +381,23 @@ public class OOoBean
try
{
- CallWatchThread aCallWatchThread =
+ CallWatchThread aCallWatchThread =
new CallWatchThread( nOOoCallTimeOut, "clear" );
- //By closing the frame we avoid that dialogs are displayed, for example when
- //the document is modified.
- com.sun.star.util.XCloseable xCloseable = (com.sun.star.util.XCloseable)
- UnoRuntime.queryInterface( com.sun.star.util.XCloseable.class, aFrame );
- if ( xCloseable != null )
- {
- try
- {
- xCloseable.close(true);
- }
- catch (com.sun.star.util.CloseVetoException exc)
- { // a print job may be running
- }
- }
-
+ // By closing the frame we avoid that dialogs are displayed, for example when
+ // the document is modified.
+ com.sun.star.util.XCloseable xCloseable = (com.sun.star.util.XCloseable)
+ UnoRuntime.queryInterface( com.sun.star.util.XCloseable.class, aFrame );
+ if ( xCloseable != null )
+ {
+ try
+ {
+ xCloseable.close(true);
+ }
+ catch (com.sun.star.util.CloseVetoException exc)
+ { // a print job may be running
+ }
+ }
+
aDocument = null;
xDispatcher = null;
aFrame = null;
@@ -421,7 +420,7 @@ public class OOoBean
try
{
com.sun.star.lang.XComponent xComp = (com.sun.star.lang.XComponent)
- UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.lang.XComponent.class, xURLTransformer );
if ( xComp != null )
xComp.dispose();
@@ -433,7 +432,7 @@ public class OOoBean
xDesktop = null;
xServiceFactory = null;
-
+
aCallWatchThread.cancel();
}
catch ( java.lang.InterruptedException aExc )
@@ -443,28 +442,28 @@ public class OOoBean
// @requirement FUNC.PAR.LWP/0.4
/** This method causes the office window to be displayed.
- If no document is loaded and the instance is added to a Java container that
- is showing, then this method needs not to be called. If later one of the methods
- {@link #loadFromURL loadFromURL}, {@link #loadFromStream loadFromStream1},
- or {@link #loadFromByteArray loadFromByteArray}
- is called, then the document is automatically displayed.
-
- Should one of the load methods have been called before the Java container
- was showing, then this method needs to be called after the container window
- was made visible (java.lang.Component.setVisible(true)).
- <p>
- Another scenario is that a OOoBean contains a document and is removed
- from a Java container and later added again. Then aquireSystemWindow needs
- to be called after the container window is displayed.
-
- @throws SystemWindowException
- if no system window can be acquired.
-
- @throws NoConnectionException
- if the connection is not established.
+ If no document is loaded and the instance is added to a Java container that
+ is showing, then this method needs not to be called. If later one of the methods
+ {@link #loadFromURL loadFromURL}, {@link #loadFromStream loadFromStream1},
+ or {@link #loadFromByteArray loadFromByteArray}
+ is called, then the document is automatically displayed.
+
+ Should one of the load methods have been called before the Java container
+ was showing, then this method needs to be called after the container window
+ was made visible (java.lang.Component.setVisible(true)).
+ <p>
+ Another scenario is that a OOoBean contains a document and is removed
+ from a Java container and later added again. Then aquireSystemWindow needs
+ to be called after the container window is displayed.
+
+ @throws SystemWindowException
+ if no system window can be acquired.
+
+ @throws NoConnectionException
+ if the connection is not established.
*/
public synchronized void aquireSystemWindow()
- throws
+ throws
SystemWindowException,
// @requirement FUNC.CON.LOST/0.2
@@ -479,28 +478,28 @@ public class OOoBean
xFrameWindow.getAWTComponent().setVisible(true);
doLayout();
}
-
+
// @requirement FUNC.PAR.RWL/0.4
// @estimation 16h
/** This method must be called when the OOoBean before the
- system window may be released by it's parent AWT/Swing component.
+ system window may be released by it's parent AWT/Swing component.
- This is the case when java.awt.Component.isDisplayable() returns
- true. This is definitely the case when the OOoBean is removed
- from it's parent container.
+ This is the case when java.awt.Component.isDisplayable() returns
+ true. This is definitely the case when the OOoBean is removed
+ from it's parent container.
- @throws SystemWindowException
- if system window is not acquired.
+ @throws SystemWindowException
+ if system window is not acquired.
- @throws NoConnectionException
- if the connection is not established.
-
- @deprecated When Component.removeNotify of the parent window of the actual
- office window is called, then the actions are performed for which this method
- needed to be called previously.
+ @throws NoConnectionException
+ if the connection is not established.
+
+ @deprecated When Component.removeNotify of the parent window of the actual
+ office window is called, then the actions are performed for which this method
+ needed to be called previously.
*/
public synchronized void releaseSystemWindow()
- throws
+ throws
SystemWindowException,
// @requirement FUNC.CON.LOST/0.2
@@ -511,55 +510,55 @@ public class OOoBean
try { xFrameWindow.getAWTComponent().setVisible(false); }
catch ( com.sun.star.lang.DisposedException aExc )
- { throw new NoConnectionException(); }
+ { throw new NoConnectionException(); }
}
-
- // @requirement FUNC.BEAN.LOAD/0.4
- // @requirement FUNC.CON.AUTO/0.3
+
+ // @requirement FUNC.BEAN.LOAD/0.4
+ // @requirement FUNC.CON.AUTO/0.3
/** Loads the bean from the given URL.
-
- If a document is already loaded and the content modified,
- the changes are dismissed.
- If no connection exists, a default connection is established.
+ If a document is already loaded and the content modified,
+ the changes are dismissed.
- @throws IllegalArgumentException
- if either of the arguments is out of the specified range.
+ If no connection exists, a default connection is established.
- @throws java.io.IOException
- if an IO error occurs reading the ressource specified by the URL.
+ @throws IllegalArgumentException
+ if either of the arguments is out of the specified range.
- @throws com.sun.star.lang.NoConnectionException
- if no connection can be established.
-
- @throws com.sun.star.util.CloseVetoException
- if the currently displayed document cannot be closed because it is
- still be used, for example it is printed.
+ @throws java.io.IOException
+ if an IO error occurs reading the resource specified by the URL.
+
+ @throws com.sun.star.lang.NoConnectionException
+ if no connection can be established.
+
+ @throws com.sun.star.util.CloseVetoException
+ if the currently displayed document cannot be closed because it is
+ still be used, for example it is printed.
*/
- public void loadFromURL(
- final String aURL,
+ public void loadFromURL(
+ final String aURL,
final com.sun.star.beans.PropertyValue aArguments[] )
- throws
+ throws
// @requirement FUNC.CON.LOST/0.2
NoConnectionException,
- java.io.IOException,
+ java.io.IOException,
com.sun.star.lang.IllegalArgumentException,
- com.sun.star.util.CloseVetoException
+ com.sun.star.util.CloseVetoException
{
dbgPrint( "loadFromURL()" );
// try loading
- try
+ try
{
boolean bLoaded = false;
while ( !bLoaded )
{
- // watch loading in a thread with a timeout (if OOo hangs)
- CallWatchThread aCallWatchThread =
+ // watch loading in a thread with a timeout (if AOO hangs)
+ CallWatchThread aCallWatchThread =
new CallWatchThread( nOOoStartTimeOut, "loadFromURL" );
try
{
- // get window from OOo on demand
+ // get window from AOO on demand
if ( xFrameWindow == null )
{
// Establish the connection by request of the ServiceFactory.
@@ -573,88 +572,88 @@ public class OOoBean
add( xFrameWindow.getAWTComponent() );
}
- // create the document frame from UNO window.
+ // create the document frame from UNO window.
if ( aFrame == null )
{
// create the frame
- com.sun.star.awt.XWindow xWindow =
+ com.sun.star.awt.XWindow xWindow =
(com.sun.star.awt.XWindow) UnoRuntime.queryInterface(
com.sun.star.awt.XWindow.class, xFrameWindow.getUNOWindowPeer());
Object xFrame = xServiceFactory.createInstance( "com.sun.star.frame.Frame");
- aFrame = new Frame( (com.sun.star.frame.XFrame)UnoRuntime.queryInterface(
+ aFrame = new Frame( (com.sun.star.frame.XFrame)UnoRuntime.queryInterface(
com.sun.star.frame.XFrame.class, xFrame ) );
aFrame.initialize( xWindow );
aFrame.setName( aFrame.toString() );
// register the frame at the desktop
- com.sun.star.frame.XFrames xFrames =
- ( (com.sun.star.frame.XFramesSupplier)UnoRuntime.queryInterface(
+ com.sun.star.frame.XFrames xFrames =
+ ( (com.sun.star.frame.XFramesSupplier)UnoRuntime.queryInterface(
com.sun.star.frame.XFramesSupplier.class, getOOoDesktop() ) ).getFrames();
xFrames.append( aFrame );
}
// Initializes the slot command execution environment.
xURLTransformer = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface(
- com.sun.star.util.XURLTransformer.class,
+ com.sun.star.util.XURLTransformer.class,
xServiceFactory.createInstance( "com.sun.star.util.URLTransformer") );
- try
- {
- xDispatcher = UnoRuntime.queryInterface(com.sun.star.frame.XDispatchProvider.class, aFrame);
- }
- catch (Exception e)
- {
- /*ignore!*/
- }
+ try
+ {
+ xDispatcher = UnoRuntime.queryInterface(com.sun.star.frame.XDispatchProvider.class, aFrame);
+ }
+ catch (Exception e)
+ {
+ /* ignore! */
+ }
// get XComponentLoader from frame
com.sun.star.frame.XComponentLoader xLoader = (com.sun.star.frame.XComponentLoader)
UnoRuntime.queryInterface( com.sun.star.frame.XComponentLoader.class, aFrame );
if ( xLoader == null )
{
- throw new java.lang.RuntimeException(
- "com.sun.star.frame.Frame(" + aFrame +
+ throw new java.lang.RuntimeException(
+ "com.sun.star.frame.Frame(" + aFrame +
") without com.sun.star.frame.XComponentLoader" );
}
// Avoid Dialog 'Document changed' while reloading
if ( aDocument != null )
{
- try {
- aDocument.setModified(false);
- } catch (com.sun.star.beans.PropertyVetoException ep) {
- //it dosn't make sense to throw the exception here. The interface does not
- //offer a way to add/remove respective listeners.
- } catch (com.sun.star.lang.DisposedException ed) {
- // can be disposed if user closed document via UI
- }
-
- com.sun.star.frame.XController xOldController = null;
+ try {
+ aDocument.setModified(false);
+ } catch (com.sun.star.beans.PropertyVetoException ep) {
+ // it doesn't make sense to throw the exception here. The interface does not
+ // offer a way to add/remove respective listeners.
+ } catch (com.sun.star.lang.DisposedException ed) {
+ // can be disposed if user closed document via UI
+ }
+
+ com.sun.star.frame.XController xOldController = null;
if ( aFrame != null )
xOldController = aFrame.getController();
-
- try
+
+ try
{
if ( aFrame != null && xOldController != null )
if (xOldController.suspend(true) == false)
- throw new com.sun.star.util.CloseVetoException(
- "Dokument is still being used and cannot be closed.", this);
-
- }
- catch (java.lang.IllegalStateException exp)
+ throw new com.sun.star.util.CloseVetoException(
+ "Document is still being used and cannot be closed.", this);
+
+ }
+ catch (java.lang.IllegalStateException exp)
{}
}
-
+
// load the document.
- com.sun.star.beans.PropertyValue aArgs[] =
- addArgument( aArguments, new com.sun.star.beans.PropertyValue(
- "MacroExecutionMode", -1,
+ com.sun.star.beans.PropertyValue aArgs[] =
+ addArgument( aArguments, new com.sun.star.beans.PropertyValue(
+ "MacroExecutionMode", -1,
com.sun.star.document.MacroExecMode.USE_CONFIG,
com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
//String fn = aFRame.getName();
-
- com.sun.star.lang.XComponent xComponent = xLoader.loadComponentFromURL(
+
+ com.sun.star.lang.XComponent xComponent = xLoader.loadComponentFromURL(
aURL, /*aFrame.getName()*/"_self", 0, aArgs );
// nothing loaded?
@@ -672,7 +671,7 @@ public class OOoBean
// mDocumentURL = aURL; TBD: still needed?
// Get document's XModifiable interface if any.
- aDocument = new OfficeDocument(
+ aDocument = new OfficeDocument(
(com.sun.star.frame.XModel) UnoRuntime.queryInterface(
com.sun.star.frame.XModel.class, xComponent ) );
bLoaded = true;
@@ -696,9 +695,9 @@ public class OOoBean
aCallWatchThread.cancel();
if ( xServiceFactory == null )
- throw new NoConnectionException();
+ throw new NoConnectionException();
}
- if ( iConnection == null )
+ if ( iConnection == null )
{
throw new NoConnectionException();
}
@@ -706,56 +705,56 @@ public class OOoBean
applyToolVisibilities();
}
catch ( java.lang.InterruptedException aExc )
- {
+ {
throw new NoConnectionException();
}
}
/** Loads a document from a Java stream.
-
- See loadFromURL() for further information.
+
+ See loadFromURL() for further information.
*/
- public void loadFromStream(
+ public void loadFromStream(
final java.io.InputStream iInStream,
final com.sun.star.beans.PropertyValue aArguments[] )
- throws
+ throws
// @requirement FUNC.CON.LOST/0.2
NoConnectionException,
- java.io.IOException,
+ java.io.IOException,
com.sun.star.lang.IllegalArgumentException,
- com.sun.star.util.CloseVetoException
+ com.sun.star.util.CloseVetoException
{
// wrap Java stream into UNO stream
- /*
- com.sun.star.io.XInputStream xStream =
+ /*
+ com.sun.star.io.XInputStream xStream =
new com.sun.star.lib.uno.adapter.InputStreamToXInputStreamAdapter(
iInStream );
- */
- // copy stream....
-
- int s = 4096;
- int r=0 ,n = 0;
- byte[] buffer = new byte[s];
- byte[] newBuffer = null;
- while ((r = iInStream.read(buffer, n, buffer.length-n))>0) {
- n += r;
- if (iInStream.available() > buffer.length - n) {
- newBuffer = new byte[buffer.length*2];
- System.arraycopy(buffer, 0, newBuffer, 0, n);
- buffer = newBuffer;
- }
- }
- if (buffer.length != n) {
- newBuffer = new byte[n];
- System.arraycopy(buffer, 0, newBuffer, 0, n);
- buffer = newBuffer;
- }
- com.sun.star.io.XInputStream xStream =
- new com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter(buffer);
-
+ */
+ // copy stream...
+
+ int s = 4096;
+ int r=0 ,n = 0;
+ byte[] buffer = new byte[s];
+ byte[] newBuffer = null;
+ while ((r = iInStream.read(buffer, n, buffer.length-n))>0) {
+ n += r;
+ if (iInStream.available() > buffer.length - n) {
+ newBuffer = new byte[buffer.length*2];
+ System.arraycopy(buffer, 0, newBuffer, 0, n);
+ buffer = newBuffer;
+ }
+ }
+ if (buffer.length != n) {
+ newBuffer = new byte[n];
+ System.arraycopy(buffer, 0, newBuffer, 0, n);
+ buffer = newBuffer;
+ }
+ com.sun.star.io.XInputStream xStream =
+ new com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter(buffer);
+
// add stream to arguments
- com.sun.star.beans.PropertyValue[] aExtendedArguments =
- addArgument( aArguments, new com.sun.star.beans.PropertyValue(
+ com.sun.star.beans.PropertyValue[] aExtendedArguments =
+ addArgument( aArguments, new com.sun.star.beans.PropertyValue(
"InputStream", -1, xStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
// call normal load method
@@ -763,27 +762,27 @@ public class OOoBean
}
/** Loads a document from a byte array.
-
- See loadFromURL() for further information.
+
+ See loadFromURL() for further information.
*/
- public void loadFromByteArray(
+ public void loadFromByteArray(
final byte aInBuffer[],
final com.sun.star.beans.PropertyValue aArguments[] )
- throws
+ throws
// @requirement FUNC.CON.LOST/0.2
NoConnectionException,
- java.io.IOException,
+ java.io.IOException,
com.sun.star.lang.IllegalArgumentException,
- com.sun.star.util.CloseVetoException
+ com.sun.star.util.CloseVetoException
{
- // wrap byte arrray into UNO stream
- com.sun.star.io.XInputStream xStream =
+ // wrap byte array into UNO stream
+ com.sun.star.io.XInputStream xStream =
new com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter(
aInBuffer );
-
+
// add stream to arguments
- com.sun.star.beans.PropertyValue[] aExtendedArguments =
- addArgument( aArguments, new com.sun.star.beans.PropertyValue(
+ com.sun.star.beans.PropertyValue[] aExtendedArguments =
+ addArgument( aArguments, new com.sun.star.beans.PropertyValue(
"InputStream", -1, xStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
// call normal load method
@@ -791,41 +790,41 @@ public class OOoBean
}
/** Stores a document to the given URL.
- <p>
- Due due a bug (50651) calling this method may cause the office to crash,
- when at the same time the office writes a backup of the document. This bug
- also affects {@link #storeToByteArray storeToByteArray} and
- {@link #storeToStream storeToStream}. The workaround
- is to start the office with the option -norestore, which disables the automatic
- backup and recovery mechanism. OOoBean offers currently no supported way of providing
- startup options for OOo. But it is possible to set a Java property when starting
- Java, which is examined by OOoBean:
- <pre>
- java -Dcom.sun.star.officebean.Options=-norestore ...
- </pre>
- It is planned to offer a way of specifying startup options in a future version.
- The property can be used until then. When using this property only one option
- can be provided.
-
- @throws IllegalArgumentException
- if either of the arguments is out of the specified range.
-
- @throws java.io.IOException
- if an IO error occurs reading the ressource specified by the URL.
-
- @throws com.sun.star.lang.NoConnectionException
- if no connection is established.
+ <p>
+ Due due a bug (50651) calling this method may cause the office to crash,
+ when at the same time the office writes a backup of the document. This bug
+ also affects {@link #storeToByteArray storeToByteArray} and
+ {@link #storeToStream storeToStream}. The workaround
+ is to start the office with the option -norestore, which disables the automatic
+ backup and recovery mechanism. OOoBean offers currently no supported way of providing
+ startup options for AOO. But it is possible to set a Java property when starting
+ Java, which is examined by OOoBean:
+ <pre>
+ java -Dcom.sun.star.officebean.Options=-norestore ...
+ </pre>
+ It is planned to offer a way of specifying startup options in a future version.
+ The property can be used until then. When using this property only one option
+ can be provided.
+
+ @throws IllegalArgumentException
+ if either of the arguments is out of the specified range.
+
+ @throws java.io.IOException
+ if an IO error occurs reading the resource specified by the URL.
+
+ @throws com.sun.star.lang.NoConnectionException
+ if no connection is established.
@throws NoDocumentException
- if no document is loaded
+ if no document is loaded
*/
- public void storeToURL(
+ public void storeToURL(
final String aURL,
final com.sun.star.beans.PropertyValue aArguments[] )
- throws
+ throws
// @requirement FUNC.CON.LOST/0.2
NoConnectionException,
- java.io.IOException,
+ java.io.IOException,
com.sun.star.lang.IllegalArgumentException,
NoDocumentException
{
@@ -836,7 +835,7 @@ public class OOoBean
try
{
// start runtime timeout
- CallWatchThread aCallWatchThread =
+ CallWatchThread aCallWatchThread =
new CallWatchThread( nOOoCallTimeOut, "storeToURL" );
// store the document
@@ -852,18 +851,18 @@ public class OOoBean
}
/** Stores a document to a stream.
-
- See {@link #storeToURL storeToURL} for further information.
- @see #storeToURL storeToURL
+
+ See {@link #storeToURL storeToURL} for further information.
+ @see #storeToURL storeToURL
*/
- public java.io.OutputStream storeToStream(
+ public java.io.OutputStream storeToStream(
java.io.OutputStream aOutStream,
final com.sun.star.beans.PropertyValue aArguments[] )
- throws
+ throws
// @requirement FUNC.CON.LOST/0.2
NoConnectionException,
NoDocumentException,
- java.io.IOException,
+ java.io.IOException,
com.sun.star.lang.IllegalArgumentException
{
@@ -871,10 +870,10 @@ public class OOoBean
com.sun.star.lib.uno.adapter.OutputStreamToXOutputStreamAdapter aStream =
new com.sun.star.lib.uno.adapter.OutputStreamToXOutputStreamAdapter(
aOutStream );
-
+
// add stream to arguments
- com.sun.star.beans.PropertyValue[] aExtendedArguments =
- addArgument( aArguments, new com.sun.star.beans.PropertyValue(
+ com.sun.star.beans.PropertyValue[] aExtendedArguments =
+ addArgument( aArguments, new com.sun.star.beans.PropertyValue(
"OutputStream", -1, aStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
// call normal store method
@@ -892,28 +891,28 @@ public class OOoBean
}
/** Stores a document to a byte array.
-
- See {@link #storeToURL storeToURL} for further information.
- @see #storeToURL storeToURL
+
+ See {@link #storeToURL storeToURL} for further information.
+ @see #storeToURL storeToURL
*/
- public byte[] storeToByteArray(
+ public byte[] storeToByteArray(
byte aOutBuffer[],
final com.sun.star.beans.PropertyValue aArguments[] )
- throws
+ throws
// @requirement FUNC.CON.LOST/0.2
NoConnectionException,
NoDocumentException,
- java.io.IOException,
+ java.io.IOException,
com.sun.star.lang.IllegalArgumentException
{
- // wrap byte arrray into UNO stream
+ // wrap byte array into UNO stream
com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter aStream =
new com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter(
aOutBuffer );
-
+
// add stream to arguments
- com.sun.star.beans.PropertyValue[] aExtendedArguments =
- addArgument( aArguments, new com.sun.star.beans.PropertyValue(
+ com.sun.star.beans.PropertyValue[] aExtendedArguments =
+ addArgument( aArguments, new com.sun.star.beans.PropertyValue(
"OutputStream", -1, aStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
// call normal store method
@@ -932,43 +931,43 @@ public class OOoBean
// @requirement FUNC.BEAN.PROG/0.5
// @requirement API.SIM.SEAP/0.2
- /** returns the <type scope="com::sun::star::frame">Frame</a>
- of the bean.
-
- @returns
- a Java class which implements all interfaces which the service
+ /** returns the <type scope="com::sun::star::frame">Frame</a>
+ of the bean.
+
+ @returns
+ a Java class which implements all interfaces which the service
<type scope="com::sun::star::frame">Frame</a> implements.
Thus, methods can be called directly without queryInterface.
- This feature might be implemented by UNO or explicitely coded.
+ This feature might be implemented by UNO or explicitly coded.
- @throws NoConnectionException
- if the connection is not established.
+ @throws NoConnectionException
+ if the connection is not established.
- @throws NotDocumentException
- if no document is loaded an thus no frame is available.
+ @throws NotDocumentException
+ if no document is loaded an thus no frame is available.
*/
public Frame getFrame()
- throws
+ throws
NoConnectionException // @requirement FUNC.CON.LOST/0.2
{
if ( iConnection == null )
throw new NoConnectionException();
- return aFrame;
+ return aFrame;
}
- // @requirement FUNC.BEAN.PROG/0.5
- // @requirement API.SIM.SEAP/0.2
+ // @requirement FUNC.BEAN.PROG/0.5
+ // @requirement API.SIM.SEAP/0.2
/** returns the <type scope="com::sun::star::frame::Controller"> of the bean.
- @returns
- a Java class which implements all interfaces which the service
+ @returns
+ a Java class which implements all interfaces which the service
<type scope="com::sun::star::frame">Controller</a> implements.
Thus, methods can be called directly without queryInterface.
- This feature might be implemented by UNO or explicitely coded.
+ This feature might be implemented by UNO or explicitly coded.
- @throws NoConnectionException
- if the connection is not established.
+ @throws NoConnectionException
+ if the connection is not established.
*/
public Controller getController()
@@ -982,60 +981,60 @@ public class OOoBean
return aController;
}
- // @requirement FUNC.BEAN.PROG/0.5
- // @requirement FUNC.BEAN.STOR/0.4
- // @requirement FUNC.BEAN.PRNT/0.4
- // @requirement API.SIM.SEAP/0.2
- /** returns the <type scope="com::sun::star::document::OfficeDocument">
- of the bean.
+ // @requirement FUNC.BEAN.PROG/0.5
+ // @requirement FUNC.BEAN.STOR/0.4
+ // @requirement FUNC.BEAN.PRNT/0.4
+ // @requirement API.SIM.SEAP/0.2
+ /** returns the <type scope="com::sun::star::document::OfficeDocument">
+ of the bean.
- @returns
- a Java class which implements all interfaces which the service
- <type scope="com::sun::star::document">OfficeDocument</a>
+ @returns
+ a Java class which implements all interfaces which the service
+ <type scope="com::sun::star::document">OfficeDocument</a>
implements.
Thus, methods can be called directly without queryInterface.
- This feature might be implemented by UNO or explicitely coded.
+ This feature might be implemented by UNO or explicitly coded.
- @throws NoConnectionException
- if the connection is not established.
+ @throws NoConnectionException
+ if the connection is not established.
*/
- public OfficeDocument getDocument()
+ public OfficeDocument getDocument()
// @requirement FUNC.CON.LOST/0.2
throws NoConnectionException
{
if ( iConnection == null )
throw new NoConnectionException();
- return aDocument;
+ return aDocument;
}
- /** Sets visibility of all tool bars known by this OOoBean version.
-
- Initially all tool bars are visible. By hiding all tool bars
- utilizing this method, it is possible to turn just a subset of
- tool bars on afterwards, no matter whether all available tool
+ /** Sets visibility of all tool bars known by this OOoBean version.
+
+ Initially all tool bars are visible. By hiding all tool bars
+ utilizing this method, it is possible to turn just a subset of
+ tool bars on afterwards, no matter whether all available tool
bars are known or not.
- <p>
- If an older OOoBean instance is used with a newer OOo instance,
+ <p>
+ If an older OOoBean instance is used with a newer AOO instance,
some tool bars might not be affected by this method.
- <p>
+ <p>
If no connection is established or no document is loaded,
- the setting is memorized until a document is loaded. Same
+ the setting is memorized until a document is loaded. Same
is valid when the connection dies within this function call.
-
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. For example:
- <pre>
-com.sun.star.beans.XPropertySet xPropSet =
+
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. For example:
+ <pre>
+com.sun.star.beans.XPropertySet xPropSet =
(com.sun.star.beans.XPropertySet) UnoRuntime.queryInterface(
- com.sun.star.beans.XPropertySet.class, aFrame );
-com.sun.star.frame.XLayoutManager xLayoutManager =
+ com.sun.star.beans.XPropertySet.class, aFrame );
+com.sun.star.frame.XLayoutManager xLayoutManager =
(com.sun.star.frame.XLayoutManager) UnoRuntime.queryInterface(
- com.sun.star.frame.XLayoutManager.class,
- xPropSet.getPropertyValue( "LayoutManager" ) );
+ com.sun.star.frame.XLayoutManager.class,
+ xPropSet.getPropertyValue( "LayoutManager" ) );
xLayoutManager.showElement("private:resource/menubar/menubar");
- </pre>
- */
+ </pre>
+ */
public void setAllBarsVisible( boolean bVisible )
{
bIgnoreVisibility = true;
@@ -1047,12 +1046,12 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
}
//--------------------------------------------------------------------------
- /** Applies all tool visiblities to the real thing.
-
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. See also
- {@link #setAllBarsVisible setAllBarsVisible}.
- */
+ /** Applies all tool visibilities to the real thing.
+
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. See also
+ {@link #setAllBarsVisible setAllBarsVisible}.
+ */
protected void applyToolVisibilities()
throws
java.lang.InterruptedException
@@ -1065,24 +1064,24 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
bIgnoreVisibility = false;
}
- /** Helper method to set tool bar visibilty.
-
- @param bnewValue
+ /** Helper method to set tool bar visibility.
+
+ @param bnewValue
If false, the tool bar is disabled,
If true, the tool bar is visible.
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. See also
- {@link #setAllBarsVisible}.
- */
- protected boolean setToolVisible( String aProperty, String aResourceURL,
- boolean bOldValue, boolean bNewValue )
-
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. See also
+ {@link #setAllBarsVisible}.
+ */
+ protected boolean setToolVisible( String aProperty, String aResourceURL,
+ boolean bOldValue, boolean bNewValue )
+
throws
java.lang.InterruptedException
- {
+ {
// start runtime timeout
- CallWatchThread aCallWatchThread =
+ CallWatchThread aCallWatchThread =
new CallWatchThread( nOOoCallTimeOut, "setToolVisible" );
// Does a frame exist?
@@ -1090,32 +1089,32 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
{
if ( bIgnoreVisibility || bOldValue != bNewValue )
{
- try
+ try
{
- com.sun.star.beans.XPropertySet xPropSet =
+ com.sun.star.beans.XPropertySet xPropSet =
(com.sun.star.beans.XPropertySet) UnoRuntime.queryInterface(
com.sun.star.beans.XPropertySet.class, aFrame );
- com.sun.star.frame.XLayoutManager xLayoutManager =
+ com.sun.star.frame.XLayoutManager xLayoutManager =
(com.sun.star.frame.XLayoutManager) UnoRuntime.queryInterface(
- com.sun.star.frame.XLayoutManager.class,
+ com.sun.star.frame.XLayoutManager.class,
xPropSet.getPropertyValue( "LayoutManager" ) );
if ( bNewValue )
xLayoutManager.showElement( aResourceURL );
else
xLayoutManager.hideElement( aResourceURL );
}
- catch ( com.sun.star.beans.UnknownPropertyException aExc )
+ catch ( com.sun.star.beans.UnknownPropertyException aExc )
{
throw new RuntimeException( "not layout manager found" );
}
- catch ( com.sun.star.lang.WrappedTargetException aExc )
+ catch ( com.sun.star.lang.WrappedTargetException aExc )
{
throw new RuntimeException( "not layout manager found" );
}
// notify change
firePropertyChange( aProperty, bOldValue, bNewValue );
- }
+ }
}
// end runtime timeout
@@ -1125,193 +1124,193 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
return bNewValue;
}
- /** Sets the visibility of the menu bar.
-
+ /** Sets the visibility of the menu bar.
+
Initially the menu bar is visible.
- <p>
- If not connected or no document loaded, the value is stored
+ <p>
+ If not connected or no document loaded, the value is stored
and automatically applied to the document after it is loaded.
Same is valid when the connection dies within this function call.
- @param bVisible
+ @param bVisible
If false, the menu bar is disabled,
If true, the menu bar is visible.
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. See also
- {@link #setAllBarsVisible}.
- */
- public void setMenuBarVisible(boolean bVisible)
- {
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. See also
+ {@link #setAllBarsVisible}.
+ */
+ public void setMenuBarVisible(boolean bVisible)
+ {
try
{
- bMenuBarVisible = setToolVisible( "MenuBarVisible",
- "private:resource/menubar/menubar", bMenuBarVisible, bVisible );
+ bMenuBarVisible = setToolVisible( "MenuBarVisible",
+ "private:resource/menubar/menubar", bMenuBarVisible, bVisible );
}
catch ( java.lang.InterruptedException aExc )
- {
- bMenuBarVisible = bVisible;
- }
+ {
+ bMenuBarVisible = bVisible;
+ }
}
- /** Returns the visibility of the menu bar.
-
- This method works independently from a connetion or loaded document.
+ /** Returns the visibility of the menu bar.
+
+ This method works independently from a connection or loaded document.
If no connection is established or no document is loaded,
this method just returns a memorized status.
- @return
+ @return
True if the menu bar is visible,
false if the menu bar is hidden.
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. See also
- {@link #setAllBarsVisible}.
- */
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. See also
+ {@link #setAllBarsVisible}.
+ */
public boolean isMenuBarVisible()
{
return bMenuBarVisible;
}
- /** Sets the main function bar visibilty.
-
+ /** Sets the main function bar visibility.
+
Initially the standard bar is visible.
-
- If not connected or no document loaded, the value is stored
+
+ If not connected or no document loaded, the value is stored
and automatically applied to the document after it is loaded.
Same is valid when the connection dies within this function call.
-
- @param bVisible
+
+ @param bVisible
If false, the main function bar is disabled,
If true, the main function bar is visible.
-
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. See also
- {@link #setAllBarsVisible}.
- */
- public void setStandardBarVisible(boolean bVisible)
- {
+
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. See also
+ {@link #setAllBarsVisible}.
+ */
+ public void setStandardBarVisible(boolean bVisible)
+ {
try
{
- bStandardBarVisible = setToolVisible( "StandardBarVisible",
- "private:resource/toolbar/standardbar", bStandardBarVisible, bVisible );
+ bStandardBarVisible = setToolVisible( "StandardBarVisible",
+ "private:resource/toolbar/standardbar", bStandardBarVisible, bVisible );
}
catch ( java.lang.InterruptedException aExc )
- {
- bMenuBarVisible = bVisible;
- }
+ {
+ bMenuBarVisible = bVisible;
+ }
}
- /** Returns the visibility of the main function bar.
-
- This method works independently from a connetion or loaded document.
+ /** Returns the visibility of the main function bar.
+
+ This method works independently from a connection or loaded document.
If no connection is established or no document is loaded,
this method just returns a memorized status.
- @return
+ @return
True if the main function bar is visible,
false if the main function bar is hidden.
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. See also
- {@link #setAllBarsVisible}.
- */
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. See also
+ {@link #setAllBarsVisible}.
+ */
public boolean isStandardBarVisible()
{
return bStandardBarVisible;
}
- /** Sets the tool function bar visibilty.
-
+ /** Sets the tool function bar visibility.
+
Initially the tool bar is visible.
-
- If not connected or no document loaded, the value is stored
+
+ If not connected or no document loaded, the value is stored
and automatically applied to the document after it is loaded.
Same is valid when the connection dies within this function call.
-
- @param bVisible
+
+ @param bVisible
If false, the tool function bar is disabled,
If true, the tool function bar is visible.
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. See also
- {@link #setAllBarsVisible}.
- */
- public void setToolBarVisible(boolean bVisible)
- {
- try
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. See also
+ {@link #setAllBarsVisible}.
+ */
+ public void setToolBarVisible(boolean bVisible)
+ {
+ try
{
- bToolBarVisible = setToolVisible( "ToolBarVisible",
- "private:resource/toolbar/toolbar", bToolBarVisible, bVisible );
+ bToolBarVisible = setToolVisible( "ToolBarVisible",
+ "private:resource/toolbar/toolbar", bToolBarVisible, bVisible );
}
catch ( java.lang.InterruptedException aExc )
- {
- bMenuBarVisible = bVisible;
- }
+ {
+ bMenuBarVisible = bVisible;
+ }
}
- /** Returns the visibility of the tool function bar.
-
- This method works independently from a connetion or loaded document.
+ /** Returns the visibility of the tool function bar.
+
+ This method works independently from a connection or loaded document.
If no connection is established or no document is loaded,
this method just returns a memorized status.
- @return
+ @return
True if the tool function bar is visible,
false if the tool function bar is hidden.
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. See also
- {@link #setAllBarsVisible}.
- */
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. See also
+ {@link #setAllBarsVisible}.
+ */
public boolean isToolBarVisible()
{
return bToolBarVisible;
}
- /** Sets the status function bar visibilty.
-
+ /** Sets the status function bar visibility.
+
Initially the status bar is visible.
-
- If not connected or no document loaded, the value is stored
+
+ If not connected or no document loaded, the value is stored
and automatically applied to the document after it is loaded.
Same is valid when the connection dies within this function call.
-
- @param bVisible
+
+ @param bVisible
If false, the status function bar is disabled,
If true, the status function bar is visible.
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. See also
- {@link #setAllBarsVisible}.
- */
- public void setStatusBarVisible(boolean bVisible)
- {
- try
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. See also
+ {@link #setAllBarsVisible}.
+ */
+ public void setStatusBarVisible(boolean bVisible)
+ {
+ try
{
- bStatusBarVisible = setToolVisible( "StatusBarVisible",
- "private:resource/statusbar/statusbar", bStatusBarVisible, bVisible );
+ bStatusBarVisible = setToolVisible( "StatusBarVisible",
+ "private:resource/statusbar/statusbar", bStatusBarVisible, bVisible );
}
catch ( java.lang.InterruptedException aExc )
- {
- bMenuBarVisible = bVisible;
- }
+ {
+ bMenuBarVisible = bVisible;
+ }
}
- /** Returns the visibility of the status function bar.
-
- This method works independently from a connetion or loaded document.
+ /** Returns the visibility of the status function bar.
+
+ This method works independently from a connection or loaded document.
If no connection is established or no document is loaded,
this method just returns a memorized status.
- @return
+ @return
True if the status function bar is visible,
false if the status function bar is hidden.
- @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
- which can be obtained from a frame, to control toolbars. See also
- {@link #setAllBarsVisible}.
- */
+ @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
+ which can be obtained from a frame, to control toolbars. See also
+ {@link #setAllBarsVisible}.
+ */
public boolean isStatusBarVisible()
{
return bStatusBarVisible;
@@ -1320,15 +1319,15 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
//===========================================================================
// Helper Methods / Internal Methods
//---------------------------------------------------------------------------
-
- // general instance intializer
+
+ // general instance initializer
{
setLayout(new java.awt.BorderLayout());
}
-
- /**
- @deprecated
- */
+
+ /**
+ @deprecated
+ */
public void paint( java.awt.Graphics aGraphics )
{
}
@@ -1337,12 +1336,12 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
If the argument by its name is already in aArguments
it is exchanged and aArguments is returned.
- <p>
+ <p>
If the argument by its name is not yet in aArguments,
a new array is created, aArgument added and the new
array returned.
*/
- protected com.sun.star.beans.PropertyValue[] addArgument(
+ protected com.sun.star.beans.PropertyValue[] addArgument(
com.sun.star.beans.PropertyValue aArguments[],
final com.sun.star.beans.PropertyValue aArgument )
{
@@ -1365,7 +1364,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
}
// create extended arguments
- com.sun.star.beans.PropertyValue[] aExtendedArguments =
+ com.sun.star.beans.PropertyValue[] aExtendedArguments =
new com.sun.star.beans.PropertyValue[ nNumArgs + 1 ];
// copy current arguments
@@ -1382,19 +1381,19 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
//===========================================================================
// Helper Classes
//---------------------------------------------------------------------------
-
+
/** Helper class to listen on the connection to learn when it dies.
-
- @internal
+
+ @internal
*/
- private class EventListener
+ private class EventListener
extends Thread
- implements
+ implements
com.sun.star.lang.XEventListener,
com.sun.star.frame.XTerminateListener
{
String aTag;
-
+
EventListener( String aTag )
throws NoConnectionException
{
@@ -1404,7 +1403,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
// listen on a dying connection
iConnection.addEventListener( this );
- // listen on a terminating OOo
+ // listen on a terminating AOO
getOOoDesktop().addTerminateListener( this );
// start this thread as a daemon
@@ -1420,61 +1419,61 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
}
catch ( Throwable aExc ) {};
- // do not listen on a terminating OOo anymore
+ // do not listen on a terminating AOO anymore
try {
getOOoDesktop().removeTerminateListener( this );
}
catch ( Throwable aExc ) {};
// stop thread
- this.interrupt();
+ this.interrupt();
}
- /// gets called when the connection dies
+ // gets called when the connection dies
public void disposing( /*IN*/ com.sun.star.lang.EventObject Source )
{
// empty the OOoBean and cut the connection
- stopOOoConnection();
+ stopOOoConnection();
}
- /// gets called when the user wants to terminate OOo
- public void queryTermination( /*IN*/ com.sun.star.lang.EventObject Event )
+ // gets called when the user wants to terminate AOO
+ public void queryTermination( /*IN*/ com.sun.star.lang.EventObject Event )
throws com.sun.star.frame.TerminationVetoException
{
- // disallow termination of OOo while a OOoBean exists
+ // disallow termination of AOO while a OOoBean exists
throw new com.sun.star.frame.TerminationVetoException();
}
- /// gets called when OOo terminates
+ // gets called when AOO terminates
public void notifyTermination( /*IN*/ com.sun.star.lang.EventObject Event )
{
// empty the OOoBean and cut the connection
- stopOOoConnection();
+ stopOOoConnection();
}
- /// watching the connection
+ // watching the connection
public void run()
{
dbgPrint( "EventListener(" + aTag + ").run()" );
// remote call might hang => watch try
- CallWatchThread aCallWatchThread =
+ CallWatchThread aCallWatchThread =
new CallWatchThread( nOOoCallTimeOut, "EventListener(" + aTag + ")" );
- // continue to trying to connect the OOo instance
+ // continue to trying to connect the AOO instance
long n = 0;
- while ( isInterrupted() == false
- && iConnection != null
- && iConnection.getComponentContext() != null )
+ while ( isInterrupted() == false
+ && iConnection != null
+ && iConnection.getComponentContext() != null )
{
dbgPrint( "EventListener(" + aTag + ").running() #" + ++n );
// still alive?
com.sun.star.lang.XMultiComponentFactory xServiceManager = null;
- try
- {
- // an arbitrary (but cheap) call into OOo
- xServiceManager = iConnection.getComponentContext().getServiceManager();
+ try
+ {
+ // an arbitrary (but cheap) call into AOO
+ xServiceManager = iConnection.getComponentContext().getServiceManager();
// call successfully performed, restart watch for next loop
try
@@ -1495,20 +1494,16 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
}
// sleep
- try {
- sleep(nOOoCheckCycle);
+ try {
+ sleep(nOOoCheckCycle);
}
catch ( java.lang.InterruptedException aExc )
{
- dbgPrint("EventListener(" + aTag + ") interupted.");
- //thread can be ended by EvendListener.end();
- break;
+ dbgPrint("EventListener(" + aTag + ") interupted.");
+ // thread can be ended by EventListener.end();
+ break;
}
}
}
}
-
}
-
-
-
[openoffice] 02/02: Fixed typos, removed whitespace
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 2210cea8f50d811bf0fd05f03dda324e2b421c8f
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Mar 12 00:08:56 2021 +0100
Fixed typos, removed whitespace
(cherry picked from commit 17cdeff7a7a72347c8e82e6ddfbc492928446265)
---
.../com/sun/star/beans/JavaWindowPeerFake.java | 8 +-
.../com/sun/star/beans/LocalOfficeConnection.java | 127 +++++-----
.../java/com/sun/star/beans/LocalOfficeWindow.java | 51 ++--
.../java/com/sun/star/beans/NativeConnection.java | 11 +-
.../java/com/sun/star/beans/NativeService.java | 9 +-
.../main/java/com/sun/star/beans/OfficeWindow.java | 17 +-
.../com/sun/star/comp/beans/CallWatchThread.java | 1 +
.../com/sun/star/comp/beans/ContainerFactory.java | 1 +
.../java/com/sun/star/comp/beans/Controller.java | 34 +--
.../main/java/com/sun/star/comp/beans/Frame.java | 32 +--
.../star/comp/beans/HasConnectionException.java | 11 +-
.../star/comp/beans/InvalidArgumentException.java | 9 +-
.../sun/star/comp/beans/JavaWindowPeerFake.java | 1 +
.../sun/star/comp/beans/LocalOfficeConnection.java | 259 +++++++++++----------
.../com/sun/star/comp/beans/LocalOfficeWindow.java | 117 +++++-----
.../com/sun/star/comp/beans/NativeConnection.java | 1 +
.../com/sun/star/comp/beans/NativeService.java | 9 +-
.../sun/star/comp/beans/NoConnectionException.java | 13 +-
.../sun/star/comp/beans/NoDocumentException.java | 11 +-
.../main/java/com/sun/star/comp/beans/OOoBean.java | 3 +-
.../com/sun/star/comp/beans/OfficeConnection.java | 1 +
.../com/sun/star/comp/beans/OfficeDocument.java | 42 ++--
.../java/com/sun/star/comp/beans/OfficeWindow.java | 1 +
.../sun/star/comp/beans/SystemWindowException.java | 13 +-
.../main/java/com/sun/star/comp/beans/Wrapper.java | 29 ++-
25 files changed, 409 insertions(+), 402 deletions(-)
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/beans/JavaWindowPeerFake.java b/main/bean/java/officebean/src/main/java/com/sun/star/beans/JavaWindowPeerFake.java
index be037bd..9f73a17 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/beans/JavaWindowPeerFake.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/beans/JavaWindowPeerFake.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java b/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
index 4414d2b..19e0560 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -38,7 +38,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
@@ -47,7 +47,7 @@ public class LocalOfficeConnection
public static final String OFFICE_APP_NAME = "soffice";
public static final String OFFICE_LIB_NAME = "officebean";
public static final String OFFICE_ID_SUFFIX = "_Office";
-
+
private Process mProcess;
private ContainerFactory mContainerFactory;
private XComponentContext mContext;
@@ -61,19 +61,19 @@ public class LocalOfficeConnection
private String mInitialObject;
private List mComponents = new Vector();
-
+
/**
* Constructor.
- * Sets up paths to the office application and native libraries if
- * values are available in <code>OFFICE_PROP_FILE</code> in the user
+ * Sets up paths to the office application and native libraries if
+ * values are available in <code>OFFICE_PROP_FILE</code> in the user
* home directory.<br />
- * "com.sun.star.beans.path" - the office application directory;<br/>
+ * "com.sun.star.beans.path" - the office application directory;<br/>
* "com.sun.star.beans.libpath" - native libraries directory.
*/
public LocalOfficeConnection()
- {
+ {
// init member vars
- try
+ try
{
setUnoUrl( "uno:pipe,name=" + getPipeName() + ";urp;StarOffice.ServiceManager" );
}
@@ -88,7 +88,7 @@ public class LocalOfficeConnection
/**
* Sets a connection URL.
- * This implementation accepts a UNO URL with following format:<br />
+ * This implementation accepts a UNO URL with following format:<br />
* <pre>
* url := uno:localoffice[,<params>];urp;StarOffice.ServiceManager
* params := <path>[,<pipe>]
@@ -130,9 +130,9 @@ public class LocalOfficeConnection
}
/**
- * Sets an AWT container catory.
+ * Sets an AWT container factory.
*
- * @param containerFactory This is a application provided AWT container
+ * @param containerFactory This is a application provided AWT container
* factory.
*/
public void setContainerFactory(ContainerFactory containerFactory)
@@ -141,10 +141,10 @@ public class LocalOfficeConnection
}
/**
- * Retrives the UNO component context.
- * Establishes a connection if necessary and initialises the
+ * Retrieves the UNO component context.
+ * Establishes a connection if necessary and initialises the
* UNO service manager if it has not already been initialised.
- * This method can return <code>null</code> if it fails to connect
+ * This method can return <code>null</code> if it fails to connect
* to the office application.
*
* @return The office UNO component context.
@@ -158,8 +158,8 @@ public class LocalOfficeConnection
/**
* Creates an office window.
- * The window is either a sub-class of java.awt.Canvas (local) or
- * java.awt.Container (RVP).
+ * The window is either a sub-class of java.awt.Canvas (local) or
+ * java.awt.Container (RVP).
*
* @param container This is an AWT container.
* @return The office window instance.
@@ -197,7 +197,7 @@ public class LocalOfficeConnection
}
/**
- * Removes an event listener from the listener list.
+ * Removes an event listener from the listener list.
*
* @param listener is a listener object.
*/
@@ -211,26 +211,26 @@ public class LocalOfficeConnection
*/
private XComponentContext connect()
{
- try
+ try
{
// create default local component context
XComponentContext xLocalContext =
- com.sun.star.comp.helper.Bootstrap.createInitialComponentContext(null);
-
+ com.sun.star.comp.helper.Bootstrap.createInitialComponentContext(null);
+
// initial serviceManager
XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager();
-
+
// create a urlresolver
- Object urlResolver = xLocalServiceManager.createInstanceWithContext(
- "com.sun.star.bridge.UnoUrlResolver", xLocalContext );
+ Object urlResolver = xLocalServiceManager.createInstanceWithContext(
+ "com.sun.star.bridge.UnoUrlResolver", xLocalContext );
// query for the XUnoUrlResolver interface
XUnoUrlResolver xUrlResolver =
- (XUnoUrlResolver) UnoRuntime.queryInterface( XUnoUrlResolver.class, urlResolver );
+ (XUnoUrlResolver) UnoRuntime.queryInterface( XUnoUrlResolver.class, urlResolver );
// try to connect to soffice
Object aInitialObject = null;
- try
+ try
{
aInitialObject = xUrlResolver.resolve( mURL );
}
@@ -239,12 +239,12 @@ public class LocalOfficeConnection
// launch soffice
OfficeService aSOffice = new OfficeService();
aSOffice.startupService();
-
+
// wait until soffice is started
long nMaxMillis = System.currentTimeMillis() + 1000*aSOffice.getStartupTime();
while ( aInitialObject == null )
{
- try
+ try
{
// try to connect to soffice
Thread.currentThread().sleep( 500 );
@@ -259,17 +259,17 @@ public class LocalOfficeConnection
}
}
}
- finally
- {
+ finally
+ {
}
-
+
// XComponentContext
if( null != aInitialObject )
{
XPropertySet xPropertySet = (XPropertySet)
UnoRuntime.queryInterface( XPropertySet.class, aInitialObject);
- Object xContext = xPropertySet.getPropertyValue("DefaultContext");
- XComponentContext xComponentContext = (XComponentContext) UnoRuntime.queryInterface(
+ Object xContext = xPropertySet.getPropertyValue("DefaultContext");
+ XComponentContext xComponentContext = (XComponentContext) UnoRuntime.queryInterface(
XComponentContext.class, xContext);
return xComponentContext;
}
@@ -310,20 +310,20 @@ public class LocalOfficeConnection
}
/**
- * Retrives a path to the office program folder.
+ * Retrieves a path to the office program folder.
*
* @return The path to the office program folder.
*/
private String getProgramPath()
{
- if (mProgramPath == null)
+ 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"))
+ if (aOS.startsWith("Windows"))
aExec = OFFICE_APP_NAME + ".exe";
// add other non-UNIX operating systems here
@@ -345,7 +345,7 @@ public class LocalOfficeConnection
/**
* Parses a connection URL.
- * This method accepts a UNO URL with following format:<br />
+ * This method accepts a UNO URL with following format:<br />
* <pre>
* url := uno:localoffice[,<params>];urp;StarOffice.NamingService
* params := <path>[,<pipe>]
@@ -362,13 +362,13 @@ public class LocalOfficeConnection
* </ul>
*
* @param url This is UNO URL which describes the type of a connection.
- * @exception java.net.MalformedURLException when inappropreate URL was
+ * @exception java.net.MalformedURLException when inappropriate URL was
* provided.
*/
private void parseUnoUrlWithOfficePath(String url, String prefix)
throws java.net.MalformedURLException
{
- // Extruct parameters.
+ // Extract parameters.
int idx = url.indexOf(";urp;StarOffice.NamingService");
if (idx < 0)
throw new java.net.MalformedURLException(
@@ -479,7 +479,7 @@ public class LocalOfficeConnection
}
break;
- case 5: // a delimeter after the value
+ case 5: // a delimiter after the value
switch(ch) {
case ' ':
break;
@@ -528,21 +528,21 @@ public class LocalOfficeConnection
}
/* replaces each substring aSearch in aString by aReplace.
-
- StringBuffer.replaceAll() is not avaialable in Java 1.3.x.
+
+ StringBuffer.replaceAll() is not available in Java 1.3.x.
*/
- private static String replaceAll(String aString, String aSearch, String aReplace )
- {
- StringBuffer aBuffer = new StringBuffer(aString);
+ private static String replaceAll(String aString, String aSearch, String aReplace )
+ {
+ StringBuffer aBuffer = new StringBuffer(aString);
- int nPos = aString.length();
- int nOfs = aSearch.length();
-
- while ( ( nPos = aString.lastIndexOf( aSearch, nPos - 1 ) ) > -1 )
- aBuffer.replace( nPos, nPos+nOfs, aReplace );
+ int nPos = aString.length();
+ int nOfs = aSearch.length();
- return aBuffer.toString();
- }
+ while ( ( nPos = aString.lastIndexOf( aSearch, nPos - 1 ) ) > -1 )
+ aBuffer.replace( nPos, nPos+nOfs, aReplace );
+
+ return aBuffer.toString();
+ }
/** creates a unique pipe name.
@@ -554,22 +554,22 @@ public class LocalOfficeConnection
aPipeName = replaceAll( aPipeName, "_", "%B7" );
return replaceAll( replaceAll( java.net.URLEncoder.encode(aPipeName), "\\+", "%20" ), "%", "_" );
}
-
- /**
+
+ /**
* @para This is an implementation of the native office service.
- * @deprecated
+ * @deprecated
*/
private class OfficeService
implements NativeService
{
/**
- * Retrive the office service identifier.
+ * Retrieve the office service identifier.
*
* @return The identifier of the office service.
*/
public String getIdentifier()
- {
- if ( mPipe == null)
+ {
+ if ( mPipe == null)
return getPipeName();
else
return mPipe;
@@ -581,7 +581,7 @@ public class LocalOfficeConnection
public void startupService()
throws java.io.IOException
{
- // create call with arguments
+ // create call with arguments
String[] cmdArray = new String[4];
cmdArray[0] = (new File(getProgramPath(), OFFICE_APP_NAME)).getPath();
cmdArray[1] = "-nologo";
@@ -601,7 +601,7 @@ public class LocalOfficeConnection
}
/**
- * Retrives the amount of time to wait for the startup.
+ * Retrieves the amount of time to wait for the startup.
*
* @return The amount of time to wait in seconds(?).
*/
@@ -611,3 +611,4 @@ public class LocalOfficeConnection
}
}
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java b/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java
index bcef148..37d8df9 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -42,7 +42,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
/**
- * This class represents a local office window.
+ * This class represents a local office window.
* @deprecated
*/
public class LocalOfficeWindow
@@ -55,9 +55,9 @@ public class LocalOfficeWindow
private boolean bPeer = false;
/**
- * Construnctor.
+ * Constructor.
*
- * @param connection The office connection object the window
+ * @param connection The office connection object the window
* belongs to.
*/
/* package */ LocalOfficeWindow(OfficeConnection connection)
@@ -67,7 +67,7 @@ public class LocalOfficeWindow
}
/**
- * Retrives an AWT component object associated with the OfficeWindow.
+ * Retrieves an AWT component object associated with the OfficeWindow.
*
* @return The AWT component object associated with the OfficeWindow.
*/
@@ -77,7 +77,7 @@ public class LocalOfficeWindow
}
/**
- * Retrives an UNO XWindowPeer object associated with the OfficeWindow.
+ * Retrieves an UNO XWindowPeer object associated with the OfficeWindow.
*
* @return The UNO XWindowPeer object associated with the OfficeWindow.
*/
@@ -105,10 +105,10 @@ public class LocalOfficeWindow
* Returns an AWT toolkit.
*/
private XToolkit queryAWTToolkit()
- throws com.sun.star.uno.Exception
+ throws com.sun.star.uno.Exception
{
// Create a UNO toolkit.
- XMultiComponentFactory compfactory;
+ XMultiComponentFactory compfactory;
XComponentContext xContext = mConnection.getComponentContext();
if ( xContext != null )
{
@@ -116,13 +116,13 @@ public class LocalOfficeWindow
XMultiServiceFactory factory;
factory = (XMultiServiceFactory)UnoRuntime.queryInterface(
XMultiServiceFactory.class, compfactory);
- Object object = factory.createInstance( "com.sun.star.awt.Toolkit");
+ Object object = factory.createInstance( "com.sun.star.awt.Toolkit");
return (XToolkit)UnoRuntime.queryInterface(XToolkit.class, object);
}
else
return null;
}
-
+
/// called when system parent is available, reparents the bean window
private void aquireSystemWindow()
{
@@ -159,7 +159,7 @@ public class LocalOfficeWindow
/// callback handler to get to know when we become visible
//@deprecated
- class ComponentEventHandler
+ class ComponentEventHandler
extends java.awt.event.ComponentAdapter
{
public void componentHidden( java.awt.event.ComponentEvent e)
@@ -190,14 +190,14 @@ public class LocalOfficeWindow
aquireSystemWindow();
else
releaseSystemWindow();
- }
-
+ }
+
/** Factory method for a UNO AWT toolkit window as a child of this Java window.
*
*/
private XWindowPeer createUNOWindowPeer()
{
- try
+ try
{
// get this windows native window type
int type = getNativeWindowSystemType();
@@ -225,7 +225,7 @@ public class LocalOfficeWindow
desc.Parent = parentPeer;
desc.Bounds = aRect;
desc.WindowServiceName = "workwindow";
- desc.WindowAttributes = (type == SystemDependent.SYSTEM_WIN32)
+ desc.WindowAttributes = (type == SystemDependent.SYSTEM_WIN32)
? WindowAttribute.SHOW : 0;
mWindow = queryAWTToolkit().createWindow(desc);
@@ -233,9 +233,9 @@ public class LocalOfficeWindow
addComponentListener( new ComponentEventHandler() );
// set initial visibility
- XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
+ XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( bPeer );
- }
+ }
catch (com.sun.star.uno.Exception exp) {
}
@@ -243,21 +243,21 @@ public class LocalOfficeWindow
}
/**
- * Retrives a platform dependent system window identifier.
+ * Retrieves a platform dependent system window identifier.
*
* @return The system window identifier.
*/
- private native long getNativeWindow();
+ private native long getNativeWindow();
/**
- * Retrives a platform dependent system window type.
+ * Retrieves a platform dependent system window type.
*
* @return The system window type.
*/
private native int getNativeWindowSystemType();
//---------------------------------------------------------------------------
- /** Helper class to watch calls into OOo with a timeout.
+ /** Helper class to watch calls into AOO with a timeout.
* @deprecated
*/
class CallWatchThread extends Thread
@@ -291,7 +291,7 @@ public class LocalOfficeWindow
catch ( java.lang.InterruptedException aExc )
{}
- //synchronized
+ // synchronized
{
if ( aWatchedThread != null )
{
@@ -303,3 +303,4 @@ public class LocalOfficeWindow
};
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/beans/NativeConnection.java b/main/bean/java/officebean/src/main/java/com/sun/star/beans/NativeConnection.java
index c2726be..37af290 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/beans/NativeConnection.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/beans/NativeConnection.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -51,5 +51,6 @@ import com.sun.star.connection.XConnection;
}
private long NativeHandle;
- private String Description;
+ private String Description;
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/beans/NativeService.java b/main/bean/java/officebean/src/main/java/com/sun/star/beans/NativeService.java
index cd8add3..1ac6a4a 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/beans/NativeService.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/beans/NativeService.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -30,3 +30,4 @@ package com.sun.star.beans;
public void startupService() throws java.io.IOException;
public int getStartupTime();
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/beans/OfficeWindow.java b/main/bean/java/officebean/src/main/java/com/sun/star/beans/OfficeWindow.java
index 2a796f6..572a9d8 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/beans/OfficeWindow.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/beans/OfficeWindow.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -28,24 +28,25 @@ import java.awt.Component;
import com.sun.star.awt.XWindowPeer;
/**
- * The concreate implementation of the OfficeWindow extends an
- * approperate type of visual component (java.awt.Canvas for local
+ * The concrete implementation of the OfficeWindow extends an
+ * appropriate type of visual component (java.awt.Canvas for local
* and java.awt.Container for remote).
* @deprecated
*/
public interface OfficeWindow
{
/**
- * Retrives an AWT component object associated with the OfficeWindow.
+ * Retrieves an AWT component object associated with the OfficeWindow.
*
* @return The AWT component object associated with the OfficeWindow.
*/
Component getAWTComponent();
/**
- * Retrives an UNO XWindowPeer object associated with the OfficeWindow.
+ * Retrieves an UNO XWindowPeer object associated with the OfficeWindow.
*
* @return The UNO XWindowPeer object associated with the OfficeWindow.
*/
XWindowPeer getUNOWindowPeer();
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
index 71d5a7d..eab414a 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
@@ -117,3 +117,4 @@ public class CallWatchThread extends Thread
System.err.println( "OOoBean: " + aMessage );
}
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
index 2375992..002b758 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
@@ -41,3 +41,4 @@ public interface ContainerFactory
*/
Container createContainer();
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Controller.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Controller.java
index b353922..35ab43d 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Controller.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Controller.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -49,55 +49,55 @@ public class Controller
//==============================================================
// com.sun.star.frame.XController
//--------------------------------------------------------------
-
+
public void attachFrame( /*IN*/ com.sun.star.frame.XFrame xFrame )
{
- xController.attachFrame( xFrame );
+ xController.attachFrame( xFrame );
}
public boolean attachModel( /*IN*/ com.sun.star.frame.XModel xModel )
{
- return xController.attachModel( xModel );
+ return xController.attachModel( xModel );
}
public boolean suspend( /*IN*/boolean bSuspend )
{
- return xController.suspend( bSuspend );
+ return xController.suspend( bSuspend );
}
public java.lang.Object getViewData( )
{
- return xController.getViewData();
+ return xController.getViewData();
}
public void restoreViewData( /*IN*/java.lang.Object aData )
{
- xController.restoreViewData( aData );
+ xController.restoreViewData( aData );
}
public com.sun.star.frame.XModel getModel( )
{
- return xController.getModel();
+ return xController.getModel();
}
public com.sun.star.frame.XFrame getFrame( )
{
- return xController.getFrame();
+ return xController.getFrame();
}
//==============================================================
// com.sun.star.frame.XDispatchProvider
//--------------------------------------------------------------
-
- public com.sun.star.frame.XDispatch queryDispatch(
- /*IN*/ com.sun.star.util.URL aURL,
- /*IN*/ String aTargetFrameName,
+
+ public com.sun.star.frame.XDispatch queryDispatch(
+ /*IN*/ com.sun.star.util.URL aURL,
+ /*IN*/ String aTargetFrameName,
/*IN*/ int nSearchFlags )
{
return xDispatchProvider.queryDispatch( aURL, aTargetFrameName, nSearchFlags );
}
- public com.sun.star.frame.XDispatch[] queryDispatches(
+ public com.sun.star.frame.XDispatch[] queryDispatches(
/*IN*/ com.sun.star.frame.DispatchDescriptor[] aRequests )
{
return xDispatchProvider.queryDispatches( aRequests );
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Frame.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Frame.java
index 295aad6..cee143c 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Frame.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Frame.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -29,9 +29,9 @@ import com.sun.star.uno.UnoRuntime;
*
* @since OOo 2.0.0
*/
-public class Frame
+public class Frame
extends Wrapper
- implements
+ implements
com.sun.star.frame.XFrame,
com.sun.star.frame.XDispatchProvider,
com.sun.star.frame.XDispatchProviderInterception
@@ -39,7 +39,7 @@ public class Frame
private com.sun.star.frame.XFrame xFrame;
private com.sun.star.frame.XDispatchProvider xDispatchProvider;
private com.sun.star.frame.XDispatchProviderInterception xDispatchProviderInterception;
-
+
public Frame( com.sun.star.frame.XFrame xFrame )
{
super( xFrame );
@@ -55,7 +55,7 @@ public class Frame
//==============================================================
// com.sun.star.frame.XFrame
//--------------------------------------------------------------
-
+
public void initialize( /*IN*/com.sun.star.awt.XWindow xWindow )
{
xFrame.initialize( xWindow );
@@ -144,16 +144,16 @@ public class Frame
//==============================================================
// com.sun.star.frame.XDispatchProvider
//--------------------------------------------------------------
-
- public com.sun.star.frame.XDispatch queryDispatch(
- /*IN*/ com.sun.star.util.URL aURL,
- /*IN*/ String aTargetFrameName,
+
+ public com.sun.star.frame.XDispatch queryDispatch(
+ /*IN*/ com.sun.star.util.URL aURL,
+ /*IN*/ String aTargetFrameName,
/*IN*/ int nSearchFlags )
{
return xDispatchProvider.queryDispatch( aURL, aTargetFrameName, nSearchFlags );
}
- public com.sun.star.frame.XDispatch[] queryDispatches(
+ public com.sun.star.frame.XDispatch[] queryDispatches(
/*IN*/ com.sun.star.frame.DispatchDescriptor[] aRequests )
{
return xDispatchProvider.queryDispatches( aRequests );
@@ -162,14 +162,14 @@ public class Frame
//==============================================================
// com.sun.star.frame.XDispatchProviderInterception
//--------------------------------------------------------------
-
- public void registerDispatchProviderInterceptor(
+
+ public void registerDispatchProviderInterceptor(
/*IN*/ com.sun.star.frame.XDispatchProviderInterceptor xInterceptor )
{
xDispatchProviderInterception.registerDispatchProviderInterceptor( xInterceptor );
}
- public void releaseDispatchProviderInterceptor(
+ public void releaseDispatchProviderInterceptor(
/*IN*/ com.sun.star.frame.XDispatchProviderInterceptor xInterceptor )
{
xDispatchProviderInterception.releaseDispatchProviderInterceptor( xInterceptor );
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/HasConnectionException.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/HasConnectionException.java
index 87a0d63..9095345 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/HasConnectionException.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/HasConnectionException.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,23 +7,23 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
package com.sun.star.comp.beans;
-/** This expception is thrown when a method is called which
+/** This exception is thrown when a method is called which
is only defined for not already having an established
connection.
@@ -33,4 +33,3 @@ public class HasConnectionException extends Exception
{
};
-
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/InvalidArgumentException.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/InvalidArgumentException.java
index e80e3d0..1e52fd4 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/InvalidArgumentException.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/InvalidArgumentException.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -31,4 +31,3 @@ public class InvalidArgumentException extends Exception
{
};
-
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
index 4a28270..2889bea 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
@@ -115,3 +115,4 @@ import com.sun.star.awt.*;
{
}
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
index e42cc3b..a6583ab 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -44,7 +44,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.
*
* @since OOo 2.0.0
*/
@@ -54,13 +54,13 @@ public class LocalOfficeConnection
public static final String OFFICE_APP_NAME = "soffice";
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;
- private XBridge mBridge;
+ private XBridge mBridge;
private String mURL;
private String mConnType;
@@ -71,58 +71,58 @@ public class LocalOfficeConnection
private List mComponents = new Vector();
- private static long m_nBridgeCounter = 0;
+ private static long m_nBridgeCounter = 0;
//-------------------------------------------------------------------------
static
{
- // preload shared libraries whichs import lips are linked to officebean
+ // preload shared libraries which import lips are linked to officebean
if ( System.getProperty( "os.name" ).startsWith( "Windows" ) )
{
- try
+ try
{
NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "msvcr70");
- }
+ }
catch (Throwable e)
{
// loading twice would fail
System.err.println( "cannot find msvcr70" );
- }
+ }
- try
+ try
{
NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "msvcr71");
- }
+ }
catch (Throwable e)
{
// loading twice would fail
System.err.println( "cannot find msvcr71" );
- }
+ }
- try
+ try
{
NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "uwinapi");
- }
+ }
catch (Throwable e)
{
// loading twice would fail
System.err.println( "cannot find uwinapi" );
- }
+ }
- try
+ try
{
NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "jawt");
- }
+ }
catch (Throwable e)
{
// loading twice would fail
System.err.println( "cannot find jawt" );
- }
+ }
}
// load shared library for JNI code
NativeLibraryLoader.loadLibrary( LocalOfficeConnection.class.getClassLoader(), "officebean" );
}
-
+
//-------------------------------------------------------------------------
// debugging method
private void dbgPrint( String aMessage )
@@ -132,16 +132,16 @@ public class LocalOfficeConnection
/**
* Constructor.
- * Sets up paths to the office application and native libraries if
- * values are available in <code>OFFICE_PROP_FILE</code> in the user
+ * Sets up paths to the office application and native libraries if
+ * values are available in <code>OFFICE_PROP_FILE</code> in the user
* home directory.<br />
- * "com.sun.star.beans.path" - the office application directory;<br/>
+ * "com.sun.star.beans.path" - the office application directory;<br/>
* "com.sun.star.beans.libpath" - native libraries directory.
*/
public LocalOfficeConnection()
- {
+ {
// init member vars
- try
+ try
{
setUnoUrl( "uno:pipe,name=" + getPipeName() + ";urp;StarOffice.ServiceManager" );
}
@@ -162,7 +162,7 @@ public class LocalOfficeConnection
/**
* Sets a connection URL.
- * This implementation accepts a UNO URL with following format:<br />
+ * This implementation accepts a UNO URL with following format:<br />
* <pre>
* url := uno:localoffice[,<params>];urp;StarOffice.ServiceManager
* params := <path>[,<pipe>]
@@ -204,9 +204,9 @@ public class LocalOfficeConnection
}
/**
- * Sets an AWT container catory.
+ * Sets an AWT container factory.
*
- * @param containerFactory This is a application provided AWT container
+ * @param containerFactory This is a application provided AWT container
* factory.
*/
public void setContainerFactory(ContainerFactory containerFactory)
@@ -215,10 +215,10 @@ public class LocalOfficeConnection
}
/**
- * Retrives the UNO component context.
- * Establishes a connection if necessary and initialises the
+ * Retrieves the UNO component context.
+ * Establishes a connection if necessary and initialises the
* UNO service manager if it has not already been initialised.
- * This method can return <code>null</code> if it fails to connect
+ * This method can return <code>null</code> if it fails to connect
* to the office application.
*
* @return The office UNO component context.
@@ -232,8 +232,8 @@ public class LocalOfficeConnection
/**
* Creates an office window.
- * The window is either a sub-class of java.awt.Canvas (local) or
- * java.awt.Container (RVP).
+ * The window is either a sub-class of java.awt.Canvas (local) or
+ * java.awt.Container (RVP).
*
* @param container This is an AWT container.
* @return The office window instance.
@@ -246,7 +246,7 @@ public class LocalOfficeConnection
/**
* Closes the connection.
*/
- public void dispose()
+ public void dispose()
{
Iterator itr = mComponents.iterator();
while (itr.hasNext() == true) {
@@ -256,21 +256,21 @@ public class LocalOfficeConnection
}
mComponents.clear();
- //Terminate the bridge. It turned out that this is necessary for the bean
- //to work properly when displayed in an applet within Internet Explorer.
- //When navigating off the page which is showing the applet and then going
- //back to it, then the Java remote bridge is damaged. That is the Java threads
- //do not work properly anymore. Therefore when Applet.stop is called the connection
- //to the office including the bridge needs to be terminated.
+ // Terminate the bridge. It turned out that this is necessary for the bean
+ // to work properly when displayed in an applet within Internet Explorer.
+ // When navigating off the page which is showing the applet and then going
+ // back to it, then the Java remote bridge is damaged. That is the Java threads
+ // do not work properly anymore. Therefore when Applet.stop is called the connection
+ // to the office including the bridge needs to be terminated.
if (mBridge != null)
{
XComponent comp = (XComponent)UnoRuntime.queryInterface(
XComponent.class, mBridge);
- if (comp != null)
+ if (comp != null)
comp.dispose();
else
System.err.println("LocalOfficeConnection: could not dispose bridge!");
-
+
mBridge = null;
}
@@ -289,7 +289,7 @@ public class LocalOfficeConnection
}
/**
- * Removes an event listener from the listener list.
+ * Removes an event listener from the listener list.
*
* @param listener is a listener object.
*/
@@ -303,18 +303,18 @@ public class LocalOfficeConnection
*/
private XComponentContext connect()
{
- try
+ try
{
// create default local component context
XComponentContext xLocalContext =
com.sun.star.comp.helper.Bootstrap.createInitialComponentContext(null);
-
+
// initial serviceManager
XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager();
-
+
// try to connect to soffice
Object aInitialObject = null;
- try
+ try
{
aInitialObject = resolve(xLocalContext, mURL);
}
@@ -323,12 +323,12 @@ public class LocalOfficeConnection
// launch soffice
OfficeService aSOffice = new OfficeService();
aSOffice.startupService();
-
+
// wait until soffice is started
long nMaxMillis = System.currentTimeMillis() + 1000*aSOffice.getStartupTime();
while ( aInitialObject == null )
{
- try
+ try
{
// try to connect to soffice
Thread.currentThread().sleep( 500 );
@@ -343,16 +343,16 @@ public class LocalOfficeConnection
}
}
}
- finally
- {
+ finally
+ {
}
-
+
// XComponentContext
if( null != aInitialObject )
{
XPropertySet xPropertySet = (XPropertySet)
UnoRuntime.queryInterface( XPropertySet.class, aInitialObject);
- Object xContext = xPropertySet.getPropertyValue("DefaultContext");
+ Object xContext = xPropertySet.getPropertyValue("DefaultContext");
XComponentContext xComponentContext = (XComponentContext) UnoRuntime.queryInterface(
XComponentContext.class, xContext);
return xComponentContext;
@@ -393,12 +393,12 @@ public class LocalOfficeConnection
return null;
}
-
- //The function is copied and adapted from the UrlResolver.resolve.
- //We cannot use the URLResolver because we need access to the bridge which has
- //to be disposed when Applet.stop is called.
+
+ // The function is copied and adapted from the UrlResolver.resolve.
+ // We cannot use the URLResolver because we need access to the bridge which has
+ // to be disposed when Applet.stop is called.
private Object resolve(XComponentContext xLocalContext, String dcp)
- throws com.sun.star.connection.NoConnectException,
+ throws com.sun.star.connection.NoConnectException,
com.sun.star.connection.ConnectionSetupException,
com.sun.star.lang.IllegalArgumentException
{
@@ -429,11 +429,11 @@ public class LocalOfficeConnection
Object rootObject = null;
XBridgeFactory xBridgeFactory= null;
-
+
XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager();
try {
xBridgeFactory = (XBridgeFactory)UnoRuntime.queryInterface(
- XBridgeFactory.class,
+ XBridgeFactory.class,
xLocalServiceManager.createInstanceWithContext(
"com.sun.star.bridge.BridgeFactory", xLocalContext));
} catch (com.sun.star.uno.Exception e) {
@@ -447,14 +447,14 @@ public class LocalOfficeConnection
"com.sun.star.connection.Connector", xLocalContext);
} catch (com.sun.star.uno.Exception e) {
throw new com.sun.star.uno.RuntimeException(e.getMessage());
- }
+ }
XConnector connector_xConnector = (XConnector)UnoRuntime.queryInterface(XConnector.class, connector);
// connect to the server
XConnection xConnection = connector_xConnector.connect(conDcp);
// create the bridge name. This should not be necessary if we pass an
- //empty string as bridge name into createBridge. Then we should always get
- //a new bridge. This does not work because of (i51323). Therefore we
- //create unique bridge names for the current process.
+ // empty string as bridge name into createBridge. Then we should always get
+ // a new bridge. This does not work because of (i51323). Therefore we
+ // create unique bridge names for the current process.
String sBridgeName = "OOoBean_private_bridge_" + String.valueOf(m_nBridgeCounter++);
try {
mBridge = xBridgeFactory.createBridge(sBridgeName, protDcp, xConnection, null);
@@ -469,20 +469,20 @@ public class LocalOfficeConnection
/**
- * Retrives a path to the office program folder.
+ * Retrieves a path to the office program folder.
*
* @return The path to the office program folder.
*/
static private String getProgramPath()
{
- if (mProgramPath == null)
+ 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"))
+ if (aOS.startsWith("Windows"))
aExec = OFFICE_APP_NAME + ".exe";
// add other non-UNIX operating systems here
@@ -491,7 +491,7 @@ public class LocalOfficeConnection
// find soffice executable relative to this class's class loader:
File path = NativeLibraryLoader.getResource(
LocalOfficeConnection.class.getClassLoader(), aExec);
- if (path != null)
+ if (path != null)
mProgramPath = path.getParent();
// default is ""
@@ -503,7 +503,7 @@ public class LocalOfficeConnection
/**
* Parses a connection URL.
- * This method accepts a UNO URL with following format:<br />
+ * This method accepts a UNO URL with following format:<br />
* <pre>
* url := uno:localoffice[,<params>];urp;StarOffice.NamingService
* params := <path>[,<pipe>]
@@ -520,13 +520,13 @@ public class LocalOfficeConnection
* </ul>
*
* @param url This is UNO URL which describes the type of a connection.
- * @exception java.net.MalformedURLException when inappropreate URL was
+ * @exception java.net.MalformedURLException when inappropriate URL was
* provided.
*/
private void parseUnoUrlWithOfficePath(String url, String prefix)
throws java.net.MalformedURLException
{
- // Extruct parameters.
+ // Extract parameters.
int idx = url.indexOf(";urp;StarOffice.NamingService");
if (idx < 0)
throw new java.net.MalformedURLException(
@@ -637,7 +637,7 @@ public class LocalOfficeConnection
}
break;
- case 5: // a delimeter after the value
+ case 5: // a delimiter after the value
switch(ch) {
case ' ':
break;
@@ -686,21 +686,21 @@ public class LocalOfficeConnection
}
/* replaces each substring aSearch in aString by aReplace.
-
- StringBuffer.replaceAll() is not avaialable in Java 1.3.x.
+
+ StringBuffer.replaceAll() is not available in Java 1.3.x.
*/
- private static String replaceAll(String aString, String aSearch, String aReplace )
- {
- StringBuffer aBuffer = new StringBuffer(aString);
+ private static String replaceAll(String aString, String aSearch, String aReplace )
+ {
+ StringBuffer aBuffer = new StringBuffer(aString);
- int nPos = aString.length();
- int nOfs = aSearch.length();
-
- while ( ( nPos = aString.lastIndexOf( aSearch, nPos - 1 ) ) > -1 )
- aBuffer.replace( nPos, nPos+nOfs, aReplace );
+ int nPos = aString.length();
+ int nOfs = aSearch.length();
- return aBuffer.toString();
- }
+ while ( ( nPos = aString.lastIndexOf( aSearch, nPos - 1 ) ) > -1 )
+ aBuffer.replace( nPos, nPos+nOfs, aReplace );
+
+ return aBuffer.toString();
+ }
/** creates a unique pipe name.
@@ -712,21 +712,21 @@ public class LocalOfficeConnection
aPipeName = replaceAll( aPipeName, "_", "%B7" );
return replaceAll( replaceAll( java.net.URLEncoder.encode(aPipeName), "+", "%20" ), "%", "_" );
}
-
- /**
+
+ /**
* @para This is an implementation of the native office service.
*/
private class OfficeService
implements NativeService
{
/**
- * Retrive the office service identifier.
+ * Retrieve the office service identifier.
*
* @return The identifier of the office service.
*/
public String getIdentifier()
- {
- if ( mPipe == null)
+ {
+ if ( mPipe == null)
return getPipeName();
else
return mPipe;
@@ -740,12 +740,12 @@ public class LocalOfficeConnection
{
int nSizeCmdArray = 4;
String sOption = null;
- //examine if user specified command-line options in system properties.
- //We may offer later a more sophisticated way of providing options if
- //the need arises. Currently this is intended to ease the pain during
- //development with pre-release builds of OOo where one wants to start
- //OOo with the -norestore options. The value of the property is simple
- //passed on to the Runtime.exec call.
+ // examine if user specified command-line options in system properties.
+ // We may offer later a more sophisticated way of providing options if
+ // the need arises. Currently this is intended to ease the pain during
+ // development with pre-release builds of OOo where one wants to start
+ // AOO with the -norestore options. The value of the property is simple
+ // passed on to the Runtime.exec call.
try {
sOption = System.getProperty("com.sun.star.officebean.Options");
if (sOption != null)
@@ -753,7 +753,7 @@ public class LocalOfficeConnection
} catch (java.lang.SecurityException e)
{
e.printStackTrace();
- }
+ }
// create call with arguments
String[] cmdArray = new String[nSizeCmdArray];
@@ -761,7 +761,7 @@ public class LocalOfficeConnection
String unoPath = System.getenv("UNO_PATH");
if (unoPath == null)
throw new java.io.IOException( "UNO_PATH environment variable is not set (required system path to the office program directory)" );
-
+
// cmdArray[0] = (new File(getProgramPath(), OFFICE_APP_NAME)).getPath();
cmdArray[0] = (new File(unoPath, OFFICE_APP_NAME)).getPath();
cmdArray[1] = "-nologo";
@@ -773,7 +773,7 @@ public class LocalOfficeConnection
cmdArray[3] = "-accept=socket,port=" + mPort + ";urp";
else
throw new java.io.IOException( "not connection specified" );
-
+
if (sOption != null)
cmdArray[4] = sOption;
@@ -786,7 +786,7 @@ public class LocalOfficeConnection
}
/**
- * Retrives the amount of time to wait for the startup.
+ * Retrieves the amount of time to wait for the startup.
*
* @return The amount of time to wait in seconds(?).
*/
@@ -798,33 +798,34 @@ public class LocalOfficeConnection
- class StreamProcessor extends Thread
- {
- java.io.InputStream m_in;
- java.io.PrintStream m_print;
-
- public StreamProcessor(final java.io.InputStream in, final java.io.PrintStream out)
- {
- m_in = in;
- m_print = out;
- start();
- }
-
- public void run() {
- java.io.BufferedReader r = new java.io.BufferedReader(
- new java.io.InputStreamReader(m_in) );
- try {
- for ( ; ; ) {
- String s = r.readLine();
- if ( s == null ) {
- break;
- }
- m_print.println(s);
- }
- } catch ( java.io.IOException e ) {
- e.printStackTrace( System.err );
- }
- }
- }
+ class StreamProcessor extends Thread
+ {
+ java.io.InputStream m_in;
+ java.io.PrintStream m_print;
+
+ public StreamProcessor(final java.io.InputStream in, final java.io.PrintStream out)
+ {
+ m_in = in;
+ m_print = out;
+ start();
+ }
+
+ public void run() {
+ java.io.BufferedReader r = new java.io.BufferedReader(
+ new java.io.InputStreamReader(m_in) );
+ try {
+ for ( ; ; ) {
+ String s = r.readLine();
+ if ( s == null ) {
+ break;
+ }
+ m_print.println(s);
+ }
+ } catch ( java.io.IOException e ) {
+ e.printStackTrace( System.err );
+ }
+ }
+ }
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java
index f4c84ec..f842420 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -45,7 +45,7 @@ import com.sun.star.uno.Type;
import com.sun.star.beans.NamedValue;
/**
- * This class represents a local office window.
+ * This class represents a local office window.
*
* @since OOo 2.0.0
*/
@@ -59,9 +59,9 @@ public class LocalOfficeWindow
private boolean bPeer = false;
/**
- * Construnctor.
+ * Constructor.
*
- * @param connection The office connection object the window
+ * @param connection The office connection object the window
* belongs to.
*/
protected LocalOfficeWindow(OfficeConnection connection)
@@ -71,7 +71,7 @@ public class LocalOfficeWindow
}
/**
- * Retrives an AWT component object associated with the OfficeWindow.
+ * Retrieves an AWT component object associated with the OfficeWindow.
*
* @return The AWT component object associated with the OfficeWindow.
*/
@@ -81,7 +81,7 @@ public class LocalOfficeWindow
}
/**
- * Retrives an UNO XWindowPeer object associated with the OfficeWindow.
+ * Retrieves an UNO XWindowPeer object associated with the OfficeWindow.
*
* @return The UNO XWindowPeer object associated with the OfficeWindow.
*/
@@ -109,10 +109,10 @@ public class LocalOfficeWindow
* Returns an AWT toolkit.
*/
private XToolkit queryAWTToolkit()
- throws com.sun.star.uno.Exception
- {
+ throws com.sun.star.uno.Exception
+ {
// Create a UNO toolkit.
- XMultiComponentFactory compfactory;
+ XMultiComponentFactory compfactory;
XComponentContext xContext = mConnection.getComponentContext();
if ( xContext != null )
{
@@ -125,8 +125,8 @@ public class LocalOfficeWindow
}
else
return null;
- }
-
+ }
+
/// called when system parent is available, reparents the bean window
private synchronized void aquireSystemWindow()
{
@@ -173,25 +173,25 @@ public class LocalOfficeWindow
aquireSystemWindow();
else
releaseSystemWindow();
- }
-
+ }
+
/** Factory method for a UNO AWT toolkit window as a child of this Java window.
*
*/
private synchronized XWindowPeer createUNOWindowPeer()
{
- try
+ try
{
// get this windows native window type
- int type = getNativeWindowSystemType();
+ int type = getNativeWindowSystemType();
- // Java AWT windows only have a system window when showing.
- XWindowPeer parentPeer;
- if ( isShowing() )
- {
+ // Java AWT windows only have a system window when showing.
+ XWindowPeer parentPeer;
+ if ( isShowing() )
+ {
// create direct parent relationship
//setVisible( true );
- parentPeer = new JavaWindowPeerFake(getWrappedWindowHandle(), type);
+ parentPeer = new JavaWindowPeerFake(getWrappedWindowHandle(), type);
bPeer = true;
}
else
@@ -208,15 +208,15 @@ public class LocalOfficeWindow
desc.Parent = parentPeer;
desc.Bounds = aRect;
desc.WindowServiceName = "workwindow";
- desc.WindowAttributes = (type == SystemDependent.SYSTEM_WIN32)
+ desc.WindowAttributes = (type == SystemDependent.SYSTEM_WIN32)
? WindowAttribute.SHOW : 0;
mWindow = queryAWTToolkit().createWindow(desc);
// set initial visibility
- XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
+ XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( bPeer );
- }
+ }
catch (com.sun.star.uno.Exception exp) {
}
@@ -224,7 +224,7 @@ public class LocalOfficeWindow
}
/** We make sure that the office window is notified that the parent
* will be removed.
- */
+ */
public void removeNotify()
{
try {
@@ -238,47 +238,48 @@ public class LocalOfficeWindow
}
/**
- * Retrives a platform dependent system window identifier.
+ * Retrieves a platform dependent system window identifier.
*
* @return The system window identifier.
*/
- private native long getNativeWindow();
+ private native long getNativeWindow();
/**
- * Retrives a platform dependent system window type.
+ * Retrieves a platform dependent system window type.
*
* @return The system window type.
*/
private native int getNativeWindowSystemType();
- /**
- Returns an Any containing a sequences of com.sun.star.beans.NamedValue. One NamedValue
- contains the name "WINDOW" and the value is a Long representing the window handle.
- The second NamedValue has the name "XEMBED" and the value is true, when the XEmbed
- protocol shall be used fore embedding the native Window.
- */
- protected Any getWrappedWindowHandle()
- {
-
- NamedValue window = new NamedValue(
- "WINDOW", new Any(new Type(Long.class), getNativeWindow()));
- NamedValue xembed = new NamedValue(
- "XEMBED", new Any(new Type(Boolean.class), false));
+ /**
+ Returns an Any containing a sequences of com.sun.star.beans.NamedValue. One NamedValue
+ contains the name "WINDOW" and the value is a Long representing the window handle.
+ The second NamedValue has the name "XEMBED" and the value is true, when the XEmbed
+ protocol shall be used fore embedding the native Window.
+ */
+ protected Any getWrappedWindowHandle()
+ {
- if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW )
- {
- String vendor = System.getProperty("java.vendor");
- if (vendor.equals("Sun Microsystems Inc.")
- && Boolean.valueOf(System.getProperty("sun.awt.xembedserver")).booleanValue())
- {
- xembed = new NamedValue(
- "XEMBED",
- new Any(new Type(Boolean.class), true));
- }
- }
- return new Any(
- new Type("[]com.sun.star.beans.NamedValue"),
- new NamedValue[] {window, xembed});
- }
+ NamedValue window = new NamedValue(
+ "WINDOW", new Any(new Type(Long.class), getNativeWindow()));
+ NamedValue xembed = new NamedValue(
+ "XEMBED", new Any(new Type(Boolean.class), false));
+
+ if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW )
+ {
+ String vendor = System.getProperty("java.vendor");
+ if (vendor.equals("Sun Microsystems Inc.")
+ && Boolean.valueOf(System.getProperty("sun.awt.xembedserver")).booleanValue())
+ {
+ xembed = new NamedValue(
+ "XEMBED",
+ new Any(new Type(Boolean.class), true));
+ }
+ }
+ return new Any(
+ new Type("[]com.sun.star.beans.NamedValue"),
+ new NamedValue[] {window, xembed});
+ }
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeConnection.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeConnection.java
index 8c4e940..8898430 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeConnection.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeConnection.java
@@ -56,3 +56,4 @@ import com.sun.star.connection.XConnection;
private long NativeHandle;
private String Description;
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeService.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeService.java
index 1aaef36..3947d9d 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeService.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeService.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -31,3 +31,4 @@ package com.sun.star.comp.beans;
public void startupService() throws java.io.IOException;
public int getStartupTime();
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoConnectionException.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoConnectionException.java
index 8d8984b..c5efcab 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoConnectionException.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoConnectionException.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -26,11 +26,10 @@ package com.sun.star.comp.beans;
/** This exception is called when a method is called which
needs an established connection but no connection is
established yet or anymore.
-
- @since OOo 2.0.0
+
+ @since OOo 2.0.0
*/
public class NoConnectionException extends Exception
{
};
-
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoDocumentException.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoDocumentException.java
index 2f5bf50..a1c0c78 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoDocumentException.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoDocumentException.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -25,10 +25,9 @@ package com.sun.star.comp.beans;
/** indicates that an operation needed a document, but no document was loaded.
- @since OOo 2.0.0
+ @since OOo 2.0.0
*/
public class NoDocumentException extends Exception
{
};
-
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
index a24ce7e..f438fc6 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
@@ -800,7 +800,7 @@ public class OOoBean
startup options for AOO. But it is possible to set a Java property when starting
Java, which is examined by OOoBean:
<pre>
- java -Dcom.sun.star.officebean.Options=-norestore ...
+ java -Dcom.sun.star.officebean.Options=-norestore ...
</pre>
It is planned to offer a way of specifying startup options in a future version.
The property can be used until then. When using this property only one option
@@ -1507,3 +1507,4 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
}
}
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeConnection.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeConnection.java
index 76e3433..e88f66f 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeConnection.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeConnection.java
@@ -74,3 +74,4 @@ public interface OfficeConnection
*/
OfficeWindow createOfficeWindow(Container container);
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java
index 0a85ba2..baecfe5 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -33,10 +33,10 @@ import com.sun.star.uno.UnoRuntime;
See further information on the wrapping and compatibility limitations
in the base class Wrapper.
- @since OOo 2.0.0
+ @since OOo 2.0.0
*/
public class OfficeDocument extends Wrapper
- implements
+ implements
com.sun.star.frame.XModel,
com.sun.star.util.XModifiable,
com.sun.star.frame.XStorable,
@@ -53,13 +53,13 @@ public class OfficeDocument extends Wrapper
this.xModel = xModel;
this.xModifiable = (com.sun.star.util.XModifiable)
- UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.util.XModifiable.class, xModel );
this.xPrintable = (com.sun.star.view.XPrintable)
- UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.view.XPrintable.class, xModel );
this.xStorable = (com.sun.star.frame.XStorable)
- UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.frame.XStorable.class, xModel );
}
@@ -67,7 +67,7 @@ public class OfficeDocument extends Wrapper
// com.sun.star.frame.XModel
//----------------------------------------------------------
- public boolean attachResource( /*IN*/String aURL,
+ public boolean attachResource( /*IN*/String aURL,
/*IN*/com.sun.star.beans.PropertyValue[] aArguments )
{
return xModel.attachResource( aURL, aArguments );
@@ -83,13 +83,13 @@ public class OfficeDocument extends Wrapper
return xModel.getArgs();
}
- public void connectController(
+ public void connectController(
/*IN*/ com.sun.star.frame.XController xController )
{
xModel.connectController( xController );
}
- public void disconnectController(
+ public void disconnectController(
/*IN*/ com.sun.star.frame.XController xController )
{
xModel.disconnectController( xController );
@@ -115,8 +115,8 @@ public class OfficeDocument extends Wrapper
return xModel.getCurrentController();
}
- public void setCurrentController(
- /*IN*/ com.sun.star.frame.XController xController )
+ public void setCurrentController(
+ /*IN*/ com.sun.star.frame.XController xController )
throws com.sun.star.container.NoSuchElementException
{
xModel.setCurrentController( xController );
@@ -152,7 +152,7 @@ public class OfficeDocument extends Wrapper
return xModifiable.isModified();
}
- public void setModified( /*IN*/boolean bModified )
+ public void setModified( /*IN*/boolean bModified )
throws com.sun.star.beans.PropertyVetoException
{
xModifiable.setModified( bModified );
@@ -167,13 +167,13 @@ public class OfficeDocument extends Wrapper
return xPrintable.getPrinter();
}
- public void setPrinter( /*IN*/ com.sun.star.beans.PropertyValue[] aPrinter )
+ public void setPrinter( /*IN*/ com.sun.star.beans.PropertyValue[] aPrinter )
throws com.sun.star.lang.IllegalArgumentException
{
xPrintable.setPrinter( aPrinter );
}
- public void print( /*IN*/ com.sun.star.beans.PropertyValue[] xOptions )
+ public void print( /*IN*/ com.sun.star.beans.PropertyValue[] xOptions )
throws com.sun.star.lang.IllegalArgumentException
{
xPrintable.print( xOptions );
@@ -198,19 +198,19 @@ public class OfficeDocument extends Wrapper
return xStorable.isReadonly();
}
- public void store( )
+ public void store( )
throws com.sun.star.io.IOException
{
xStorable.store();
}
- public void storeAsURL( /*IN*/ String aURL, /*IN*/ com.sun.star.beans.PropertyValue[] aArguments )
+ public void storeAsURL( /*IN*/ String aURL, /*IN*/ com.sun.star.beans.PropertyValue[] aArguments )
throws com.sun.star.io.IOException
{
xStorable.storeAsURL( aURL, aArguments );
}
- public void storeToURL( /*IN*/ String aURL, /*IN*/ com.sun.star.beans.PropertyValue[] aArguments )
+ public void storeToURL( /*IN*/ String aURL, /*IN*/ com.sun.star.beans.PropertyValue[] aArguments )
throws com.sun.star.io.IOException
{
xStorable.storeToURL( aURL, aArguments );
@@ -218,5 +218,3 @@ public class OfficeDocument extends Wrapper
};
-
-
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeWindow.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeWindow.java
index 4db274c..351e056 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeWindow.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeWindow.java
@@ -50,3 +50,4 @@ public interface OfficeWindow
*/
XWindowPeer getUNOWindowPeer();
}
+
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/SystemWindowException.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/SystemWindowException.java
index 80f36c1..a549fed 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/SystemWindowException.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/SystemWindowException.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,31 +7,30 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
package com.sun.star.comp.beans;
-/** indicates that an operation needed a system window,
+/** indicates that an operation needed a system window,
but no system window was acquired yet.
@see com.sun.star.comp.beans.OOoBean.aquireSystemWindow
- @since OOo 2.0.0
+ @since OOo 2.0.0
*/
public class SystemWindowException extends Exception
{
};
-
diff --git a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java
index 663021b..f29b353 100644
--- a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java
+++ b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -33,16 +33,16 @@ import com.sun.star.uno.UnoRuntime;
Because it's not worth the effort to create a runtime generated wrapper
for this purpose, as it might be for OOo 2.0, you still have to use
UnoRuntime.queryInterface() for interfaces which are optional or come
- from a subclass. But for non optional interfaces you can already
+ from a subclass. But for non optional interfaces you can already
directly call their methods.
This wrapper will only work for UNO objects via a bridge, not for
- direct Java objects.
+ direct Java objects.
- @since OOo 2.0.0
+ @since OOo 2.0.0
*/
class Wrapper
- implements
+ implements
com.sun.star.lib.uno.Proxy,
// see the comment in com.sun.star.lib.uno.bridges.java_remote
// .java_remote_bridge.mapInterfaceTo for the consequences of this
@@ -57,25 +57,25 @@ class Wrapper
{
xQueryInterface = (com.sun.star.uno.IQueryInterface) xProxy;
xComponent = (com.sun.star.lang.XComponent)
- UnoRuntime.queryInterface(
+ UnoRuntime.queryInterface(
com.sun.star.lang.XComponent.class, xProxy );
}
//==============================================================
// com.sun.star.uno.IQueryInterface
//--------------------------------------------------------------
-
- public String getOid()
+
+ public String getOid()
{
return xQueryInterface.getOid();
}
- public boolean isSame( Object aObject )
+ public boolean isSame( Object aObject )
{
return xQueryInterface.isSame( aObject );
}
- public Object queryInterface( com.sun.star.uno.Type aType )
+ public Object queryInterface( com.sun.star.uno.Type aType )
{
//System.err.println( "Wrapper::queryInterface(" + aType + ")" );
return xQueryInterface.queryInterface( aType );
@@ -84,7 +84,7 @@ class Wrapper
//==============================================================
// com.sun.star.lang.XComponent
//--------------------------------------------------------------
-
+
public void dispose( )
{
xComponent.dispose();
@@ -101,4 +101,3 @@ class Wrapper
}
};
-