From 2957be02c5c4847046b9d192c7a76717c8849559 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Fri, 2 Oct 2015 10:52:20 +0200 Subject: Fix typos Change-Id: I776c517ba87838c0c3391f79010a30fa7fe2abd3 Reviewed-on: https://gerrit.libreoffice.org/18939 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt --- basic/source/comp/exprnode.cxx | 2 +- basic/source/inc/opcodes.hxx | 2 +- basic/source/runtime/methods1.cxx | 2 +- basic/source/runtime/runtime.cxx | 6 +++--- basic/source/sbx/sbxvar.cxx | 24 +++++++++++----------- bean/com/sun/star/comp/beans/OOoBean.java | 2 +- bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx | 2 +- bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx | 2 +- canvas/source/opengl/ogl_canvascustomsprite.cxx | 2 +- canvas/source/tools/spriteredrawmanager.cxx | 2 +- canvas/source/vcl/spritecanvashelper.cxx | 2 +- canvas/workben/canvasdemo.cxx | 4 ++-- chart2/qa/extras/chart2import.cxx | 2 +- .../chartapiwrapper/Chart2ModelContact.hxx | 2 +- .../chartapiwrapper/WrappedSymbolProperties.cxx | 2 +- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx index cb1f429c384c..2b65fd1c6fd0 100644 --- a/basic/source/comp/exprnode.cxx +++ b/basic/source/comp/exprnode.cxx @@ -202,7 +202,7 @@ short SbiExprNode::GetDepth() // Adjustment of a tree: // 1. Constant Folding // 2. Type-Adjustment -// 3. Conversion of the operans into Strings +// 3. Conversion of the operands into Strings // 4. Lifting of the composite- and error-bits void SbiExprNode::Optimize(SbiParser* pParser) diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx index 669933117ecb..3091eb23259f 100644 --- a/basic/source/inc/opcodes.hxx +++ b/basic/source/inc/opcodes.hxx @@ -112,7 +112,7 @@ enum SbiOpcode { // Verwaltung _SETCLASS, // test set + class names (+StringId) _TESTCLASS, // Check TOS class (+StringId) - _LIB, // set lib name for declar-procs (+StringId) + _LIB, // set lib name for declare-procs (+StringId) _BASED, // TOS is incremented by BASE, BASE is pushed before (+base) // type adjustment in the Argv _ARGTYP, // convert last parameter in Argv (+type) diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 1203003b1f95..c9367a939661 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -671,7 +671,7 @@ RTLFUNC(DoEvents) (void)pBasic; (void)bWrite; (void)rPar; -// don't undstand what upstream are up to +// don't understand what upstream are up to // we already process application events etc. in between // basic runtime pcode ( on a timed basis ) // always return 0 diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 080aac6a8c24..288d858eb2ce 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -918,7 +918,7 @@ void SbiRuntime::Error( SbError _errCode, const OUString& _details ) if ( pInst->pRun == this ) { pInst->Error( _errCode, _details ); - //OSL_WARN_IF( nError != _errCode, "basic", "SbiRuntime::Error: the instance is expecte to propagate the error code back to me!" ); + //OSL_WARN_IF( nError != _errCode, "basic", "SbiRuntime::Error: the instance is expected to propagate the error code back to me!" ); } else { @@ -1826,7 +1826,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b // if they are SbxEMPTY I guess if ( !bHandleDefaultProp || eValType == SbxOBJECT ) { - // activate GetOject for collections on refVal + // activate GetObject for collections on refVal SbxBase* pObjVarObj = refVal->GetObject(); if( pObjVarObj ) { @@ -3432,7 +3432,7 @@ SbxVariable* SbiRuntime::FindElement( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt bool bSetName = true; // preserve normal behaviour // i#i68894# if VBAInterOp favour searching vba globals - // over searching for uno classess + // over searching for uno classes if ( bVBAEnabled ) { // Try Find in VBA symbols space diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index e551af2179c9..2e353261b5c7 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -34,11 +34,11 @@ #include using namespace com::sun::star::uno; -///////////////////////////// SbxVariable +// SbxVariable TYPEINIT1(SbxVariable,SbxValue) -///////////////////////////// SbxVariableImpl +// SbxVariableImpl class SbxVariableImpl { @@ -59,7 +59,7 @@ class SbxVariableImpl }; -///////////////////////////// Constructors +// Constructors SbxVariable::SbxVariable() : SbxValue() { @@ -124,7 +124,7 @@ SbxVariable::~SbxVariable() delete pCst; } -////////////////////////////// Broadcasting +// Broadcasting SfxBroadcaster& SbxVariable::GetBroadcaster() { @@ -142,7 +142,7 @@ SbxArray* SbxVariable::GetParameters() const // Perhaps some day one could cut the parameter 0. -// then the copying will be dropped ... +// Then the copying will be dropped... void SbxVariable::Broadcast( sal_uInt32 nHintId ) { @@ -210,7 +210,7 @@ void SbxVariable::SetParameters( SbxArray* p ) } -/////////////////////////// Name of the variables +// Name of the variables void SbxVariable::SetName( const OUString& rName ) { @@ -335,7 +335,7 @@ sal_uInt16 SbxVariable::MakeHashCode( const OUString& rName ) for( sal_Int32 i=0; i(rName[i]); - // If we have a commen sigen break!! + // If we have a comment sign break!! if( c >= 0x80 ) { return 0; @@ -345,7 +345,7 @@ sal_uInt16 SbxVariable::MakeHashCode( const OUString& rName ) return n; } -////////////////////////////// Operators +// Operators SbxVariable& SbxVariable::operator=( const SbxVariable& r ) { @@ -368,7 +368,7 @@ SbxVariable& SbxVariable::operator=( const SbxVariable& r ) return *this; } -//////////////////////////////// Conversion +// Conversion SbxDataType SbxVariable::GetType() const { @@ -469,7 +469,7 @@ void SbxVariable::ClearComListener() } -////////////////////////////// Loading/Saving +// Loading/Saving bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { @@ -637,7 +637,7 @@ bool SbxVariable::StoreData( SvStream& rStrm ) const } } -////////////////////////////// SbxInfo +// SbxInfo SbxInfo::SbxInfo() : aHelpFile(), nHelpId(0) @@ -647,7 +647,7 @@ SbxInfo::SbxInfo( const OUString& r, sal_uInt32 n ) : aHelpFile( r ), nHelpId( n ) {} -////////////////////////////// SbxAlias +// SbxAlias SbxAlias::SbxAlias( const SbxAlias& r ) : SvRefBase( r ), SbxVariable( r ), diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 04beebad5385..9400695865c4 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -185,7 +185,7 @@ public class OOoBean } // @requirement FUNC.CON.STRT/0.4 - /** Starts a connection to an OOo instance which is lauched if not running. + /** Starts a connection to an OOo instance which is launched if not running. @throws HasConnectionException if a connection was already established. diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx index d961a386e5a8..824993d88d9f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx @@ -425,7 +425,7 @@ namespace { const int codeSnippetSize = 20; - //some m68k info : http://www2.biglobe.ne.jp/~inaba/trampolines.html + //some m68k info: http://www2.biglobe.ne.jp/~inaba/trampolines.html unsigned char *codeSnippet(unsigned char* code, sal_Int32 functionIndex, sal_Int32 vtableOffset) diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx index ffcf083dcfe6..8d904658775f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx @@ -78,7 +78,7 @@ namespace /* p = sp - 512; new sp will be p - 16, but we don't change sp * at this time to avoid breaking ABI--not sure whether changing sp will break - * references to local variables. For the same reason, we use abosulte value. + * references to local variables. For the same reason, we use absolute value. */ __asm__ __volatile__ ( "addiu $2,$29,-512\n\t" diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index dfd1ba1ef902..b410c561ba8d 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -153,7 +153,7 @@ namespace oglcanvas IBufferContextSharedPtr pBufferContext; if( mfAlpha != 1.0 || mxClip.is() ) { - // drats. Need to render to temp surface before, and then + // drafts. Need to render to temp surface before, and then // composite that to screen // TODO(P3): buffer texture diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index aa44097b3ea5..92b15f1d8718 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -221,7 +221,7 @@ namespace canvas // call. Then, we store that state locally. This prolly goes // in line with the problem of having sprite state available // for the frame before the last frame; plus, it avoids - // frequent locks of the object mutices + // frequent locks of the object mutexes SpriteWeakOrder aSpriteComparator; // put all sprites that have changed content into update areas diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index fd4bb1d6bf68..68a2c68de93a 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -436,7 +436,7 @@ namespace vclcanvas // no need to clip output to actual update region - there will // always be ALL sprites contained in the rectangular update - // area containd in rTotalArea (that's the way + // area contained in rTotalArea (that's the way // B2DConnectedRanges work). If rTotalArea appears to be // smaller than the sprite - then this sprite carries a clip, // and the update will be constrained to that rect. diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 15bef7d12444..7f93115a175d 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -686,8 +686,8 @@ void DemoApp::Main() DemoApp aDemoApp; // TODO -// - bouncing clip-rectangle mode - bounce a clip-rect around the window ... +// - bouncing clip-rectangle mode - bounce a clip-rect around the window... // - complete all of pre-existing canvas bits -// - affine transform tweakage ... +// - affine transform tweakage... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 3c33e1f7686a..3ab06008ab47 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -58,7 +58,7 @@ public: void testFdo78080(); void testFdo54361(); void testFdo54361_1(); - void testTdf86624(); // manualy placed legends + void testTdf86624(); // manually placed legends void testAutoBackgroundXLSX(); void testChartAreaStyleBackgroundXLSX(); void testAxisTextRotationXLSX(); diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index b315e16926f9..56a0c2ded580 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -87,7 +87,7 @@ public: */ ::com::sun::star::awt::Size GetPageSize() const; - /** calculates the current axes title sizes and subtract that space them from the given recangle + /** calculates the current axes title sizes and subtract that space them from the given rectangle */ ::com::sun::star::awt::Rectangle SubstractAxisTitleSizes( const ::com::sun::star::awt::Rectangle& rPositionRect ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 0df43ed6c9e3..a294e759fe4a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -294,7 +294,7 @@ beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Referenc throw (beans::UnknownPropertyException, uno::RuntimeException) { //the special situation for this property here is that the diagram default can be - //different from the normal default and different from all sinlges series values + //different from the normal default and different from all singles series values //so we need to return PropertyState_DIRECT_VALUE for more cases if( m_ePropertyType == DATA_SERIES && //single series or point -- cgit