Kaydet (Commit) 9813516d authored tarafından Noel Grandin's avatar Noel Grandin

Revert some changes that affected the bean/com/sun/star/comp API

from commits
  8583da1e
    "java: remove unused fields"
  68cd011c
    "java: reduce scope, make some methods private"
  da677dfd
    "java: reduce scope, make fields private"
  e701b3f7
    "java: reduce scope, make constants private"

Change-Id: I7fe0381c0e17b41bad2e4256c5511fe1f7863498
üst 9f743f9e
...@@ -28,8 +28,8 @@ import com.sun.star.awt.*; ...@@ -28,8 +28,8 @@ import com.sun.star.awt.*;
class JavaWindowPeerFake class JavaWindowPeerFake
implements XSystemDependentWindowPeer, XWindowPeer implements XSystemDependentWindowPeer, XWindowPeer
{ {
private int localSystemType; protected int localSystemType;
private Any wrappedHandle; protected Any wrappedHandle;
/** Create the faked window peer. /** Create the faked window peer.
* @param _hWindow the system handle to the window. * @param _hWindow the system handle to the window.
......
...@@ -47,9 +47,9 @@ import com.sun.star.lib.util.NativeLibraryLoader; ...@@ -47,9 +47,9 @@ import com.sun.star.lib.util.NativeLibraryLoader;
public class LocalOfficeConnection public class LocalOfficeConnection
implements OfficeConnection implements OfficeConnection
{ {
private static final String OFFICE_APP_NAME = "soffice"; public static final String OFFICE_APP_NAME = "soffice";
public static final String OFFICE_LIB_NAME = "officebean";
private static final String OFFICE_ID_SUFFIX = "_Office"; public static final String OFFICE_ID_SUFFIX = "_Office";
private Process mProcess; private Process mProcess;
private XComponentContext mContext; private XComponentContext mContext;
...@@ -745,7 +745,7 @@ public class LocalOfficeConnection ...@@ -745,7 +745,7 @@ public class LocalOfficeConnection
private java.io.InputStream m_in; private java.io.InputStream m_in;
private java.io.PrintStream m_print; private java.io.PrintStream m_print;
private StreamProcessor(final java.io.InputStream in, final java.io.PrintStream out) public StreamProcessor(final java.io.InputStream in, final java.io.PrintStream out)
{ {
super("StreamProcessor"); super("StreamProcessor");
......
...@@ -253,7 +253,7 @@ public class LocalOfficeWindow ...@@ -253,7 +253,7 @@ public class LocalOfficeWindow
* The second NamedValue has the name "XEMBED" and the value is true, when the XEmbed * The second NamedValue has the name "XEMBED" and the value is true, when the XEmbed
* protocol shall be used fore embedding the native Window. * protocol shall be used fore embedding the native Window.
*/ */
private Any getWrappedWindowHandle() protected Any getWrappedWindowHandle()
{ {
NamedValue window = new NamedValue( NamedValue window = new NamedValue(
......
...@@ -803,7 +803,7 @@ public class OOoBean ...@@ -803,7 +803,7 @@ public class OOoBean
@throws NoDocumentException @throws NoDocumentException
if no document is loaded if no document is loaded
*/ */
private void storeToURL( public void storeToURL(
final String aURL, final String aURL,
final com.sun.star.beans.PropertyValue aArguments[] ) final com.sun.star.beans.PropertyValue aArguments[] )
throws throws
...@@ -1041,7 +1041,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1041,7 +1041,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible setAllBarsVisible}. {@link #setAllBarsVisible setAllBarsVisible}.
*/ */
private void applyToolVisibilities() protected void applyToolVisibilities()
{ {
bIgnoreVisibility = true; bIgnoreVisibility = true;
setMenuBarVisible( bMenuBarVisible ); setMenuBarVisible( bMenuBarVisible );
...@@ -1061,7 +1061,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1061,7 +1061,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}. {@link #setAllBarsVisible}.
*/ */
private boolean setToolVisible( String aProperty, String aResourceURL, protected boolean setToolVisible( String aProperty, String aResourceURL,
boolean bOldValue, boolean bNewValue ) boolean bOldValue, boolean bNewValue )
throws throws
...@@ -1329,7 +1329,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); ...@@ -1329,7 +1329,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
a new array is created, aArgument added and the new a new array is created, aArgument added and the new
array returned. array returned.
*/ */
private com.sun.star.beans.PropertyValue[] addArgument( protected com.sun.star.beans.PropertyValue[] addArgument(
com.sun.star.beans.PropertyValue aArguments[], com.sun.star.beans.PropertyValue aArguments[],
final com.sun.star.beans.PropertyValue aArgument ) final com.sun.star.beans.PropertyValue aArgument )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment