subject:"\[Libreoffice\-commits\] core.git\: bean\/com"

[Libreoffice-commits] core.git: bean/com

2021-03-25 Thread Caolán McNamara (via logerrit)

 bean/com/sun/star/comp/beans/OOoBean.java |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit b4a741291d609a422f0e870ac7cd0668e8dbd0be
Author: Caolán McNamara 
AuthorDate: Thu Mar 25 13:11:58 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 25 15:46:43 2021 +0100

cid#1473991 Dereference null return value

Change-Id: I11d9d685a278d31f591927b67637e9224a99fb27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113096
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index ca9442d58427..05b5288ea528 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1405,10 +1405,9 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 iConnection.addEventListener( this );
 
 // listen on a terminating OOo
-try {
-getOOoDesktop().addTerminateListener( this );
-}
-catch ( Throwable aExc ) {}
+com.sun.star.frame.XDesktop xDesktop = getOOoDesktop();
+if (xDesktop != null)
+xDesktop.addTerminateListener( this );
 
 // start this thread as a daemon
 setDaemon( true );
@@ -1425,7 +1424,9 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 
 // do not listen on a terminating OOo anymore
 try {
-getOOoDesktop().removeTerminateListener( this );
+com.sun.star.frame.XDesktop xDesktop = getOOoDesktop();
+if (xDesktop != null)
+xDesktop.removeTerminateListener( this );
 }
 catch ( Throwable aExc ) {}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2021-03-24 Thread Caolán McNamara (via logerrit)

 bean/com/sun/star/comp/beans/OOoBean.java |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6e8d5b28c23c6930cb23d33ca182748e7faf54dc
Author: Caolán McNamara 
AuthorDate: Wed Mar 24 08:56:52 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Mar 24 16:20:40 2021 +0100

cid#1473991 Dereference null return value

Change-Id: Id5aa369ac5edac5bb5d0c7adaadc4b6495b63750
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113023
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 3475447368e4..ca9442d58427 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1405,7 +1405,10 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 iConnection.addEventListener( this );
 
 // listen on a terminating OOo
