[Libreoffice-commits] core.git: animations/source basctl/source basic/qa basic/source bridges/source
Andrea Gelmini
andrea.gelmini at gelma.net
Fri Mar 3 07:48:36 UTC 2017
animations/source/animcore/animcore.cxx | 4 ++--
basctl/source/basicide/baside2b.cxx | 2 +-
basic/qa/vba_tests/ole_ObjAssignNoDflt.vb | 2 +-
basic/source/classes/sb.cxx | 2 +-
basic/source/runtime/runtime.cxx | 2 +-
basic/source/sbx/sbxform.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 2 +-
bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx | 2 +-
bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx | 2 +-
bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx | 2 +-
13 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 0a850f3e15ef762f33688b11a07624ec2674caa1
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Mar 2 12:29:36 2017 +0100
Fix typos
Change-Id: Iaefa094c82006346897f5563ac3ddcdc60ab68a3
Reviewed-on: https://gerrit.libreoffice.org/34809
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index b45e48f..ff30100 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -121,7 +121,7 @@ class AnimationNodeBase : public XAnimateMotion,
public OWeakObject
{
public:
- // our first, last and only protection from mutli-threads!
+ // our first, last and only protection from multi-threads!
Mutex maMutex;
};
@@ -364,7 +364,7 @@ private:
/** current iteration position */
ChildList_t::iterator maIter;
- /** our first, last and only protection from mutli-threads! */
+ /** our first, last and only protection from multi-threads! */
Mutex maMutex;
};
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index d2d96b8..a82d57c 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -476,7 +476,7 @@ bool EditorWindow::ImpCanModify()
if ( StarBASIC::IsRunning() && rModulWindow.GetBasicStatus().bIsRunning )
{
// If in Trace-mode, abort the trace or refuse input
- // Remove markers in the modules in Notify at Basic::Stoped
+ // Remove markers in the modules in Notify at Basic::Stopped
if (ScopedVclPtrInstance<QueryBox>(nullptr, WB_OK_CANCEL, IDEResId(RID_STR_WILLSTOPPRG).toString())->Execute() == RET_OK)
{
rModulWindow.GetBasicStatus().bIsRunning = false;
diff --git a/basic/qa/vba_tests/ole_ObjAssignNoDflt.vb b/basic/qa/vba_tests/ole_ObjAssignNoDflt.vb
index 9a86424..e1be5d3 100644
--- a/basic/qa/vba_tests/ole_ObjAssignNoDflt.vb
+++ b/basic/qa/vba_tests/ole_ObjAssignNoDflt.vb
@@ -23,7 +23,7 @@ End If
cn.CommandTimeout = origTimeout ' restore timeout
Rem Double check objCmd.ActiveConnection is pointing to objCmd.ActiveConnection
If objCmd.ActiveConnection.CommandTimeout <> origTimeout Then
- doUnitTest = "FAIL expected orignal timeout " & origTimeout & " but got " & objCmd.ActiveConnection.CommandTimeout
+ doUnitTest = "FAIL expected original timeout " & origTimeout & " but got " & objCmd.ActiveConnection.CommandTimeout
Exit Function
End If
doUnitTest = "OK" ' no error
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index f00b6a2..fdb8caf 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1626,7 +1626,7 @@ bool StarBASIC::CError( SbError code, const OUString& rMsg,
{
SolarMutexGuard aSolarGuard;
- // compiler error during runtime -> stop programm
+ // compiler error during runtime -> stop program
if( IsRunning() )
{
// #109018 Check if running Basic is affected
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index e3615b1..2e342c9 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1974,7 +1974,7 @@ void SbiRuntime::StepSET()
{
SbxVariableRef refVal = PopVar();
SbxVariableRef refVar = PopVar();
- StepSET_Impl( refVal, refVar, bVBAEnabled ); // this is really assigment
+ StepSET_Impl( refVal, refVar, bVBAEnabled ); // this is really assignment
}
void SbiRuntime::StepVBASET()
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index c468962..f42b804 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -115,7 +115,7 @@ SbxBasicFormater::SbxBasicFormater( sal_Unicode _cDecPoint, sal_Unicode _cThousa
{
}
-// function for ouput of a error-text (for debugging)
+// function for output of a error-text (for debugging)
// displaces all characters of the string, starting from nStartPos
// for one position to larger indexes, i. e. place for a new
// character (which is to be inserted) is created.
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index af4bd5f..8afbd04 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -426,7 +426,7 @@ void * pRegReturn = &nRegReturn;
if( bComplex )
{
__asm__( "add %i7, 4, %i7\n\t" );
- // after call to complex return valued funcion there is an unimp instruction
+ // after call to complex return valued function there is an unimp instruction
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx
index 813f5b7..9b157f0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx
@@ -540,7 +540,7 @@ static void cpp_vtable_call(int nFunctionIndex, void** pCallStack, int vTableOff
//if( bComplex )
//{
// __asm__( "add %i7, 4, %i7\n\t" );
- // // after call to complex return valued funcion there is an unimp instruction
+ // // after call to complex return valued function there is an unimp instruction
//}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index 6e7e185..f7c1ac5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -63,7 +63,7 @@ using namespace x86_64;
of SSESF, SSEDF classes, that are basically SSE class, just gcc will
use SF or DFmode move instead of DImode to avoid reformating penalties.
- Similary we play games with INTEGERSI_CLASS to use cheaper SImode moves
+ Similarly we play games with INTEGERSI_CLASS to use cheaper SImode moves
whenever possible (upper half does contain padding).
*/
enum x86_64_reg_class
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 9a050fb..c277c1a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -104,7 +104,7 @@ static void cpp_call(
sal_Int32 nParams, typelib_MethodParameter * pParams,
void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
{
- // Maxium space for [complex ret ptr], values | ptr ...
+ // Maximum space for [complex ret ptr], values | ptr ...
// (but will be used less - some of the values will be in pGPR and pFPR)
sal_uInt64 *pStack = static_cast<sal_uInt64 *>(__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) ));
sal_uInt64 *pStackStart = pStack;
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
index 6e7e185..f7c1ac5 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
@@ -63,7 +63,7 @@ using namespace x86_64;
of SSESF, SSEDF classes, that are basically SSE class, just gcc will
use SF or DFmode move instead of DImode to avoid reformating penalties.
- Similary we play games with INTEGERSI_CLASS to use cheaper SImode moves
+ Similarly we play games with INTEGERSI_CLASS to use cheaper SImode moves
whenever possible (upper half does contain padding).
*/
enum x86_64_reg_class
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
index def0bf5..0a62a0a 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
@@ -104,7 +104,7 @@ static void cpp_call(
sal_Int32 nParams, typelib_MethodParameter * pParams,
void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
{
- // Maxium space for [complex ret ptr], values | ptr ...
+ // Maximum space for [complex ret ptr], values | ptr ...
// (but will be used less - some of the values will be in pGPR and pFPR)
sal_uInt64 *pStack = static_cast<sal_uInt64 *>(__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) ));
sal_uInt64 *pStackStart = pStack;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index 4e2efc3..639b8da 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -424,7 +424,7 @@ static void cpp_vtable_call()
if( bComplex )
{
__asm__( "add %i7, 4, %i7\n\t" );
- // after call to complex return valued funcion there is an unimp instruction
+ // after call to complex return valued function there is an unimp instruction
}
}
More information about the Libreoffice-commits
mailing list