[Libreoffice-commits] core.git: external/clew include/osl include/svx nlpsolver/ThirdParty reportbuilder/java sc/qa scripting/java svx/inc toolkit/test
Andrea Gelmini
andrea.gelmini at gelma.net
Sat Jan 27 07:49:58 UTC 2018
external/clew/source/clew.c | 2 -
include/osl/socket.h | 10 ++++----
include/svx/sdr/properties/defaultproperties.hxx | 2 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java | 4 +--
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java | 2 -
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java | 2 -
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java | 2 -
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java | 2 -
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java | 2 -
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java | 2 -
sc/qa/complex/calcPreview/ViewForwarder.java | 12 +++++-----
scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java | 2 -
svx/inc/sdr/properties/groupproperties.hxx | 2 -
toolkit/test/accessibility/EventQueue.java | 4 +--
14 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 5c0af52feb2a392135489e0c1516cf4566d132cf
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Fri Jan 26 11:21:14 2018 +0100
Fix typos
Change-Id: I8d5a8251a01af7cdf9832d98d8a6573b907f8532
Reviewed-on: https://gerrit.libreoffice.org/48683
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/external/clew/source/clew.c b/external/clew/source/clew.c
index d82235a8715b..4ed80035d3a5 100644
--- a/external/clew/source/clew.c
+++ b/external/clew/source/clew.c
@@ -160,7 +160,7 @@ int clewInit(const char* path)
if (error)
{
- // Failure queing atexit, shutdown with error
+ // Failure queueing atexit, shutdown with error
CLCC_DYNLIB_CLOSE(module);
module = NULL;
diff --git a/include/osl/socket.h b/include/osl/socket.h
index 36e6b0b35bad..97b0cdf429cf 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -413,7 +413,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_sendToSocket(
You can specify a timeout-value in seconds/microseconds that denotes
how long the operation will block if the Socket is not ready.
- @param Socket the Socket to perfom the operation on.
+ @param Socket the Socket to perform the operation on.
@param pTimeout if NULL, the operation will block without a timeout.
@retval sal_True if read operations (recv, recvFrom, accept) on the Socket
@@ -428,7 +428,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isReceiveReady(
You can specify a timeout-value in seconds/microseconds that denotes
how long the operation will block if the Socket is not ready.
- @param Socket the Socket to perfom the operation on.
+ @param Socket the Socket to perform the operation on.
@param pTimeout if NULL, the operation will block without a timeout. Otherwise
the time define by timeout value.
@@ -444,7 +444,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isSendReady(
You can specify a timeout-value in seconds/microseconds that denotes
how long the operation will block if the Socket has no pending OOB data.
- @param Socket the Socket to perfom the operation on.
+ @param Socket the Socket to perform the operation on.
@param pTimeout if NULL, the operation will block without a timeout.
@retval sal_True if OOB-request operations (recv with appropriate flags)
@@ -456,7 +456,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isExceptionPending(
const TimeValue* pTimeout);
/** Shuts down communication on a connected socket.
- @param[in] Socket the Socket to perfom the operation on.
+ @param[in] Socket the Socket to perform the operation on.
@param[in] Direction
@parblock
Direction denotes which end of the socket should be closed:
@@ -799,7 +799,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_getInetPortOfSocketAddr(
/** Sets the Port of Addr.
- @param[in] Addr the SocketAddr to perfom the operation on.
+ @param[in] Addr the SocketAddr to perform the operation on.
@param[in] Port is expected in host byte-order.
@retval sal_False if Addr is not an inet-addr.
*/
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index da78dcd9053a..e264191c6f0a 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -82,7 +82,7 @@ namespace sdr
virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override;
// clear single item direct, do not do any notifies or things like that.
- // Also supports complete deleteion of items when default parameter 0 is used.
+ // Also supports complete deletion of items when default parameter 0 is used.
virtual void ClearObjectItemDirect(const sal_uInt16 nWhich) override;
// set complete item set
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java
index 959b22e13ffa..809211e31ddf 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java
@@ -108,9 +108,9 @@ public class SCAgent {
public void updateInfo() {
//Selects a bad point kw from TaoW points in Library
int xw = externalLib.tournamentSelection(specComparator, TaoW, false);
- //Repaces kw with pcurrent_t
+ //Replaces kw with pcurrent_t
externalLib.getSelectedPoint(xw).importPoint(pcurrent_t);
- //Repaces pcurrent_t (x(t)) with trailPoint (x(t+1))
+ //Replaces pcurrent_t (x(t)) with trailPoint (x(t+1))
pcurrent_t.importPoint(trailPoint);
}
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
index aaad81859937..54de0f4f4dae 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
@@ -87,7 +87,7 @@ public abstract class AbstractReportElementLayoutController
* you'll suffer.
*
* @param flowController the flow controller of the parent.
- * @return the joined layout controller that incorperates all changes from the
+ * @return the joined layout controller that incorporates all changes from the
* delegate.
*/
public LayoutController join(final FlowController flowController)
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
index 37a514cf6b89..8b0ea883b7a7 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
@@ -131,7 +131,7 @@ public class OfficeDetailLayoutController extends SectionLayoutController
* you'll suffer.
*
* @param flowController the flow controller of the parent.
- * @return the joined layout controller that incorperates all changes from the
+ * @return the joined layout controller that incorporates all changes from the
* delegate.
*/
@Override
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
index 5cb3aa69fa60..923056ca238c 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
@@ -144,7 +144,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon
* you'll suffer.
*
* @param flowController the flow controller of the parent.
- * @return the joined layout controller that incorperates all changes from the
+ * @return the joined layout controller that incorporates all changes from the
* delegate.
*/
@Override
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index 5f8b91ccb599..e44bbcc71c7f 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -152,7 +152,7 @@ public class OfficeGroupLayoutController extends SectionLayoutController
* you'll suffer.
*
* @param flowController the flow controller of the parent.
- * @return the joined layout controller that incorperates all changes from the
+ * @return the joined layout controller that incorporates all changes from the
* delegate.
*/
@Override
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
index 4f7abe3fb52e..7fd2c78a1856 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
@@ -236,7 +236,7 @@ public class OfficeReportLayoutController extends ElementLayoutController
* you'll suffer.
*
* @param flowController the flow controller of the parent.
- * @return the joined layout controller that incorperates all changes from the
+ * @return the joined layout controller that incorporates all changes from the
* delegate.
*/
public LayoutController join(final FlowController flowController)
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
index beb02c2c4eb4..5d3f62120b8c 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
@@ -165,7 +165,7 @@ public class VariablesDeclarationLayoutController
* you'll suffer.
*
* @param flowController the flow controller of the parent.
- * @return the joined layout controller that incorperates all changes from the
+ * @return the joined layout controller that incorporates all changes from the
* delegate.
*/
public LayoutController join(final FlowController flowController)
diff --git a/sc/qa/complex/calcPreview/ViewForwarder.java b/sc/qa/complex/calcPreview/ViewForwarder.java
index 2c23a43cf86a..4abbedc9b09f 100644
--- a/sc/qa/complex/calcPreview/ViewForwarder.java
+++ b/sc/qa/complex/calcPreview/ViewForwarder.java
@@ -112,13 +112,13 @@ public class ViewForwarder {
xCell = oSheet.getCellByPosition(0, 2) ;
xCell.setFormula("Cell 2");
} catch(com.sun.star.lang.IllegalArgumentException e) {
- System.out.println("Exception ceating relation :");
+ System.out.println("Exception creating relation :");
fail(e.getMessage());
} catch(com.sun.star.lang.WrappedTargetException e) {
- System.out.println("Exception ceating relation :");
+ System.out.println("Exception creating relation :");
fail(e.getMessage());
} catch(com.sun.star.lang.IndexOutOfBoundsException e) {
- System.out.println("Exception ceating relation :");
+ System.out.println("Exception creating relation :");
fail(e.getMessage());
}
@@ -516,13 +516,13 @@ public class ViewForwarder {
xCell = oSheet.getCellByPosition(0, 2) ;
xCell.setFormula("Cell 2");
} catch(com.sun.star.lang.IllegalArgumentException e) {
- System.out.println("Exception ceating relation :");
+ System.out.println("Exception creating relation :");
fail(e.getMessage());
} catch(com.sun.star.lang.WrappedTargetException e) {
- System.out.println("Exception ceating relation :");
+ System.out.println("Exception creating relation :");
fail(e.getMessage());
} catch(com.sun.star.lang.IndexOutOfBoundsException e) {
- System.out.println("Exception ceating relation :");
+ System.out.println("Exception creating relation :");
fail(e.getMessage());
}
diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index bf4f29a3a896..d00dd92e1190 100644
--- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -106,7 +106,7 @@ public class UnoPkgContainer extends ParcelContainer {
// When all libraries within a package bundle
// ( for this language ) are removed also
// remove the container from its parent
- // Otherwise, a container ( with no containees )
+ // Otherwise, a container ( with no containers )
// representing the uno package bundle will
// still exist and so will get displayed
if (container.parent() != null) {
diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx
index 7e2a71177841..af197dc91360 100644
--- a/svx/inc/sdr/properties/groupproperties.hxx
+++ b/svx/inc/sdr/properties/groupproperties.hxx
@@ -81,7 +81,7 @@ namespace sdr
virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override;
// clear single item direct, do not do any notifies or things like that.
- // Also supports complete deleteion of items when default parameter 0 is used.
+ // Also supports complete deletion of items when default parameter 0 is used.
virtual void ClearObjectItemDirect(const sal_uInt16 nWhich) override;
// Set a single item, iterate over hierarchies if necessary.
diff --git a/toolkit/test/accessibility/EventQueue.java b/toolkit/test/accessibility/EventQueue.java
index 84894263b142..b6f6c6415e76 100644
--- a/toolkit/test/accessibility/EventQueue.java
+++ b/toolkit/test/accessibility/EventQueue.java
@@ -42,7 +42,7 @@ class EventQueue
synchronized (maMonitor)
{
if (mbVerbose)
- System.out.println ("queing regular event " + aEvent);
+ System.out.println ("queueing regular event " + aEvent);
maRegularQueue.addLast (aEvent);
maMonitor.notify ();
}
@@ -57,7 +57,7 @@ class EventQueue
synchronized (maMonitor)
{
if (mbVerbose)
- System.out.println ("queing disposing event " + aEvent);
+ System.out.println ("queueing disposing event " + aEvent);
maDisposingQueue.addLast (aEvent);
maMonitor.notify ();
}
More information about the Libreoffice-commits
mailing list