From 9813516d5e704c5949bd0010874ad115d57218dc Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 28 Oct 2014 10:49:33 +0200 Subject: Revert some changes that affected the bean/com/sun/star/comp API from commits 8583da1e934a49791ef8d86668f3d5c3c5dae1d7 "java: remove unused fields" 68cd011c907d00493bf2bfde531c1e244819596b "java: reduce scope, make some methods private" da677dfd59c2b551f3335ee0a5d5dfb33f9869c5 "java: reduce scope, make fields private" e701b3f732fa7f70cb273183e9ae8dbfd840f5e4 "java: reduce scope, make constants private" Change-Id: I7fe0381c0e17b41bad2e4256c5511fe1f7863498 --- bean/com/sun/star/comp/beans/JavaWindowPeerFake.java | 4 ++-- bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 8 ++++---- bean/com/sun/star/comp/beans/LocalOfficeWindow.java | 2 +- bean/com/sun/star/comp/beans/OOoBean.java | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'bean') diff --git a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java index 24679934cf33..1c39e0667ce6 100644 --- a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java +++ b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java @@ -28,8 +28,8 @@ import com.sun.star.awt.*; class JavaWindowPeerFake implements XSystemDependentWindowPeer, XWindowPeer { - private int localSystemType; - private Any wrappedHandle; + protected int localSystemType; + protected Any wrappedHandle; /** Create the faked window peer. * @param _hWindow the system handle to the window. diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 7174dca28461..c81796daebe7 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -47,9 +47,9 @@ import com.sun.star.lib.util.NativeLibraryLoader; public class LocalOfficeConnection implements OfficeConnection { - private static final String OFFICE_APP_NAME = "soffice"; - - private static final String OFFICE_ID_SUFFIX = "_Office"; + 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 XComponentContext mContext; @@ -745,7 +745,7 @@ public class LocalOfficeConnection private java.io.InputStream m_in; 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"); diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java index d481fbf21202..b8b493e5f94b 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java @@ -253,7 +253,7 @@ public class LocalOfficeWindow * The second NamedValue has the name "XEMBED" and the value is true, when the XEmbed * protocol shall be used fore embedding the native Window. */ - private Any getWrappedWindowHandle() + protected Any getWrappedWindowHandle() { NamedValue window = new NamedValue( diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 384ad6027d60..04abd760636a 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -803,7 +803,7 @@ public class OOoBean @throws NoDocumentException if no document is loaded */ - private void storeToURL( + public void storeToURL( final String aURL, final com.sun.star.beans.PropertyValue aArguments[] ) throws @@ -1041,7 +1041,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible setAllBarsVisible}. */ - private void applyToolVisibilities() + protected void applyToolVisibilities() { bIgnoreVisibility = true; setMenuBarVisible( bMenuBarVisible ); @@ -1061,7 +1061,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ - private boolean setToolVisible( String aProperty, String aResourceURL, + protected boolean setToolVisible( String aProperty, String aResourceURL, boolean bOldValue, boolean bNewValue ) throws @@ -1329,7 +1329,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); a new array is created, aArgument added and the new array returned. */ - private 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 ) { -- cgit v1.2.3