Author: damjan
Date: Sat Mar 25 15:04:26 2017
New Revision: 1788669
URL: http://svn.apache.org/viewvc?rev=1788669&view=rev
Log:
Use more efficient Java boxing for basic types in main/bean.
Patch by: me
Modified:
openoffice/trunk/main/bean/com/sun/star/beans/JavaWindowPeerFake.java
openoffice/trunk/main/bean/com/sun/star/beans/LocalOfficeWindow.java
openoffice/trunk/main/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
openoffice/trunk/main/bean/com/sun/star/comp/beans/OOoBean.java
Modified: openoffice/trunk/main/bean/com/sun/star/beans/JavaWindowPeerFake.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bean/com/sun/star/beans/JavaWindowPeerFake.java?rev=1788669&r1=1788668&r2=1788669&view=diff
==============================================================================
--- openoffice/trunk/main/bean/com/sun/star/beans/JavaWindowPeerFake.java
(original)
+++ openoffice/trunk/main/bean/com/sun/star/beans/JavaWindowPeerFake.java Sat
Mar 25 15:04:26 2017
@@ -53,7 +53,7 @@ import com.sun.star.awt.*;
{
if (SystemType == localSystemType) {
- return new Integer((int)hWindow);
+ return (int)hWindow;
}
else return null;
}
Modified: openoffice/trunk/main/bean/com/sun/star/beans/LocalOfficeWindow.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bean/com/sun/star/beans/LocalOfficeWindow.java?rev=1788669&r1=1788668&r2=1788669&view=diff
==============================================================================
--- openoffice/trunk/main/bean/com/sun/star/beans/LocalOfficeWindow.java
(original)
+++ openoffice/trunk/main/bean/com/sun/star/beans/LocalOfficeWindow.java Sat
Mar 25 15:04:26 2017
@@ -131,7 +131,7 @@ public class LocalOfficeWindow
// set real parent
XVclWindowPeer xVclWindowPeer =
(XVclWindowPeer)UnoRuntime.queryInterface(
XVclWindowPeer.class, mWindow);
- xVclWindowPeer.setProperty( "PluginParent", new
Long(getNativeWindow()) );
+ xVclWindowPeer.setProperty( "PluginParent",
getNativeWindow() );
bPeer = true;
// show document window
@@ -152,7 +152,7 @@ public class LocalOfficeWindow
// set null parent
XVclWindowPeer xVclWindowPeer =
(XVclWindowPeer)UnoRuntime.queryInterface(
XVclWindowPeer.class, mWindow);
- xVclWindowPeer.setProperty( "PluginParent", new Long(0)
);
+ xVclWindowPeer.setProperty( "PluginParent", 0L );
bPeer = false;
}
}
Modified:
openoffice/trunk/main/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bean/com/sun/star/comp/beans/LocalOfficeWindow.java?rev=1788669&r1=1788668&r2=1788669&view=diff
==============================================================================
--- openoffice/trunk/main/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
(original)
+++ openoffice/trunk/main/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
Sat Mar 25 15:04:26 2017
@@ -156,7 +156,7 @@ public class LocalOfficeWindow
// set null parent
XVclWindowPeer xVclWindowPeer =
(XVclWindowPeer)UnoRuntime.queryInterface(
XVclWindowPeer.class, mWindow);
- xVclWindowPeer.setProperty( "PluginParent", new Long(0)
);
+ xVclWindowPeer.setProperty( "PluginParent", 0L );
bPeer = false;
}
}
@@ -261,9 +261,9 @@ public class LocalOfficeWindow
{
NamedValue window = new NamedValue(
- "WINDOW", new Any(new Type(Long.class), new
Long(getNativeWindow())));
+ "WINDOW", new Any(new Type(Long.class), getNativeWindow()));
NamedValue xembed = new NamedValue(
- "XEMBED", new Any(new Type(Boolean.class), new Boolean(false)));
+ "XEMBED", new Any(new Type(Boolean.class), false));
if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW )
{
@@ -273,7 +273,7 @@ public class LocalOfficeWindow
{
xembed = new NamedValue(
"XEMBED",
- new Any(new Type(Boolean.class), new Boolean(true)));
+ new Any(new Type(Boolean.class), true));
}
}
return new Any(
Modified: openoffice/trunk/main/bean/com/sun/star/comp/beans/OOoBean.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bean/com/sun/star/comp/beans/OOoBean.java?rev=1788669&r1=1788668&r2=1788669&view=diff
==============================================================================
--- openoffice/trunk/main/bean/com/sun/star/comp/beans/OOoBean.java (original)
+++ openoffice/trunk/main/bean/com/sun/star/comp/beans/OOoBean.java Sat Mar 25
15:04:26 2017
@@ -650,7 +650,7 @@ public class OOoBean
com.sun.star.beans.PropertyValue
aArgs[] =
addArgument( aArguments, new
com.sun.star.beans.PropertyValue(
"MacroExecutionMode",
-1,
- new Short(
com.sun.star.document.MacroExecMode.USE_CONFIG ),
+
com.sun.star.document.MacroExecMode.USE_CONFIG,
com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
//String fn = aFRame.getName();
@@ -1114,7 +1114,7 @@ xLayoutManager.showElement("private:reso
}
// notify change
- firePropertyChange( aProperty, new
Boolean(bOldValue), new Boolean(bNewValue) );
+ firePropertyChange( aProperty, bOldValue,
bNewValue );
}
}