-getOOoDesktop().addTerminateListener( this );
+try {
+getOOoDesktop().addTerminateListener( this );
+}
+catch ( Throwable aExc ) {}
 
 // start this thread as a daemon
 setDaemon( true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2019-11-17 Thread Caolán McNamara (via logerrit)

 bean/com/sun/star/comp/beans/LocalOfficeWindow.java |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 26960bad06fe26f5652faf42e20073bf7d201eeb
Author: Caolán McNamara 
AuthorDate: Sun Nov 17 17:27:08 2019 +
Commit: Caolán McNamara 
CommitDate: Sun Nov 17 20:08:23 2019 +0100

cid#1448230 Dereference null return value

Change-Id: I846959c2f92dc8078ad2ed8accb8f7be0f2833ce
Reviewed-on: https://gerrit.libreoffice.org/83023
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java 
b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index 1efc99032594..2e04a00c7b42 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -95,6 +95,8 @@ public class LocalOfficeWindow
 {
  // Create a UNO toolkit.
  XComponentContext xContext = mConnection.getComponentContext();
+ if (xContext == null)
+ throw new RuntimeException("no context");
  XMultiComponentFactory compfactory = xContext.getServiceManager();
  XMultiServiceFactory factory = UnoRuntime.queryInterface(
  XMultiServiceFactory.class, compfactory);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2019-11-16 Thread Caolán McNamara (via logerrit)

 bean/com/sun/star/comp/beans/OOoBean.java |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit cd173ae7d6646eec21bc3937fc23676b3daab0ff
Author: Caolán McNamara 
AuthorDate: Sat Nov 16 17:52:23 2019 +
Commit: Caolán McNamara 
CommitDate: Sat Nov 16 20:23:44 2019 +0100

cid#1448226 silence RV: Bad use of return value

Change-Id: Ie85ea159ebed117c11a1d5d67c4292be8ca5b8e8
Reviewed-on: https://gerrit.libreoffice.org/82994
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 742b7dc2e32b..0345d48ca45e 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -655,7 +655,10 @@ public class OOoBean
 {
 // reactivate old document
 if ( aFrame != null && aFrame.getController() != null )
-aFrame.getController().suspend(false);
+{
+boolean bResult = 
aFrame.getController().suspend(false);
+dbgPrint( "loadFromURL() .. suspend() -> " + 
bResult );
+}
 aDocument.setModified(true);
 
 // throw exception
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com javaunohelper/com jurt/com qadevOOo/runner ridljar/com svl/qa

2019-05-27 Thread Tomoyuki Kubota (via logerrit)

 bean/com/sun/star/comp/beans/NativeConnection.java|1 
 bean/com/sun/star/comp/beans/NativeService.java   |1 
 bean/com/sun/star/comp/beans/OOoBean.java |   15 
++
 javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java   |1 
 jurt/com/sun/star/comp/loader/FactoryHelper.java  |1 
 jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java |1 
 jurt/com/sun/star/uno/Ascii.java  |2 +
 jurt/com/sun/star/uno/AsciiString.java|2 +
 jurt/com/sun/star/uno/MappingException.java   |1 
 qadevOOo/runner/lib/DynamicClassLoader.java   |1 
 ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java   |1 
 ridljar/com/sun/star/uno/Any.java |1 
 ridljar/com/sun/star/uno/IBridge.java |1 
 ridljar/com/sun/star/uno/IEnvironment.java|1 
 ridljar/com/sun/star/uno/IMapping.java|1 
 ridljar/com/sun/star/uno/UnoRuntime.java  |9 
++
 svl/qa/complex/ConfigItems/CheckConfigItems.java  |1 
 17 files changed, 41 insertions(+)

New commits:
commit 51f1e62e2dae37746d218a187d4b0158296ad155
Author: Tomoyuki Kubota 
AuthorDate: Fri May 24 19:24:10 2019 +0900
Commit: Michael Stahl 
CommitDate: Mon May 27 11:40:35 2019 +0200

@deprecated should be with @Deprecated

Without this patch, warnings will be given
when LibreOffice is built with JDK9 or later.

Change-Id: I7aa6e99ace2377fbdb7dd732949ce10d9bd9df58
Reviewed-on: https://gerrit.libreoffice.org/72947
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/bean/com/sun/star/comp/beans/NativeConnection.java 
b/bean/com/sun/star/comp/beans/NativeConnection.java
index eebae5d40609..dd253134efb8 100644
--- a/bean/com/sun/star/comp/beans/NativeConnection.java
+++ b/bean/com/sun/star/comp/beans/NativeConnection.java
@@ -24,6 +24,7 @@ import com.sun.star.connection.XConnection;
  *
  * @deprecated.
  */
+@Deprecated
 class NativeConnection
 implements XConnection
 {
diff --git a/bean/com/sun/star/comp/beans/NativeService.java 
b/bean/com/sun/star/comp/beans/NativeService.java
index 9df62f072976..c1e8282964a7 100644
--- a/bean/com/sun/star/comp/beans/NativeService.java
+++ b/bean/com/sun/star/comp/beans/NativeService.java
@@ -21,6 +21,7 @@ package com.sun.star.comp.beans;
 /*
  * @deprecated
  */
+@Deprecated
 interface NativeService {
 String getIdentifier();
 void startupService() throws java.io.IOException;
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 606b627abf77..345d5614c266 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -119,6 +119,7 @@ public class OOoBean
 the dispose method of the OfficeConnection or the OOoBean's 
stopOOoConnection
 method would make all instances of OOoBean stop working.
  */
+@Deprecated
 public OOoBean( OfficeConnection iConnection )
 throws NoConnectionException
 {
@@ -212,6 +213,7 @@ public class OOoBean
 make is method work. It is better to call OOoBean's methods and be 
prepared
 to catch a NoConnectionException.
  */
+@Deprecated
 public boolean isOOoConnected()
 {
 return iConnection != null;
@@ -353,6 +355,7 @@ public class OOoBean
 should call the clearDocument of the deriving class or {@link #clear} 
which discards
 the currently displayed document.
  */
+@Deprecated
 public synchronized void clearDocument( boolean bClearStateToo )
 {
 // TBD
@@ -488,6 +491,7 @@ public class OOoBean
 office window is called, then the actions are performed for which this 
method
 needed to be called previously.
  */
+@Deprecated
 public synchronized void releaseSystemWindow()
 throws
 SystemWindowException,
@@ -1024,6 +1028,7 @@ com.sun.star.frame.XLayoutManager xLayoutManager =
 xLayoutManager.showElement("private:resource/menubar/menubar");
 
  */
+@Deprecated
 public void setAllBarsVisible( boolean bVisible )
 {
 bIgnoreVisibility = true;
@@ -1041,6 +1046,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 which can be obtained from a frame, to control toolbars. See also
 {@link #setAllBarsVisible setAllBarsVisible}.
  */
+@Deprecated
 protected void applyToolVisibilities()
 {
 bIgnoreVisibility = true;
@@ -1061,6 +1067,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 which can be obtained from a frame, to control toolbars. See

[Libreoffice-commits] core.git: bean/com connectivity/qa connectivity/README cui/source dbaccess/source desktop/inc desktop/source desktop/test extensions/source filter/source forms/qa forms/source fp

2019-05-10 Thread Caolán McNamara (via logerrit)

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java
  |2 -
 connectivity/README
  |2 -
 connectivity/qa/connectivity/mysql/mysql.cxx   
  |2 -
 cui/source/dialogs/hltpbase.cxx
  |2 -
 cui/source/options/optpath.cxx 
  |4 +--
 dbaccess/source/core/dataaccess/databasedocument.cxx   
  |2 -
 dbaccess/source/filter/xml/dbloader2.cxx   
  |4 +--
 dbaccess/source/ui/browser/exsrcbrw.cxx
  |2 -
 dbaccess/source/ui/dlg/ConnectionHelper.cxx
  |2 -
 desktop/inc/dp_misc.h  
  |2 -
 desktop/source/deployment/inc/dp_descriptioninfoset.hxx
  |2 -
 desktop/source/deployment/registry/dp_backenddb.cxx
  |2 -
 desktop/source/lib/init.cxx
  |2 -
 desktop/test/deployment/update/default_url/readme.txt  
  |2 -
 desktop/test/deployment/update/publisher/readme.txt
  |6 ++---
 desktop/test/deployment/update/readme.txt  
  |2 -
 desktop/test/deployment/update/website_update/readme.txt   
  |4 +--
 extensions/source/activex/README.txt   
  |2 -
 extensions/source/propctrlr/unourl.cxx 
  |2 -
 filter/source/config/cache/cacheitem.hxx   
  |4 +--
 filter/source/config/cache/typedetection.cxx   
  |2 -
 filter/source/odfflatxml/OdfFlatXml.cxx
  |2 -
 forms/qa/integration/forms/DocumentViewHelper.java 
  |2 -
 forms/source/inc/urltransformer.hxx
  |6 ++---
 fpicker/source/office/fpsmartcontent.hxx   
  |4 +--
 fpicker/source/office/iodlg.cxx
  |2 -
 framework/inc/xml/imagesconfiguration.hxx  
  |8 +++---
 framework/qa/complex/dispatches/checkdispatchapi.java  
  |2 -
 framework/source/dispatch/mailtodispatcher.cxx 
  |2 -
 framework/source/dispatch/servicehandler.cxx   
  |2 -
 framework/source/fwe/classes/addonsoptions.cxx 
  |2 -
 framework/source/fwi/classes/protocolhandlercache.cxx  
  |2 -
 framework/source/jobs/jobdispatch.cxx  
  |4 +--
 framework/source/services/autorecovery.cxx 
  |4 +--
 include/LibreOfficeKit/LibreOfficeKit.hxx  
  |2 -
 include/editeng/editstat.hxx   
  |2 -
 include/linguistic/misc.hxx
  |2 -
 include/osl/file.h 
  |2 -
 include/osl/file.hxx   
  |2 -
 include/svtools/fileurlbox.hxx 
  |2 -
 include/svx/databaselocationinput.hxx  
  |2 -
 include/tools/urlobj.hxx   
  |4 +--
 include/vcl/IconThemeInfo.hxx  
  |2 -
 include/vcl/embeddedfontshelper.hxx
  |2 -
 include/vcl/pdfextoutdevdata.hxx   
  |2 -
 include/vcl/pdfwriter.hxx  
  |2 -
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/LibreOfficeKitWrapper.swift
  |2 -
 odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java

[Libreoffice-commits] core.git: bean/com sc/source

2019-04-19 Thread Andrea Gelmini (via logerrit)

 bean/com/sun/star/comp/beans/OOoBean.java |8 
 sc/source/filter/excel/xeview.cxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e473067c67f39a969b27f4e956769bd2652f7f5e
Author: Andrea Gelmini 
AuthorDate: Fri Apr 19 20:51:55 2019 +
Commit: Julien Nabet 
CommitDate: Sat Apr 20 07:54:23 2019 +0200

Fix typo

Change-Id: Ib61a8a14923864757ed83e3914bcb4ac1aae6a22
Reviewed-on: https://gerrit.libreoffice.org/70991
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 72acb9c03f87..606b627abf77 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1051,7 +1051,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 bIgnoreVisibility = false;
 }
 
-/** Helper method to set tool bar visibilty.
+/** Helper method to set tool bar visibility.
 
  @param bNewValue
 If false, the tool bar is disabled,
@@ -1159,7 +1159,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 return bMenuBarVisible;
 }
 
-/** Sets the main function bar visibilty.
+/** Sets the main function bar visibility.
 
 Initially the standard bar is visible.
 
@@ -1207,7 +1207,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 return bStandardBarVisible;
 }
 
-/** Sets the tool function bar visibilty.
+/** Sets the tool function bar visibility.
 
 Initially the tool bar is visible.
 
@@ -1255,7 +1255,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 return bToolBarVisible;
 }
 
-/** Sets the status function bar visibilty.
+/** Sets the status function bar visibility.
 
 Initially the status bar is visible.
 
diff --git a/sc/source/filter/excel/xeview.cxx 
b/sc/source/filter/excel/xeview.cxx
index 634dab3819d6..b83937452b1a 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -52,7 +52,7 @@ void XclExpWindow1::SaveXml( XclExpXmlStream& rStrm )
 const XclExpTabInfo& rTabInfo = rStrm.GetRoot().GetTabInfo();
 
 rStrm.GetCurrentStream()->singleElement( XML_workbookView,
-// OOXTODO: XML_visibility, // ST_visibilty
+// OOXTODO: XML_visibility, // ST_visibility
 // OOXTODO: XML_minimized,  // bool
 XML_showHorizontalScroll,   ToPsz( ::get_flag( mnFlags, 
EXC_WIN1_HOR_SCROLLBAR ) ),
 XML_showVerticalScroll, ToPsz( ::get_flag( mnFlags, 
EXC_WIN1_VER_SCROLLBAR ) ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2019-04-08 Thread Andrea Gelmini (via logerrit)

 bean/com/sun/star/comp/beans/OOoBean.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 30a9bfec76c807d203b39bfcdeed1cb0c3118719
Author: Andrea Gelmini 
AuthorDate: Thu Apr 4 19:21:25 2019 +
Commit: Julien Nabet 
CommitDate: Tue Apr 9 07:56:02 2019 +0200

Fix typo

Change-Id: Ifb1b63c27816c244d98fabfd97114c21c9e4ffa4
Reviewed-on: https://gerrit.libreoffice.org/70443
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 0e427e325622..72acb9c03f87 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -441,7 +441,7 @@ public class OOoBean
 was showing, then this method needs to be called after the container 
window
 was made visible (java.lang.Component.setVisible(true)).
 
-Another scenario is that a OOoBean contains a document and is removed
+Another scenario is that an 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.
 
@@ -1419,7 +1419,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
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 OOo while an OOoBean exists
 throw new com.sun.star.frame.TerminationVetoException();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2019-04-08 Thread Andrea Gelmini (via logerrit)

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 350d159754110a600b94eb27e294b035c73a7ced
Author: Andrea Gelmini 
AuthorDate: Mon Apr 8 09:52:29 2019 +
Commit: Julien Nabet 
CommitDate: Tue Apr 9 07:27:35 2019 +0200

Fix typo

Change-Id: Ia52e717551d50e57d59feba5709d6bf25e1dc1a2
Reviewed-on: https://gerrit.libreoffice.org/70441
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index a77c30d3e533..f76bec0564ad 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -192,7 +192,7 @@ public class LocalOfficeConnection
 /**
  * Sets an AWT container factory.
  *
- * @param containerFactory This is a application provided AWT container
+ * @param containerFactory This is an application provided AWT container
  *  factory.
  */
 @Deprecated
@@ -448,7 +448,7 @@ public class LocalOfficeConnection
 
 /**
  * Parses a connection URL.
- * This method accepts a UNO URL with following format:
+ * This method accepts an UNO URL with following format:
  * 
  * url:= uno:localoffice[,params];urp;StarOffice.NamingService
  * params := path[,pipe]
@@ -632,7 +632,7 @@ public class LocalOfficeConnection
 */
 private static String getPipeName() throws UnsupportedEncodingException
 {
-// turn user name into a URL and file system safe name (% chars will 
not work)
+// turn user name into an URL and file system safe name (% chars will 
not work)
 String aPipeName = System.getProperty("user.name") + OFFICE_ID_SUFFIX;
 aPipeName = aPipeName.replace( "_", "%B7" );
 return java.net.URLEncoder.encode( aPipeName, "UTF-8" ).replace( "+", 
"%20" ).replace( "%", "_" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2019-04-08 Thread Andrea Gelmini (via logerrit)

 bean/com/sun/star/comp/beans/OfficeConnection.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a78ffa922eda80317c1d24bd1e552eb57122a8d1
Author: Andrea Gelmini 
AuthorDate: Thu Apr 4 19:21:24 2019 +
Commit: Jens Carl 
CommitDate: Tue Apr 9 07:10:46 2019 +0200

Fix typo

Change-Id: Icabc8b356d18ee5381f7d43233341a9d8e42ef9c
Reviewed-on: https://gerrit.libreoffice.org/70444
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/bean/com/sun/star/comp/beans/OfficeConnection.java 
b/bean/com/sun/star/comp/beans/OfficeConnection.java
index 08bcff345218..8795f0d5a017 100644
--- a/bean/com/sun/star/comp/beans/OfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/OfficeConnection.java
@@ -42,7 +42,7 @@ public interface OfficeConnection
 /**
  * Sets an AWT container factory.
  *
- * @param containerFactory This is a application provided AWT container
+ * @param containerFactory This is an application provided AWT container
  *  factory.
  */
 void setContainerFactory(ContainerFactory containerFactory);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2019-01-28 Thread Libreoffice Gerrit user

 bean/com/sun/star/comp/beans/OOoBean.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eeeae885b726d10e97327198792775b54b456274
Author: Andrea Gelmini 
AuthorDate: Sat Jan 26 16:11:58 2019 +
Commit: Julien Nabet 
CommitDate: Mon Jan 28 09:16:24 2019 +0100

Fix typo

Change-Id: If648e007a6db44e26021c12ac919d81ccceaa081
Reviewed-on: https://gerrit.libreoffice.org/66981
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 84e6a4f177f2..0e427e325622 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -128,7 +128,7 @@ public class OOoBean
 { /* impossible here */ }
 }
 
-/** Sets the timeout for methods which launch OOo in milli seconds.
+/** Sets the timeout for methods which launch OOo in milliseconds.
 
 This method does not need a connection to an OOo instance.
  */
@@ -137,7 +137,7 @@ public class OOoBean
 nOOoStartTimeOut = nMilliSecs;
 }
 
-/** Sets the timeout for normal OOO methods calls in milli seconds.
+/** Sets the timeout for normal OOO methods calls in milliseconds.
 
 This method does not need a connection to an OOo instance.
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com odk/examples

2018-07-22 Thread Libreoffice Gerrit user

 bean/com/sun/star/comp/beans/JavaWindowPeerFake.java   
   |   16 +-
 
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java
 |2 -
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c814036604810e84d2b20f1407020cf6f003ab78
Author: Andrea Gelmini 
AuthorDate: Sun Jul 22 18:34:08 2018 +0200
Commit: Jens Carl 
CommitDate: Sun Jul 22 20:26:06 2018 +0200

Fix typos

Change-Id: I2715bcbaf642fd24d61f61dbf4e978e06afbf102
Reviewed-on: https://gerrit.libreoffice.org/57824
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java 
b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
index 1c39e0667ce6..d2d1d351d7da 100644
--- a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
+++ b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
@@ -53,7 +53,7 @@ class JavaWindowPeerFake
 else return null;
 }
 
-/** not really neaded.
+/** not really needed.
  */
 public XToolkit getToolkit()
 throws com.sun.star.uno.RuntimeException
@@ -61,49 +61,49 @@ class JavaWindowPeerFake
 return null;
 }
 
-/** not really neaded.
+/** not really needed.
  */
 public void setPointer(/*IN*/ XPointer Pointer)
 throws com.sun.star.uno.RuntimeException
 {
 }
 
-/** not really neaded.
+/** not really needed.
  */
 public void setBackground(/*IN*/ int Color)
 throws com.sun.star.uno.RuntimeException
 {
 }
 
-/** not really neaded.
+/** not really needed.
  */
 public void invalidate(/*IN*/ short Flags)
 throws com.sun.star.uno.RuntimeException
 {
 }
 
-/** not really neaded.
+/** not really needed.
  */
 public void invalidateRect(/*IN*/ com.sun.star.awt.Rectangle Rect, /*IN*/ 
short Flags)
 throws com.sun.star.uno.RuntimeException
 {
 }
 
-/** not really neaded.
+/** not really needed.
  */
 public void dispose()
 throws com.sun.star.uno.RuntimeException
 {
 }
 
-/** not really neaded.
+/** not really needed.
  */
 public void addEventListener(/*IN*/ com.sun.star.lang.XEventListener 
xListener)
 throws com.sun.star.uno.RuntimeException
 {
 }
 
-/** not really neaded.
+/** not really needed.
  */
 public void removeEventListener(/*IN*/ com.sun.star.lang.XEventListener 
aListener)
 throws com.sun.star.uno.RuntimeException
diff --git 
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java
 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java
index 93bd4c9156b9..25281ac5f3ba 100644
--- 
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java
+++ 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java
@@ -62,7 +62,7 @@ class JavaWindowPeerFake implements 
com.sun.star.awt.XSystemDependentWindowPeer,
 return aReturn;
 }
 
-/** not really neaded.
+/** not really needed.
  */
 public com.sun.star.awt.XToolkit getToolkit()
 throws com.sun.star.uno.RuntimeException
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com cui/source dbaccess/source desktop/unx drawinglayer/source extensions/source framework/source include/sfx2 include/svl include/vcl io/source javaunohelper/com

2018-07-18 Thread Libreoffice Gerrit user

 bean/com/sun/star/comp/beans/LocalOfficeWindow.java|2 +-
 cui/source/dialogs/cuicharmap.cxx  |2 +-
 dbaccess/source/ui/dlg/indexdialog.cxx |4 ++--
 desktop/unx/source/splashx.c   |2 +-
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 +-
 extensions/source/dbpilots/controlwizard.hxx   |2 +-
 framework/source/jobs/jobdata.cxx  |2 +-
 include/sfx2/sidebar/Context.hxx   |2 +-
 include/svl/lstner.hxx |2 +-
 include/vcl/EnumContext.hxx|2 +-
 io/source/stm/omark.cxx|2 +-
 javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java |2 +-
 linguistic/source/lngopt.cxx   |2 +-
 qadevOOo/runner/helper/ProcessHandler.java |2 +-
 qadevOOo/tests/java/mod/_sc/ScChartObj.java|2 +-
 qadevOOo/tests/java/mod/_sc/ScChartsObj.java   |2 +-
 qadevOOo/tests/java/mod/_sch/ChXDiagram.java   |2 +-
 sc/source/ui/vba/vbarange.cxx  |6 +++---
 sd/source/ui/framework/factories/BasicViewFactory.cxx  |2 +-
 sd/source/ui/inc/ViewShellImplementation.hxx   |2 +-
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx|2 +-
 svx/source/table/tablecontroller.cxx   |   12 ++--
 svx/source/tbxctrls/tbcontrl.cxx   |4 ++--
 sw/inc/calbck.hxx  |2 +-
 sw/source/filter/html/htmltabw.cxx |2 +-
 sysui/desktop/man/unopkg.1 |2 +-
 tools/source/stream/stream.cxx |2 +-
 vcl/source/filter/ixbm/xbmread.cxx |2 +-
 vcl/source/filter/ixpm/xpmread.cxx |2 +-
 vcl/source/gdi/pdfwriter_impl.cxx  |2 +-
 vcl/source/outdev/gradient.cxx |4 ++--
 31 files changed, 41 insertions(+), 41 deletions(-)

New commits:
commit 563fe60878c2ad3289c5bdcd7d8647aea4280129
Author: Andrea Gelmini 
AuthorDate: Thu Jul 5 23:39:23 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Jul 18 12:49:03 2018 +0200

Fix typos

Change-Id: I5195d13b351c0eebad1eae901f7ce8408a9e5c92
Reviewed-on: https://gerrit.libreoffice.org/57028
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java 
b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index 0f5d9bffc4f4..67ace100fb5f 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -237,7 +237,7 @@ public class LocalOfficeWindow
  * 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.
+ * protocol shall be used for embedding the native Window.
 */
 protected Any getWrappedWindowHandle()
 {
diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 13e88e9df86d..83b05ff07812 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -584,7 +584,7 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont )
 
 if (aTmp.GetFamilyName() == "StarSymbol" && 
m_xFontLB->find_text(aTmp.GetFamilyName()) == -1)
 {
-//if for some reason, like font in an old document, StarSymbol is 
requested and its not available, then
+//if for some reason, like font in an old document, StarSymbol is 
requested and it's not available, then
 //try OpenSymbol instead
 aTmp.SetFamilyName("OpenSymbol");
 }
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx 
b/dbaccess/source/ui/dlg/indexdialog.cxx
index c12b89e5f5c1..e5b4effc40b4 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -388,7 +388,7 @@ namespace dbaui
 for (SvTreeListEntry* pAdjust = m_pIndexList->First(); pAdjust; 
pAdjust = m_pIndexList->Next(pAdjust))
 {
 Indexes::const_iterator aAfterInsertPos = 
m_pIndexes->find(m_pIndexList->GetEntryText(pAdjust));
-OSL_ENSURE(aAfterInsertPos != m_pIndexes->end(), 
"DbaIndexDialog::OnNewIndex: problems with on of the entries!");
+OSL_ENSURE(aAfterInsertPos != m_pIndexes->end(), 
"DbaIndexDialog::OnNewIndex: problems with one of the entries!");
 pAdjust->SetUserData(reinterpret_cast< void* 
>(sal_Int32(aAfterInsertPos -

[Libreoffice-commits] core.git: bean/com include/rtl include/vcl

2017-12-28 Thread Andrea Gelmini

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |2 +-
 include/rtl/ustring.h   |2 +-
 include/vcl/toolbox.hxx |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5877a3733c55d51f86edeb17c227fd89363154e4
Author: Andrea Gelmini 
Date:   Wed Dec 27 23:36:30 2017 +0100

Fix typos

Change-Id: I0a8579406a70d2f63d96969c766e2a43d830ed6f
Reviewed-on: https://gerrit.libreoffice.org/47114
Reviewed-by: TamÃ¡s Zolnai 
Tested-by: TamÃ¡s Zolnai 

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 5f03fcaa795d..a77c30d3e533 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -69,7 +69,7 @@ public class LocalOfficeConnection
 
 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
diff --git a/include/rtl/ustring.h b/include/rtl/ustring.h
index dfc099f93852..911cc033a721 100644
--- a/include/rtl/ustring.h
+++ b/include/rtl/ustring.h
@@ -161,7 +161,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL 
rtl_ustr_reverseCompare_WithLength(
 /** Compare two strings from back to front for equality.
 
 The comparison is based on the numeric value of each character in the
-strings and returns 'true' if, ans only if, both strings are equal.
+strings and returns 'true' if, and only if, both strings are equal.
 This function cannot be used for language-specific sorting.
 
 @param first
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index f49bcae6fd9a..8a98542f8ba4 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -56,8 +56,8 @@ namespace o3tl
 template<> struct typed_flags : 
is_typed_flags {};
 }
 
-// small, large, size32 force an exact toolbox size for proper alignemnt
-// dontcare will let the toolbox decide about its size
+// small, large, size32 force an exact toolbox size for proper alignment
+// DontCare will let the toolbox decide about its size
 enum class ToolBoxButtonSize
 {
 DontCare,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com qadevOOo/tests sc/source writerfilter/source

2017-08-20 Thread Julien Nabet

 bean/com/sun/star/comp/beans/OOoBean.java |2 +-
 qadevOOo/tests/java/ifc/document/_XTypeDetection.java |2 +-
 sc/source/ui/unoobj/cellsuno.cxx  |   10 +-
 writerfilter/source/filter/WriterFilter.cxx   |2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 4d21d4ceee0b43418a36fdb832c40265c0c3a562
Author: Julien Nabet 
Date:   Sun Aug 20 11:57:33 2017 +0200

Typo about "document"

Change-Id: Id12718b5b80b08f18fa9a0370c1991d94b2892ec
Reviewed-on: https://gerrit.libreoffice.org/41353
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 1f98e228c358..84e6a4f177f2 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -629,7 +629,7 @@ public class OOoBean
 if ( aFrame != null && xOldController != null )
 if (!xOldController.suspend(true))
 throw new 
com.sun.star.util.CloseVetoException(
-"Dokument is still being used and 
cannot be closed.", this);
+"Document is still being used and 
cannot be closed.", this);
 
 }
 catch (java.lang.IllegalStateException exp)
diff --git a/qadevOOo/tests/java/ifc/document/_XTypeDetection.java 
b/qadevOOo/tests/java/ifc/document/_XTypeDetection.java
index 9550e3b076d2..8aa1f5cdb52c 100644
--- a/qadevOOo/tests/java/ifc/document/_XTypeDetection.java
+++ b/qadevOOo/tests/java/ifc/document/_XTypeDetection.java
@@ -99,7 +99,7 @@ public class _XTypeDetection extends MultiMethodTest {
 result &= ok;
 log.println("deep detection should detect a calc and has detected '"+ 
type +"': " + ok);
 
-log.println("test dokument with bookmark: " + bookmarkURL);
+log.println("test document with bookmark: " + bookmarkURL);
 mediaDescr = new PropertyValue[1][1];
 mediaDescr[0][0] = new PropertyValue();
 mediaDescr[0][0].Name = "URL";
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index a764af6f594a..58ea904aa859 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -6801,7 +6801,7 @@ uno::Reference SAL_CALL 
ScTableSheetObj::getCharts()
 if ( pDocSh )
 return new ScChartsObj( pDocSh, GetTab_Impl() );
 
-OSL_FAIL("no Dokument");
+OSL_FAIL("no document");
 return nullptr;
 }
 
@@ -6812,7 +6812,7 @@ uno::Reference SAL_CALL 
ScTableSheetObj::getPivotChart
 if (pDocSh)
 return new sc::TablePivotCharts(pDocSh, GetTab_Impl());
 
-OSL_FAIL("no Document");
+OSL_FAIL("no document");
 return nullptr;
 }
 
@@ -6823,7 +6823,7 @@ uno::Reference SAL_CALL 
ScTableSheetObj::getDataPilotTa
 if ( pDocSh )
 return new ScDataPilotTablesObj( pDocSh, GetTab_Impl() );
 
-OSL_FAIL("no Dokument");
+OSL_FAIL("no document");
 return nullptr;
 }
 
@@ -6835,7 +6835,7 @@ uno::Reference SAL_CALL 
ScTableSheetObj::getScenarios()
 if ( pDocSh )
 return new ScScenariosObj( pDocSh, GetTab_Impl() );
 
-OSL_FAIL("no Dokument");
+OSL_FAIL("no document");
 return nullptr;
 }
 
@@ -6847,7 +6847,7 @@ uno::Reference SAL_CALL 
ScTableSheetObj::getAnnotation
 if ( pDocSh )
 return new ScAnnotationsObj( pDocSh, GetTab_Impl() );
 
-OSL_FAIL("no Dokument");
+OSL_FAIL("no document");
 return nullptr;
 }
 
diff --git a/writerfilter/source/filter/WriterFilter.cxx 
b/writerfilter/source/filter/WriterFilter.cxx
index 2f49a4743cd2..11cd6e1207d6 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -227,7 +227,7 @@ sal_Bool WriterFilter::filter(const uno::Sequence< 
beans::PropertyValue >& aDesc
 aGrabBagProperties["OOXCustomXml"] <<= 
pDocument->getCustomXmlDomList();
 aGrabBagProperties["OOXCustomXmlProps"] <<= 
pDocument->getCustomXmlDomPropsList();
 
-// Adding the saved Glossary Documnet DOM to the document's grab bag
+// Adding the saved Glossary Document DOM to the document's grab bag
 aGrabBagProperties["OOXGlossary"] <<= pDocument->getGlossaryDocDom();
 aGrabBagProperties["OOXGlossaryDom"] <<= 
pDocument->getGlossaryDomList();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2016-05-02 Thread Stephan Bergmann

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 583cfc97e98fcde242967fd6108c8635bc0ada25
Author: Stephan Bergmann 
Date:   Mon May 2 11:04:04 2016 +0200

Remove debug code

...that got introduced with c30b5d2a382162be94e6a6ac5d5794a074ebfaaa 
"cid#1358838
cid#1358839 cid#1358840 assert to avoid null pointer dereference"

Change-Id: I50faaf291ac9059ee557d059393a97a0fcc397bf

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 6132b76..c2d17b7 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -310,7 +310,6 @@ public class LocalOfficeConnection
 Object aInitialObject = null;
 try
 {
-System.out.println("debug, LocalOfficeConnection: mURL is 
'"+mURL+"'");
 aInitialObject = resolve(xLocalContext, mURL);
 }
 catch( com.sun.star.connection.NoConnectException e )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com sd/qa

2016-04-29 Thread Miklos Vajna

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |1 +
 sd/qa/unit/misc-tests.cxx   |3 +++
 2 files changed, 4 insertions(+)

New commits:
commit c30b5d2a382162be94e6a6ac5d5794a074ebfaaa
Author: Miklos Vajna 
Date:   Fri Apr 29 17:37:49 2016 +0200

cid#1358838 cid#1358839 cid#1358840 assert to avoid null pointer dereference

Change-Id: I95f069cb3efa7137c9382c9d9eb6d1353471d28e
Reviewed-on: https://gerrit.libreoffice.org/24498
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index c2d17b7..6132b76 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -310,6 +310,7 @@ public class LocalOfficeConnection
 Object aInitialObject = null;
 try
 {
+System.out.println("debug, LocalOfficeConnection: mURL is 
'"+mURL+"'");
 aInitialObject = resolve(xLocalContext, mURL);
 }
 catch( com.sun.star.connection.NoConnectException e )
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index f2ac807..bc73b5f 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -162,6 +162,7 @@ void SdMiscTest::testTdf99396()
 
 // Set the vertical alignment of the cells to bottom.
 sdr::table::SvxTableController* pTableController = 
dynamic_cast(pView->getSelectionController().get());
+CPPUNIT_ASSERT(pTableController);
 SfxRequest aRequest(pViewShell->GetViewFrame(), SID_TABLE_VERT_BOTTOM);
 pTableController->Execute(aRequest);
 // This was 0, it wasn't possible to undo a vertical alignment change.
@@ -178,6 +179,7 @@ void SdMiscTest::testTdf99396TextEdit()
 SdPage* pPage = pViewShell->GetActualPage();
 SdrObject* pObject = pPage->GetObj(0);
 auto pTableObject = dynamic_cast(pObject);
+CPPUNIT_ASSERT(pTableObject);
 SdrView* pView = pViewShell->GetView();
 pView->MarkObj(pObject, pView->GetSdrPageView());
 
@@ -199,6 +201,7 @@ void SdMiscTest::testTdf99396TextEdit()
 }
 {
 auto pTableController = 
dynamic_cast(pView->getSelectionController().get());
+CPPUNIT_ASSERT(pTableController);
 SfxRequest aRequest(pViewShell->GetViewFrame(), SID_TABLE_VERT_BOTTOM);
 pTableController->Execute(aRequest);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2016-04-27 Thread Miklos Vajna

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit db4cba76033124cbf1baa560b99700987fcdd3ae
Author: Miklos Vajna 
Date:   Wed Apr 27 15:43:28 2016 +0200

beans: if loading a library fails, show the reason

Don't do it for the MSVC libraries though, e.g. on my system loading
msvcr70 fails, but the SDK example works without problems.

Change-Id: I81bc0b64967e7abb74ca1fff7a2e4b4dbd75d5a5
Reviewed-on: https://gerrit.libreoffice.org/24432
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 5c67e90..c2d17b7 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -99,7 +99,8 @@ public class LocalOfficeConnection
 catch (Throwable e)
 {
 // loading twice would fail
-System.err.println( "cannot find uwinapi" );
+System.err.println("cannot find uwinapi:");
+e.printStackTrace();
 }
 
 try
@@ -109,7 +110,8 @@ public class LocalOfficeConnection
 catch (Throwable e)
 {
 // loading twice would fail
-System.err.println( "cannot find jawt" );
+System.err.println("cannot find jawt:");
+e.printStackTrace();
 }
 }
 
@@ -773,3 +775,5 @@ public class LocalOfficeConnection
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2016-04-25 Thread Miklos Vajna

 bean/com/sun/star/comp/beans/OOoBean.java |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e58aa27adf5cc28a8a734263e0e0b6e331b095a9
Author: Miklos Vajna 
Date:   Mon Apr 25 16:10:21 2016 +0200

bean: fix the OfficeBean SDK example

Regression from 26b4f5be815bc7c77deb3d38d23b51c9dea9fcd1 (java:use
System.arrayCopy to copy arrays, 2015-06-09), as the old code used to handle
the case when aArguments was null.

How to reproduce:

1) Source the SDK environment.
2) cd instdir/sdk/examples/DevelopersGuide/OfficeBean/
3) make OOoBeanViewer.run
4) Click new document... -> Text Document -> NullPointerException

Change-Id: I5521c7fd200f6c74c5f2665f2e4a99f0d6abfeeb
Reviewed-on: https://gerrit.libreoffice.org/24366
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 5d79c21..28bde3f 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1349,7 +1349,8 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 new com.sun.star.beans.PropertyValue[ nNumArgs + 1 ];
 
 // copy current arguments
-System.arraycopy(aArguments, 0, aExtendedArguments, 0, nNumArgs);
+if (aArguments != null)
+System.arraycopy(aArguments, 0, aExtendedArguments, 0, nNumArgs);
 
 // add new argument
 aExtendedArguments[ nNumArgs ] = aArgument;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2015-10-16 Thread Noel Grandin

 bean/com/sun/star/comp/beans/LocalOfficeWindow.java |   28 +++-
 1 file changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 9ca4c4f086c1abf558fd6b9cc7503318b72f2858
Author: Noel Grandin 
Date:   Fri Oct 16 12:51:40 2015 +0200

cid#1326334 Unguarded read

Change-Id: I8cfe2805f2b8c1ae23fa955a28ff9ec43f353e38

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java 
b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index b8b493e..a968de8 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -76,18 +76,6 @@ public class LocalOfficeWindow
 }
 
 /**
- * Retrieves an UNO XWindowPeer object associated with the OfficeWindow.
- *
- * @return The UNO XWindowPeer object associated with the OfficeWindow.
- */
-public XWindowPeer getUNOWindowPeer()
-{
-if (mWindow == null)
-createUNOWindowPeer();
-return mWindow;
-}
-
-/**
  * Receives a notification about the connection has been closed.
  * This method has to set the connection to null.
  *
@@ -171,11 +159,16 @@ public class LocalOfficeWindow
 releaseSystemWindow();
 }
 
-   /** Factory method for a UNO AWT toolkit window as a child of this Java 
window.
-*
-*/
-   private synchronized XWindowPeer createUNOWindowPeer()
-   {
+/**
+ * Retrieves an UNO XWindowPeer object associated with the OfficeWindow.
+ *
+ * @return The UNO XWindowPeer object associated with the OfficeWindow.
+ */
+public synchronized XWindowPeer getUNOWindowPeer()
+{
+if (mWindow != null)
+return mWindow;
+
 try
 {
 // get this windows native window type
@@ -217,6 +210,7 @@ public class LocalOfficeWindow
 
 return mWindow;
 }
+
 /** We make sure that the office window is notified that the parent
  *  will be removed.
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com connectivity/com jurt/com nlpsolver/src qadevOOo/runner qadevOOo/tests reportbuilder/java scripting/java wizards/com xmerge/source

2015-10-15 Thread Noel Grandin

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java
 |2 -
 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java 
 |2 -
 jurt/com/sun/star/comp/servicemanager/ServiceManager.java  
 |2 -
 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java 
 |2 -
 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java  
 |2 -
 qadevOOo/runner/helper/OfficeProvider.java 
 |2 -
 qadevOOo/runner/helper/ProcessHandler.java 
 |2 -
 qadevOOo/tests/java/ifc/awt/_XButton.java  
 |2 -
 qadevOOo/tests/java/ifc/awt/_XCheckBox.java
 |2 -
 qadevOOo/tests/java/ifc/awt/_XComboBox.java
 |4 +--
 qadevOOo/tests/java/ifc/awt/_XImageProducer.java   
 |2 -
 qadevOOo/tests/java/ifc/awt/_XListBox.java 
 |4 +--
 qadevOOo/tests/java/ifc/awt/_XRadioButton.java 
 |2 -
 qadevOOo/tests/java/ifc/awt/_XSpinField.java   
 |2 -
 qadevOOo/tests/java/ifc/awt/_XTopWindow.java   
 |2 -
 qadevOOo/tests/java/ifc/awt/_XWindow.java  
 |   12 +-
 qadevOOo/tests/java/ifc/beans/_XPropertySet.java   
 |2 -
 qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java   
 |2 -
 qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
 |4 +--
 qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java
 |4 +--
 qadevOOo/tests/java/ifc/document/_XFilter.java 
 |2 -
 qadevOOo/tests/java/ifc/form/_XFormController.java 
 |2 -
 qadevOOo/tests/java/ifc/form/_XLoadable.java   
 |2 -
 qadevOOo/tests/java/ifc/form/_XSubmit.java 
 |2 -
 qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java  
 |2 -
 qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java  
 |2 -
 qadevOOo/tests/java/ifc/form/validation/_XValidatable.java 
 |2 -
 qadevOOo/tests/java/ifc/frame/_XDispatch.java  
 |4 +--
 qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java  
 |2 -
 qadevOOo/tests/java/ifc/frame/_XFrameLoader.java   
 |2 -
 qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java 
 |2 -
 qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java   
 |2 -
 qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java 
 |2 -
 qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java
 |2 -
 qadevOOo/tests/java/ifc/sdbc/_XRowSet.java 
 |2 -
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
 |2 -
 qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java   
 |2 -
 qadevOOo/tests/java/ifc/style/_CharacterProperties.java
 |2 -
 qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
 |2 -
 qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java   
 |2 -
 qadevOOo/tests/java/ifc/util/_XFlushable.java  
 |2 -
 qadevOOo/tests/java/mod/_dbaccess/ORowSet.java 
 |2 -
 qadevOOo/tests/java/mod/_forms/ODatabaseForm.java  
 |2 -
 qadevOOo/tests/java/mod/_remotebridge/various.java 
 |2 -
 qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java   
 |2 -
 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java   
 |2 -

[Libreoffice-commits] core.git: bean/com

2015-06-03 Thread Noel Grandin

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 83f25d3c6e0918a1d29aa3a923b7f35f0b8a55e2
Author: Noel Grandin n...@peralex.com
Date:   Tue Jun 2 09:48:08 2015 +0200

reduce sleep when connecting to soffice from Java

500ms is an eternity on modern machines

Change-Id: I7f16935e9b09c734d05d2430dc0efb3be44617b8
Reviewed-on: https://gerrit.libreoffice.org/16038
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index c6f6fa3..117ff39 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -318,22 +318,21 @@ public class LocalOfficeConnection
 aSOffice.startupService();
 
 // wait until soffice is started
-long nMaxMillis = System.currentTimeMillis() + 
1000L*aSOffice.getStartupTime();
+long nGiveUpTimeMillis = System.currentTimeMillis() + 
1000L*aSOffice.getStartupTime();
 while ( aInitialObject == null )
 {
 try
 {
 Thread.currentThread();
 // try to connect to soffice
-Thread.sleep( 500 );
+Thread.sleep( 100 );
 aInitialObject = resolve(xLocalContext, mURL);
 }
 catch( com.sun.star.connection.NoConnectException aEx )
 {
 // soffice did not start in time
-if ( System.currentTimeMillis()  nMaxMillis )
+if ( System.currentTimeMillis()  nGiveUpTimeMillis )
 throw aEx;
-
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com qadevOOo/runner qadevOOo/tests ridljar/com wizards/com

2014-11-18 Thread Noel Grandin

 bean/com/sun/star/comp/beans/ContainerFactory.java |5 +
 bean/com/sun/star/comp/beans/InvalidArgumentException.java |3 +--
 bean/com/sun/star/comp/beans/OOoBean.java  |8 +++-
 bean/com/sun/star/comp/beans/OfficeConnection.java |3 +--
 bean/com/sun/star/comp/beans/OfficeWindow.java |3 +--
 qadevOOo/runner/complexlib/MethodThread.java   |2 +-
 qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java |1 -
 ridljar/com/sun/star/uno/Union.java|3 +--
 wizards/com/sun/star/wizards/common/UCB.java   |4 +---
 9 files changed, 10 insertions(+), 22 deletions(-)

New commits:
commit 757748180971ee9ecb5feb1bb6364844da9992c0
Author: Noel Grandin n...@peralex.com
Date:   Wed Nov 12 15:53:15 2014 +0200

java: rather use @Deprecated annotation

than an empty @deprecated tag

Change-Id: I1646ce1c0c8823ac5be0153aeb8eb2b830e7ebfa
Reviewed-on: https://gerrit.libreoffice.org/12525
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bean/com/sun/star/comp/beans/ContainerFactory.java 
b/bean/com/sun/star/comp/beans/ContainerFactory.java
index d06a082..d7ebfba 100644
--- a/bean/com/sun/star/comp/beans/ContainerFactory.java
+++ b/bean/com/sun/star/comp/beans/ContainerFactory.java
@@ -22,11 +22,8 @@ import java.awt.Container;
 
 /**
  * This interface represents an AWT container factory.
- *
- * @deprecated
- *
  */
-
+@Deprecated
 public interface ContainerFactory
 {
 /**
diff --git a/bean/com/sun/star/comp/beans/InvalidArgumentException.java 
b/bean/com/sun/star/comp/beans/InvalidArgumentException.java
index cfb288f..2c15f2d 100644
--- a/bean/com/sun/star/comp/beans/InvalidArgumentException.java
+++ b/bean/com/sun/star/comp/beans/InvalidArgumentException.java
@@ -19,9 +19,8 @@
 package com.sun.star.comp.beans;
 
 /** indicates an invalid argument in a function call.
- *
- * @deprecated
  */
+@Deprecated
 public class InvalidArgumentException extends Exception
 {
 }
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 04abd76..ddf20b2 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -82,8 +82,8 @@ public class OOoBean
 
 // @requirement FUNC.PER/0.2
 /** @internal
- *  @deprecated
  */
+@Deprecated
 public void writeExternal( java.io.ObjectOutput aObjOut )
 {
 // TBD
@@ -91,8 +91,8 @@ public class OOoBean
 
 // @requirement FUNC.PER/0.2
 /** @internal
- *  @deprecated
  */
+@Deprecated
 public void readExternal( java.io.ObjectInput aObjIn )
 {
 // TBD
@@ -1312,9 +1312,7 @@ 
xLayoutManager.showElement(private:resource/menubar/menubar);
 setLayout(new java.awt.BorderLayout());
 }
 
-/**
-@deprecated
- */
+@Deprecated
 @Override
 public void paint( java.awt.Graphics aGraphics )
 {
diff --git a/bean/com/sun/star/comp/beans/OfficeConnection.java 
b/bean/com/sun/star/comp/beans/OfficeConnection.java
index 2786810..a2960d9 100644
--- a/bean/com/sun/star/comp/beans/OfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/OfficeConnection.java
@@ -26,9 +26,8 @@ import com.sun.star.uno.XComponentContext;
 /**
  * This abstract class represents a connection to the office
  * application.
-
-@deprecated
  */
+@Deprecated
 public interface OfficeConnection
 extends XComponent
 {
diff --git a/bean/com/sun/star/comp/beans/OfficeWindow.java 
b/bean/com/sun/star/comp/beans/OfficeWindow.java
index 599bf02..a28489e 100644
--- a/bean/com/sun/star/comp/beans/OfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/OfficeWindow.java
@@ -26,9 +26,8 @@ import com.sun.star.awt.XWindowPeer;
  * 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
  */
+@Deprecated
 public interface OfficeWindow
 {
 /**
diff --git a/qadevOOo/runner/complexlib/MethodThread.java 
b/qadevOOo/runner/complexlib/MethodThread.java
index b6f1b81..11bdcb6 100644
--- a/qadevOOo/runner/complexlib/MethodThread.java
+++ b/qadevOOo/runner/complexlib/MethodThread.java
@@ -114,8 +114,8 @@ public class MethodThread extends Thread
 
 /**
  * Stop the running method.
- * @deprecated
  */
+@Deprecated
 @Override
 public void destroy()
 {
diff --git a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java 
b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
index 4b52450..9409cf3 100644
--- a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
+++ b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
@@ -49,7 +49,6 @@ public class _XTasksSupplier extends MultiMethodTest {
 /**
 * DEPRECATED. p
 * Has b OK /b status.
-* @deprecated
 */
 @Deprecated

[Libreoffice-commits] core.git: bean/com connectivity/qa qadevOOo/runner

2014-10-25 Thread Robert Antoni Buj i Gelonch

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java|2 -
 connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java |   18 
+-
 qadevOOo/runner/convwatch/SimpleFileSemaphore.java |2 -
 qadevOOo/runner/convwatch/TimeHelper.java  |2 -
 qadevOOo/runner/graphical/TimeHelper.java  |2 -
 qadevOOo/runner/helper/OfficeProvider.java |2 -
 qadevOOo/runner/helper/ProcessHandler.java |2 -
 7 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit e61c4b5f06241dd248cfe28b29cb658ea47bd72e
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Thu Oct 16 18:58:13 2014 +0200

java: prevent overflow by using 'long int' arithmetic in multiplication

Change-Id: I8dda8f4621f265208c713c9edcfe725f1c9c5998
Reviewed-on: https://gerrit.libreoffice.org/12001
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index da86510..7174dca 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -318,7 +318,7 @@ public class LocalOfficeConnection
 aSOffice.startupService();
 
 // wait until soffice is started
-long nMaxMillis = System.currentTimeMillis() + 
1000*aSOffice.getStartupTime();
+long nMaxMillis = System.currentTimeMillis() + 
1000L*aSOffice.getStartupTime();
 while ( aInitialObject == null )
 {
 try
diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java 
b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index 57ce3f9..ecca4fd 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -335,7 +335,7 @@ public class TestCacheSize {
 
 System.out.println(Total insert:  + i);
 System.out.println(Insert time:  + sw.elapsedTime() +  rps: 
-   + (i * 1000 / (sw.elapsedTime() + 1)));
+   + (1000L * i / (sw.elapsedTime() + 1)));
 }
 
 private void fillUpMultiTable(String filler,
@@ -388,7 +388,7 @@ public class TestCacheSize {
 
 System.out.println(Multi Key Total insert:  + i);
 System.out.println(Insert time:  + sw.elapsedTime() +  rps: 
-   + (i * 1000 / (sw.elapsedTime() + 1)));
+   + (1000L * i / (sw.elapsedTime() + 1)));
 }
 
 public void tearDown() {}
@@ -478,7 +478,7 @@ public class TestCacheSize {
 || (slow  (i + 1) % 100 == 0)) {
 System.out.println(Select  + (i + 1) +  : 
+ sw.elapsedTime() +  rps: 
-   + (i * 1000 / (sw.elapsedTime() + 1)));
+   + (1000L * i / (sw.elapsedTime() + 1)));
 }
 }
 } catch (SQLException e) {
@@ -487,7 +487,7 @@ public class TestCacheSize {
 
 System.out.println(Select random zip  + i +  rows : 
+ sw.elapsedTime() +  rps: 
-   + (i * 1000 / (sw.elapsedTime() + 1)));
+   + (1000L * i / (sw.elapsedTime() + 1)));
 sw.zero();
 
 try {
@@ -511,7 +511,7 @@ public class TestCacheSize {
 
 System.out.println(Select random id  + i +  rows : 
+ sw.elapsedTime() +  rps: 
-   + (i * 1000 / (sw.elapsedTime() + 1)));
+   + (1000L * i / (sw.elapsedTime() + 1)));
 sw.zero();
 
 try {
@@ -535,7 +535,7 @@ public class TestCacheSize {
 
 System.out.println(Select random zip from zip table  + i
+  rows :  + sw.elapsedTime() +  rps: 
-   + (i * 1000 / (sw.elapsedTime() + 1)));
+   + (1000L * i / (sw.elapsedTime() + 1)));
 }
 
 private void checkUpdates() {
@@ -570,7 +570,7 @@ public class TestCacheSize {
 System.out.println(Update with random zip  + i
+  UPDATE commands,  + count +  rows : 
+ sw.elapsedTime() +  rps: 
-   + (count * 1000 / (sw.elapsedTime() + 1)));
+   + (1000L * count / (sw.elapsedTime() + 1)));
 sw.zero();
 
 try {
@@ -588,7 +588,7 @@ public class TestCacheSize {
 || (slow  (i + 1) % 100 == 0)) {
 System.out.println(Update  + (i + 1) +  : 
+ sw.elapsedTime() +  rps: 
-   + (i *

[Libreoffice-commits] core.git: bean/com

2014-10-11 Thread Robert Antoni Buj i Gelonch

 bean/com/sun/star/comp/beans/OOoBean.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c48deb59ffb67ac0ddd315ba58872cbf978bc74
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Sat Oct 11 19:58:11 2014 +0200

bean: String comparison

Change-Id: Id2449ac887c92f87deb3b871b178ac16d3d6b4b8
Reviewed-on: https://gerrit.libreoffice.org/11922
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 0d1e34e..d874386 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1330,7 +1330,7 @@ 
xLayoutManager.showElement(private:resource/menubar/menubar);
 // is new argument already set?
 for ( int n = 0; n  nNumArgs; ++n )
 {
-if ( aArguments[n].Name == aArgument.Name )
+if ( aArguments[n].Name.equals(aArgument.Name) )
 {
 // substitute this argument
 aArguments[n] = aArgument;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2014-10-10 Thread Robert Antoni Buj i Gelonch

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |   12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 017ea9eb0f80ba750f0cf917033052c75e622c0a
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Thu Oct 9 20:00:10 2014 +0200

bean: Use com.sun.star.uno.RuntimeException(Throwable thrwbl)

Change-Id: I6677072c349fc8c1997030b78fa38a5d78aec361
Reviewed-on: https://gerrit.libreoffice.org/11889
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index ac260fe..52cef3c 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -134,15 +134,11 @@ public class LocalOfficeConnection
 }
 catch ( java.net.MalformedURLException e )
 {
-com.sun.star.uno.RuntimeException e2 = new 
com.sun.star.uno.RuntimeException();
-e2.initCause(e);
-throw e2;
+throw new com.sun.star.uno.RuntimeException(e);
 }
 catch ( UnsupportedEncodingException e)
 {
-com.sun.star.uno.RuntimeException e2 = new 
com.sun.star.uno.RuntimeException();
-e2.initCause(e);
-throw e2;
+throw new com.sun.star.uno.RuntimeException(e);
 }
 }
 
@@ -672,9 +668,7 @@ public class LocalOfficeConnection
 }
 catch (UnsupportedEncodingException e)
 {
-com.sun.star.uno.RuntimeException e2 = new 
com.sun.star.uno.RuntimeException();
-e2.initCause(e);
-throw e2;
+throw new com.sun.star.uno.RuntimeException(e);
 }
 return identifier;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com bean/Jar_officebean.mk

2014-09-30 Thread Stephan Bergmann

 bean/Jar_officebean.mk |8 
 bean/com/sun/star/beans/ContainerFactory.java  |   38 -
 bean/com/sun/star/beans/JavaWindowPeerFake.java|  113 ---
 bean/com/sun/star/beans/LocalOfficeConnection.java |  611 -
 bean/com/sun/star/beans/LocalOfficeWindow.java |  304 --
 bean/com/sun/star/beans/NativeConnection.java  |   50 -
 bean/com/sun/star/beans/NativeService.java |   27 
 bean/com/sun/star/beans/OfficeConnection.java  |   69 --
 bean/com/sun/star/beans/OfficeWindow.java  |   46 -
 9 files changed, 1266 deletions(-)

New commits:
commit 3aa70e21d7d5fdbf68aebe90a4967ec8350db43f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Sep 30 14:40:05 2014 +0200

[API CHANGE] OfficeBean: remove deprecated com.sun.star.beans classes


https://wiki.openoffice.org/wiki/Documentation/DevGuide/JavaBean/The_Internal_Office_Bean_API:
Prior to OpenOffice.org 2.0 all Office Bean classes were in the
com.sun.star.bean package.  As of OpenOffice.org 2.0 the classes are 
contained
in the com.sun.star.comp.bean package.  The classes of the com.sun.star.bean
package are still contained in the officebean.jar but they are deprecated.
Further development and bug fixing will occur only in the 
com.sun.star.comp.bean
package.

Change-Id: I9421bfba941d9801a5cf8886ca971275740d178a

diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk
index 85278831..12b895a 100644
--- a/bean/Jar_officebean.mk
+++ b/bean/Jar_officebean.mk
@@ -20,14 +20,6 @@ $(eval $(call gb_Jar_use_jars,officebean,\
 $(eval $(call gb_Jar_set_packageroot,officebean,com))
 
 $(eval $(call gb_Jar_add_sourcefiles,officebean,\
-   bean/com/sun/star/beans/ContainerFactory \
-   bean/com/sun/star/beans/JavaWindowPeerFake \
-   bean/com/sun/star/beans/LocalOfficeConnection \
-   bean/com/sun/star/beans/LocalOfficeWindow \
-   bean/com/sun/star/beans/NativeConnection \
-   bean/com/sun/star/beans/NativeService \
-   bean/com/sun/star/beans/OfficeConnection \
-   bean/com/sun/star/beans/OfficeWindow \
bean/com/sun/star/comp/beans/ContainerFactory \
bean/com/sun/star/comp/beans/Controller \
bean/com/sun/star/comp/beans/Frame \
diff --git a/bean/com/sun/star/beans/ContainerFactory.java 
b/bean/com/sun/star/beans/ContainerFactory.java
deleted file mode 100644
index e3c0c9d..000
--- a/bean/com/sun/star/beans/ContainerFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 regarding copyright
- *   ownership. The ASF licenses this file 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 .
- */
-
-package com.sun.star.beans;
-
-import java.awt.Container;
-
-/**
- * This interface reprecents an AWT container factory.
- *
- * @see OfficeBean
- * @deprecated
- */
-
-public interface ContainerFactory
-{
-/**
- * Creates an AWT container.
- *
- * @return An AWT container.
- */
-Container createContainer();
-}
diff --git a/bean/com/sun/star/beans/JavaWindowPeerFake.java 
b/bean/com/sun/star/beans/JavaWindowPeerFake.java
deleted file mode 100644
index efd57d0..000
--- a/bean/com/sun/star/beans/JavaWindowPeerFake.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 regarding copyright
- *   ownership. The ASF licenses this file 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 .
- */
-
-package com.sun.star.beans;
-
-import com.sun.star.awt.*;
-
-/** pClass to pass the system window handle to the OpenOffice.org 
toolkit./p
- *  @deprecated
- */
-/* package */ class JavaWindowPeerFake
-

[Libreoffice-commits] core.git: bean/com bridges/test codemaker/source framework/qa javaunohelper/com jurt/com qadevOOo/runner qadevOOo/tests ridljar/com scripting/java xmerge/source xmlsecurity/test_

2014-09-25 Thread Noel Grandin

 bean/com/sun/star/beans/LocalOfficeConnection.java 
   |2 
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java
   |2 
 bridges/test/java_uno/nativethreadpool/Relay.java  
   |8 
 codemaker/source/javamaker/javatype.cxx
   |  137 +++
 framework/qa/complex/framework/recovery/RecoveryTools.java 
   |   16 
 javaunohelper/com/sun/star/comp/helper/Bootstrap.java  
   |2 
 
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
  |   14 
 
javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
|8 
 
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
  |   16 
 
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
|   12 
 javaunohelper/com/sun/star/lib/uno/helper/Factory.java 
   |7 
 javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java  
   |2 
 jurt/com/sun/star/comp/connections/PipedConnection.java
   |7 
 jurt/com/sun/star/comp/loader/FactoryHelper.java   
   |   14 
 jurt/com/sun/star/comp/servicemanager/ServiceManager.java  
   |2 
 jurt/com/sun/star/lib/connections/socket/socketAcceptor.java   
   |7 
 jurt/com/sun/star/lib/connections/socket/socketConnector.java  
   |9 
 
jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
 |4 
 
jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
|6 
 jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java   
   |  352 --
 jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java 
   |  279 +++
 jurt/com/sun/star/lib/uno/protocols/urp/urp.java   
   |2 
 qadevOOo/runner/lib/StatusException.java   
   |8 
 qadevOOo/runner/util/UITools.java  
   |2 
 qadevOOo/runner/util/utils.java
   |4 
 qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java
   |2 
 qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java  
   |2 
 qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java
   |2 
 qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java   
   |2 
 ridljar/com/sun/star/uno/Type.java 
   |2 
 ridljar/com/sun/star/uno/UnoRuntime.java   
   |8 
 scripting/java/com/sun/star/script/framework/container/Parcel.java 
   |   10 
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
   |   32 
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
   |   11 
 scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java  
   |4 
 scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java  
   |   15 
 
scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java
  |   20 
 
scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.java
 |   11 
 
scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java
   |   11 
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java 
   |   11 
 
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
 |7 
 xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java
   |4 
 42 files changed, 556 insertions(+), 520 deletions(-)

New commits:
commit 83636d2c09802aeeb1b30078022d228d04da21eb
Author: Noel Grandin n...@peralex.com
Date:   Fri Aug 15 16:17:25 2014 +0200

java: when rethrowing exceptions, store the original cause

so that we get a nice complete stacktrace when it hits the final
handler

Change-Id: Iec4fcc15a2a25c55f591b5e069dce3d010197a90

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index b091d54..a47650d 100644
---

[Libreoffice-commits] core.git: bean/com

2014-09-17 Thread Robert Antoni Buj i Gelonch

 bean/com/sun/star/beans/LocalOfficeConnection.java |   33 -
 1 file changed, 26 insertions(+), 7 deletions(-)

New commits:
commit bd21a82ea4c7499dd8401687f641d44a7593dc44
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Tue Sep 16 18:15:12 2014 +0200

bean: encode(String) in URLEncoder has been deprecated

Change-Id: Ife3ed199e79aeb6886a146324ffb145c7bc3
Reviewed-on: https://gerrit.libreoffice.org/11476
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index af2be37..e972e2b 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -20,6 +20,7 @@ package com.sun.star.beans;
 
 import java.awt.Container;
 import java.io.File;
+import java.io.UnsupportedEncodingException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
@@ -72,7 +73,17 @@ public class LocalOfficeConnection
 setUnoUrl( uno:pipe,name= + getPipeName() + 
;urp;StarOffice.ServiceManager );
 }
 catch ( java.net.MalformedURLException e )
-{}
+{
+com.sun.star.uno.RuntimeException e2 = new 
com.sun.star.uno.RuntimeException();
+e2.initCause(e);
+throw e2;
+}
+catch ( UnsupportedEncodingException e)
+{
+com.sun.star.uno.RuntimeException e2 = new 
com.sun.star.uno.RuntimeException();
+e2.initCause(e);
+throw e2;
+}
 
 // load libofficebean.so/officebean.dll
 String aSharedLibName = getProgramPath() + java.io.File.separator +
@@ -525,12 +536,12 @@ public class LocalOfficeConnection
 
 /** creates a unique pipe name.
 */
-static String getPipeName()
+static String getPipeName() throws UnsupportedEncodingException
 {
 // turn user name into a URL and file system safe name (% chars will 
not work)
 String aPipeName = System.getProperty(user.name) + OFFICE_ID_SUFFIX;
 aPipeName = aPipeName.replace( _, %B7 );
-return java.net.URLEncoder.encode(aPipeName).replace( \\+, %20 
).replace( %, _ );
+return java.net.URLEncoder.encode(aPipeName, UTF-8).replace( \\+, 
%20 ).replace( %, _ );
 }
 
 /**
@@ -547,10 +558,18 @@ public class LocalOfficeConnection
  */
 public String getIdentifier()
 {
-if ( mPipe == null)
-return getPipeName();
-else
-return mPipe;
+String identifier = null;
+try
+{
+identifier = ( mPipe == null) ? getPipeName() : mPipe;
+}
+catch (UnsupportedEncodingException e)
+{
+com.sun.star.uno.RuntimeException e2 = new 
com.sun.star.uno.RuntimeException();
+e2.initCause(e);
+throw e2;
+}
+return identifier;
 }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2014-09-17 Thread Robert Antoni Buj i Gelonch

 bean/com/sun/star/beans/LocalOfficeConnection.java  |3 ++-
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 99920c36e926471311b940902c132d48370328ca
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Tue Sep 16 18:34:08 2014 +0200

bean: Array concatenated with a String


http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Arrays.html#toString(java.lang.Object[])

Change-Id: I42090bf534a9a59fa97061ec2855f79328b1dd45
Reviewed-on: https://gerrit.libreoffice.org/11478
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index e972e2b..b091d54 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.lang.XEventListener;
@@ -594,7 +595,7 @@ public class LocalOfficeConnection
 // start process
 mProcess = Runtime.getRuntime().exec(cmdArray);
 if ( mProcess == null )
-throw new RuntimeException( cannot start soffice:  + 
cmdArray );
+throw new RuntimeException( cannot start soffice:  + 
Arrays.toString(cmdArray) );
 }
 
 /**
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index f1299cd..7f1a95a 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.lang.XComponent;
@@ -725,7 +726,7 @@ public class LocalOfficeConnection
 // start process
 mProcess = Runtime.getRuntime().exec(cmdArray);
 if ( mProcess == null )
-throw new com.sun.star.uno.RuntimeException( cannot start 
soffice:  + cmdArray );
+throw new com.sun.star.uno.RuntimeException( cannot start 
soffice:  + Arrays.toString(cmdArray) );
 new StreamProcessor(mProcess.getInputStream(), System.out);
 new StreamProcessor(mProcess.getErrorStream(), System.err);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2014-09-10 Thread rbuj

 bean/com/sun/star/comp/beans/LocalOfficeWindow.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f114c3d00f73441a405d25bc6d98be3a829cd8e
Author: rbuj robert@gmail.com
Date:   Tue Sep 9 19:22:59 2014 +0200

bean: Boolean Parsing

Change-Id: If5e77da2b42b126e2c8fd7613b6adaed635fd683
Reviewed-on: https://gerrit.libreoffice.org/11364
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java 
b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index 0fb6f9d..84c2a8a 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -266,7 +266,7 @@ public class LocalOfficeWindow
 String vendor = System.getProperty(java.vendor);
 if ((vendor.equals(Sun Microsystems Inc.)
 || vendor.equals(Oracle Corporation))
- 
Boolean.valueOf(System.getProperty(sun.awt.xembedserver)).booleanValue())
+ 
Boolean.parseBoolean(System.getProperty(sun.awt.xembedserver)))
 {
 xembed = new NamedValue(
 XEMBED,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2014-02-25 Thread Alexander Wilms

 bean/com/sun/star/beans/LocalOfficeConnection.java |2 -
 bean/com/sun/star/beans/LocalOfficeWindow.java |2 -
 bean/com/sun/star/comp/beans/Controller.java   |8 +++
 bean/com/sun/star/comp/beans/Frame.java|   12 +--
 bean/com/sun/star/comp/beans/OOoBean.java  |   10 -
 bean/com/sun/star/comp/beans/OfficeDocument.java   |   22 ++---
 bean/com/sun/star/comp/beans/Wrapper.java  |   10 -
 7 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 54932e7e182962c4084dcbc094650eec13960029
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date:   Tue Feb 25 17:42:33 2014 +0100

Remove visual noise from bean

Change-Id: Ifc6889ef79bd4002c03006a48149594e0ed6690b
Reviewed-on: https://gerrit.libreoffice.org/8235
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index d8e7b3b..02a08d0 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -330,7 +330,7 @@ public class LocalOfficeConnection
 aExec = OFFICE_APP_NAME + .exe;
 
 // add other non-UNIX operating systems here
-// ...
+
 
 // find soffice executable relative to this class's class loader:
 File path = NativeLibraryLoader.getResource(
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java 
b/bean/com/sun/star/beans/LocalOfficeWindow.java
index 8f79b99..bb58b65 100644
--- a/bean/com/sun/star/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/beans/LocalOfficeWindow.java
@@ -251,7 +251,7 @@ public class LocalOfficeWindow
  */
 private native int getNativeWindowSystemType();
 
-
//---
+
 /** Helper class to watch calls into OOo with a timeout.
  * @deprecated
  */
diff --git a/bean/com/sun/star/comp/beans/Controller.java 
b/bean/com/sun/star/comp/beans/Controller.java
index 9521af6..9e93c58 100644
--- a/bean/com/sun/star/comp/beans/Controller.java
+++ b/bean/com/sun/star/comp/beans/Controller.java
@@ -40,9 +40,9 @@ public class Controller
 xController );
 }
 
-//==
+
 // com.sun.star.frame.XController
-//--
+
 
 public void attachFrame( /*IN*/ com.sun.star.frame.XFrame xFrame )
 {
@@ -79,9 +79,9 @@ public class Controller
 return xController.getFrame();
 }
 
-//==
+
 // com.sun.star.frame.XDispatchProvider
-//--
+
 
 public com.sun.star.frame.XDispatch queryDispatch(
 /*IN*/ com.sun.star.util.URL aURL,
diff --git a/bean/com/sun/star/comp/beans/Frame.java 
b/bean/com/sun/star/comp/beans/Frame.java
index b14b633..62affe3 100644
--- a/bean/com/sun/star/comp/beans/Frame.java
+++ b/bean/com/sun/star/comp/beans/Frame.java
@@ -45,9 +45,9 @@ public class Frame
 xFrame );
 }
 
-//==
+
 // com.sun.star.frame.XFrame
-//--
+
 
 public void initialize( /*IN*/ com.sun.star.awt.XWindow xWindow )
 {
@@ -134,9 +134,9 @@ public class Frame
 xFrame.removeFrameActionListener( xListener );
 }
 
-//==
+
 // com.sun.star.frame.XDispatchProvider
-//--
+
 
 public com.sun.star.frame.XDispatch queryDispatch(
 /*IN*/ com.sun.star.util.URL aURL,
@@ -152,9 +152,9 @@ public class Frame
 return xDispatchProvider.queryDispatches( aRequests );
 }
 
-//==
+
 // com.sun.star.frame.XDispatchProviderInterception
-//--
+
 
 public void registerDispatchProviderInterceptor(
 /*IN*/ com.sun.star.frame.XDispatchProviderInterceptor 
xInterceptor )
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 49bab1b..e5a1102 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1029,7 +1029,7 @@ 
xLayoutManager.showElement(private:resource/menubar/menubar);
 bIgnoreVisibility = false;
 }
 
-
//--
+
 /** Applies all tool visiblities to the real thing.
 
 @deprecated Clients should use the service

[Libreoffice-commits] core.git: bean/com connectivity/source

2014-02-19 Thread Julien Nabet

 bean/com/sun/star/comp/beans/OOoBean.java   |2 +-
 connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 488bb7ca0caf0f7f97d05e470783aec71ef13e75
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Feb 19 22:33:24 2014 +0100

Typo: interupted - interrupted

Change-Id: I9b2a53318e288a8236dbd76568ae28fbbb6cfe5f

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 7562012..49bab1b 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1483,7 +1483,7 @@ 
xLayoutManager.showElement(private:resource/menubar/menubar);
 }
 catch ( java.lang.InterruptedException aExc )
 {
-dbgPrint(EventListener( + aTag + ) interupted.);
+dbgPrint(EventListener( + aTag + ) interrupted.);
 // thread can be ended by EvendListener.end();
 break;
 }
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx 
b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 7b04194..3bfca5a 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -245,7 +245,7 @@ extern C void MNS_Mozilla_UI_Thread( void *arg )
 
 //do the mozilla event loop
 MNS_XPCOM_EventLoop();
-//we are interupted
+//we are interrupted
 
 if (sServiceManager)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com jurt/com

2014-02-13 Thread Stephan Bergmann

 bean/com/sun/star/beans/LocalOfficeConnection.java  |9 +
 jurt/com/sun/star/lib/util/NativeLibraryLoader.java |   11 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 0d396800021684a8c0875e45ed1440011fd7f9b0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Feb 13 23:20:28 2014 +0100

More java.lang.System.mapLibraryName dylib vs. jnilib confusion

...like a76261ac9e40eb57e942db2c7aea8b8a5e904ff2

Change-Id: I803dc81344efb5e8021d9ef4146c06ecf82ca63b

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index dd2ed07..d8e7b3b 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -78,6 +78,15 @@ public class LocalOfficeConnection
 // load libofficebean.so/officebean.dll
 String aSharedLibName = getProgramPath() + java.io.File.separator +
 System.mapLibraryName(OFFICE_LIB_NAME);
+// At least Oracle's 1.7.0_51 now maps to .dylib rather than .jnilib:
+if (System.getProperty(os.name).startsWith(Mac)
+ aSharedLibName.endsWith(.dylib))
+{
+aSharedLibName
+= aSharedLibName.substring(
+0, aSharedLibName.length() - dylib.length())
++ jnilib;
+}
 System.load( aSharedLibName );
 }
 
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java 
b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
index 9a98cfc..749dcb1 100644
--- a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
+++ b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
@@ -43,7 +43,16 @@ public final class NativeLibraryLoader {
 library name is system dependent
  */
 public static void loadLibrary(ClassLoader loader, String libname) {
-File path = getResource(loader, System.mapLibraryName(libname));
+String sysname = System.mapLibraryName(libname);
+// At least Oracle's 1.7.0_51 now maps to .dylib rather than .jnilib:
+if (System.getProperty(os.name).startsWith(Mac)
+ sysname.endsWith(.dylib))
+{
+sysname
+= sysname.substring(0, sysname.length() - dylib.length())
++ jnilib;
+}
+File path = getResource(loader, sysname);
 if (path == null) {
 // If the library cannot be found as a class loader resource, try
 // the global System.loadLibrary as a last resort:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com solenv/gbuild sw/source

2013-12-22 Thread Julien Nabet

 bean/com/sun/star/beans/LocalOfficeConnection.java  |2 +-
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |2 +-
 solenv/gbuild/UnpackedTarball.mk|2 +-
 sw/source/filter/xml/xmltbli.cxx|4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 98929ce4e8e161febd8fcc0a0a53e607c6681483
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Dec 22 15:37:28 2013 +0100

Fix typos

Change-Id: Ib9c92c059eaec367c809949550d9991e8bd10d93

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index 9725017..dd2ed07 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -523,7 +523,7 @@ 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 )
 {
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index c8bafaa..3511161 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -637,7 +637,7 @@ 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 )
 {
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 066f8ff..5416ce4 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -424,7 +424,7 @@ endef
echo Patch $$patch_file generated ; \
); \
else \
-   echo Error: No pristine tarball avaialable for $* 12 ; \
+   echo Error: No pristine tarball available for $* 12 ; \
fi
 
 
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 3ede120..fd941ce 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2760,9 +2760,9 @@ void SwXMLTableContext::MakeTable()
 // For text::HoriOrientation::NONE we would prefere to use the sum
 // of the relative column widths as reference width.
 // Unfortunately this works only if this sum interpreted as
-// twip value is larger than the space that is avaialable.
+// twip value is larger than the space that is available.
 // We don't know that space, so we have to use USHRT_MAX, too.
-// Even if a size is speczified, it will be ignored!
+// Even if a size is specified, it will be ignored!
 nWidth = USHRT_MAX;
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com connectivity/source extensions/source forms/qa include/registry odk/examples qadevOOo/tests sal/qa scripting/java shell/inc shell/source sw/source xmlsecurity/

2013-12-20 Thread Tor Lillqvist

 bean/com/sun/star/beans/LocalOfficeConnection.java 
   |8 +-
 bean/com/sun/star/beans/LocalOfficeWindow.java 
   |8 +-
 bean/com/sun/star/beans/OfficeConnection.java  
   |2 
 bean/com/sun/star/beans/OfficeWindow.java  
   |4 -
 bean/com/sun/star/comp/beans/OfficeConnection.java 
   |2 
 connectivity/source/drivers/mork/MResultSet.cxx
   |8 +-
 connectivity/source/drivers/mozab/MResultSet.cxx   
   |8 +-
 extensions/source/ole/jscriptclasses.hxx   
   |2 
 forms/qa/integration/forms/FormControlTest.java
   |2 
 include/registry/registry.h
   |   12 ++--
 odk/examples/DevelopersGuide/GUI/UnoDialogSample.java  
   |2 
 qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java
   |2 
 qadevOOo/tests/java/mod/_sc/ScCellsObj.java
   |2 
 qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java  
   |4 -
 qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java 
   |2 
 qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java 
   |2 
 qadevOOo/tests/java/mod/_sd/SdLayerManager.java
   |2 
 qadevOOo/tests/java/mod/_sd/SdXShape.java  
   |4 -
 sal/qa/osl/file/osl_File.cxx   
   |6 +-
 sal/qa/osl/security/osl_Security.cxx   
   |   12 ++--
 
scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
 |8 +-
 
scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
 |6 +-
 shell/inc/internal/metainforeader.hxx  
   |4 -
 shell/source/win32/ooofilereader/metainforeader.cxx
   |4 -
 shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
   |4 -
 sw/source/filter/ww8/writerhelper.hxx  
   |   28 +-
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
   |6 +-
 27 files changed, 77 insertions(+), 77 deletions(-)

New commits:
commit be053c9a80ad237afc6da0b4174e1c7afc94ed92
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 20 23:24:56 2013 +0200

Spelling correction: s/retrive/retrieve/

Change-Id: I96845d358765e2d2507763a9b15a30388b32bc6b

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index b742fb3..9725017 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -136,7 +136,7 @@ public class LocalOfficeConnection
 }
 
 /**
- * Retrives the UNO component context.
+ * 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 codenull/code if it fails to connect
@@ -304,7 +304,7 @@ 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.
  */
@@ -557,7 +557,7 @@ public class LocalOfficeConnection
 implements NativeService
 {
 /**
- * Retrive the office service identifier.
+ * Retrieve the office service identifier.
  *
  * @return The identifier of the office service.
  */
@@ -595,7 +595,7 @@ public class LocalOfficeConnection
 }
 
 /**
- * Retrives the ammount of time to wait for the startup.
+ * Retrieves the ammount of time to wait for the startup.
  *
  * @return The ammount of time to wait in seconds(?).
  */
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java 
b/bean/com/sun/star/beans/LocalOfficeWindow.java
index 9388dcd..8f79b99 100644
---

[Libreoffice-commits] core.git: bean/com bean/qa

2013-05-07 Thread Stephan Bergmann

 bean/com/sun/star/comp/beans/OOoBean.java |4 ++--
 bean/qa/complex/bean/OOoBeanTest.java |8 
 bean/qa/complex/bean/WriterFrame.java |4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6c4a4eb84589c8a19d72c46169ba1a25159e4c1b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 7 13:47:22 2013 +0200

Revert to mis-typed com.sun.star.comp.beans.OOoBean.aquireSystemWindow again

...from 43debfae8326ad98f9d130aa450f59ad49577d55 General cleanup of
OfficeBeans, as this is a stable interface that should not be broken 
airily.

Change-Id: I931a611341a1b29346d134c11ecf886fe7767836

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 34d7078..7562012 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -444,7 +444,7 @@ public class OOoBean
 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 acquireSystemWindow 
needs
+from a Java container and later added again. Then aquireSystemWindow 
needs
 to be called after the container window is displayed.
 p
 
@@ -454,7 +454,7 @@ public class OOoBean
 @throws NoConnectionException
 if the connection is not established.
  */
-public synchronized void acquireSystemWindow()
+public synchronized void aquireSystemWindow()
 throws
 SystemWindowException,
 
diff --git a/bean/qa/complex/bean/OOoBeanTest.java 
b/bean/qa/complex/bean/OOoBeanTest.java
index bb12bca..fb0b5cc 100644
--- a/bean/qa/complex/bean/OOoBeanTest.java
+++ b/bean/qa/complex/bean/OOoBeanTest.java
@@ -301,7 +301,7 @@ public class OOoBeanTest
 }
 }
 
-/** Test repeated OOoBean.acquireSystemWindow and 
OOoBean.releaseSystemWindow
+/** Test repeated OOoBean.aquireSystemWindow and 
OOoBean.releaseSystemWindow
  * calls.
  * @throws Exception
  */
@@ -315,7 +315,7 @@ public class OOoBeanTest
 for (int i = 0; i  100; i++)
 {
 b.releaseSystemWindow();
-b.acquireSystemWindow();
+b.aquireSystemWindow();
 }
 if (!f.checkUnoFramePosition())
 {
@@ -418,7 +418,7 @@ public class OOoBeanTest
 bean.releaseSystemWindow();
 frame.remove(bean);
 frame.add(bean, BorderLayout.CENTER);
-bean.acquireSystemWindow();
+bean.aquireSystemWindow();
 }
 
 if (!isWindows())
@@ -503,7 +503,7 @@ public class OOoBeanTest
 try {
 
 frame.add(bean, BorderLayout.CENTER);
-bean.acquireSystemWindow();
+bean.aquireSystemWindow();
 frame.validate();
 } catch (Exception e) {
 e.printStackTrace();
diff --git a/bean/qa/complex/bean/WriterFrame.java 
b/bean/qa/complex/bean/WriterFrame.java
index 3162646..525ddf7 100644
--- a/bean/qa/complex/bean/WriterFrame.java
+++ b/bean/qa/complex/bean/WriterFrame.java
@@ -61,7 +61,7 @@ class WriterFrame extends java.awt.Frame
 pack();
 setBounds(x, y, width, height);
 setVisible(true);
-m_bean.acquireSystemWindow();
+m_bean.aquireSystemWindow();
 }
 }
 catch (Exception e)
@@ -193,7 +193,7 @@ class WriterFrame extends java.awt.Frame
 public void addOOoBean() throws Exception
 {
 add(m_bean, BorderLayout.CENTER);
-m_bean.acquireSystemWindow();
+m_bean.aquireSystemWindow();
 validate();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

2013-04-16 Thread Chris Sherlock

 bean/com/sun/star/comp/beans/CallWatchThread.java   |9 -
 bean/com/sun/star/comp/beans/ContainerFactory.java  |2 
 bean/com/sun/star/comp/beans/Frame.java |6 -
 bean/com/sun/star/comp/beans/JavaWindowPeerFake.java|   16 +--
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |   76 +++-
 bean/com/sun/star/comp/beans/LocalOfficeWindow.java |   16 +--
 bean/com/sun/star/comp/beans/NativeConnection.java  |6 -
 bean/com/sun/star/comp/beans/NativeService.java |2 
 bean/com/sun/star/comp/beans/NoConnectionException.java |4 
 bean/com/sun/star/comp/beans/NoDocumentException.java   |2 
 bean/com/sun/star/comp/beans/OOoBean.java   |   71 ++
 bean/com/sun/star/comp/beans/OfficeConnection.java  |4 
 bean/com/sun/star/comp/beans/OfficeWindow.java  |8 -
 bean/com/sun/star/comp/beans/Wrapper.java   |5 -
 14 files changed, 106 insertions(+), 121 deletions(-)

New commits:
commit 43debfae8326ad98f9d130aa450f59ad49577d55
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Tue Apr 16 22:38:26 2013 +1000

General cleanup of OfficeBeans

Cleaned up Java source files:
+ removed unnecessary commented out code
+ corrected many spelling errors
+ formatting changes (remove decorations from comments,
  whitespacing, etc.)

Change-Id: I4133908ceac874b273fe409d763b3ddbfc2055e5
Reviewed-on: https://gerrit.libreoffice.org/3413
Reviewed-by: Noel Grandin noelgran...@gmail.com
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/bean/com/sun/star/comp/beans/CallWatchThread.java 
b/bean/com/sun/star/comp/beans/CallWatchThread.java
index ce6ed6a..31f3a8c 100644
--- a/bean/com/sun/star/comp/beans/CallWatchThread.java
+++ b/bean/com/sun/star/comp/beans/CallWatchThread.java
@@ -19,13 +19,12 @@
 package com.sun.star.comp.beans;
 
 
-//---
 /** Helper class to watch calls into OOo with a timeout.
  */
-//Do not add the thread instances to a threadgroup. When testing the bean in
-//an applet it turned out the ThreadGroup was in an inconsistent state
-//after navigating off the site that contains the applet and back to it.
-//That was tested with a Sun JRE 1.4.2_06
+// Do not add the thread instances to a threadgroup. When testing the bean in
+// an applet it turned out the ThreadGroup was in an inconsistent state
+// after navigating off the site that contains the applet and back to it.
+// That was tested with a Sun JRE 1.4.2_06
 public class CallWatchThread extends Thread
 {
 private static boolean DEBUG = false;
diff --git a/bean/com/sun/star/comp/beans/ContainerFactory.java 
b/bean/com/sun/star/comp/beans/ContainerFactory.java
index c707a71..d06a082 100644
--- a/bean/com/sun/star/comp/beans/ContainerFactory.java
+++ b/bean/com/sun/star/comp/beans/ContainerFactory.java
@@ -21,7 +21,7 @@ package com.sun.star.comp.beans;
 import java.awt.Container;
 
 /**
- * This interface reprecents an AWT container factory.
+ * This interface represents an AWT container factory.
  *
  * @deprecated
  *
diff --git a/bean/com/sun/star/comp/beans/Frame.java 
b/bean/com/sun/star/comp/beans/Frame.java
index cd68bb7..b14b633 100644
--- a/bean/com/sun/star/comp/beans/Frame.java
+++ b/bean/com/sun/star/comp/beans/Frame.java
@@ -49,7 +49,7 @@ public class Frame
 // com.sun.star.frame.XFrame
 //--
 
-public void initialize( /*IN*/com.sun.star.awt.XWindow xWindow )
+public void initialize( /*IN*/ com.sun.star.awt.XWindow xWindow )
 {
 xFrame.initialize( xWindow );
 }
@@ -79,7 +79,7 @@ public class Frame
 xFrame.setName( aName );
 }
 
-public com.sun.star.frame.XFrame findFrame( /*IN*/String aTargetFrameName, 
/*IN*/int nSearchFlags )
+public com.sun.star.frame.XFrame findFrame( /*IN*/ String 
aTargetFrameName, /*IN*/ int nSearchFlags )
 {
 return xFrame.findFrame( aTargetFrameName, nSearchFlags );
 }
@@ -104,7 +104,7 @@ public class Frame
 return xFrame.isActive();
 }
 
-public boolean setComponent( /*IN*/com.sun.star.awt.XWindow 
xComponentWindow, /*IN*/ com.sun.star.frame.XController xController )
+public boolean setComponent( /*IN*/ com.sun.star.awt.XWindow 
xComponentWindow, /*IN*/ com.sun.star.frame.XController xController )
 {
 return xFrame.setComponent( xComponentWindow, xController );
 }
diff --git a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java 
b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
index da235ff..7bcfa7a 100644
--- a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
+++ b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
@@ -25,7 +25,7 @@ import com.sun.star.awt.*;
  *
  * @since OOo 2.0.0
  */
-/* package */ class

38 matches

Mail list logo