diff options
89 files changed, 164 insertions, 323 deletions
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index 0cdcffcff54e..8e02fa8f7be2 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -536,7 +536,7 @@ bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /*out* // Read all characters while( *pos != cEndString ) { - // Detect EOF before reading next char, so we do not loose EOF + // Detect EOF before reading next char, so we do not lose EOF if( *pos == 0 ) { // ERROR: unterminated string literal diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index a5e6a151e5c6..8f8311b12e6a 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -10,7 +10,7 @@ CLANG_COMMA :=, -# You may occassionally want to override some of these +# You may occasionally want to override some of these CLANGCXX=$(filter-out -m32 -m64 -fsanitize=address,$(CXX)) # Compile flags ('make CLANGCXXFLAGS=-g' if you need to debug the plugin) diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 5bfdf8be3c3e..d5c93d555bc0 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -39,10 +39,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - -//************ Class: java.sql.DatabaseMetaData - - jclass java_sql_DatabaseMetaData::theClass = 0; java_sql_DatabaseMetaData::~java_sql_DatabaseMetaData() @@ -622,7 +618,7 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS jobject out(0); SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_sql_DatabaseMetaData::impl_callResultSetMethodWithStrings: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_sql_DatabaseMetaData::impl_callResultSetMethodWithStrings: no Java environment anymore!" ); { const char* pSignature = _pOptionalAdditionalString diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 5b7fb4f040e1..fe0fdd6655e6 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -233,7 +233,7 @@ bool java_lang_Object::callBooleanMethod( const char* _pMethodName, jmethodID& _ jboolean out( sal_False ); SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callBooleanMethod: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callBooleanMethod: no Java environment anymore!" ); obtainMethodId(t.pEnv, _pMethodName,"()Z", _inout_MethodID); // call method out = t.pEnv->CallBooleanMethod( object, _inout_MethodID ); @@ -246,7 +246,7 @@ bool java_lang_Object::callBooleanMethodWithIntArg( const char* _pMethodName, jm { jboolean out( sal_False ); SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callBooleanMethodWithIntArg: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callBooleanMethodWithIntArg: no Java environment anymore!" ); obtainMethodId(t.pEnv, _pMethodName,"(I)Z", _inout_MethodID); // call method out = t.pEnv->CallBooleanMethod( object, _inout_MethodID, _nArgument ); @@ -265,7 +265,7 @@ jobject java_lang_Object::callResultSetMethod( JNIEnv& _rEnv,const char* _pMetho sal_Int32 java_lang_Object::callIntMethod( const char* _pMethodName, jmethodID& _inout_MethodID,bool _bIgnoreException ) const { SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" ); obtainMethodId(t.pEnv, _pMethodName,"()I", _inout_MethodID); // call method @@ -281,7 +281,7 @@ sal_Int32 java_lang_Object::callIntMethod( const char* _pMethodName, jmethodID& sal_Int32 java_lang_Object::callIntMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID,sal_Int32 _nArgument ) const { SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" ); obtainMethodId(t.pEnv, _pMethodName,"(I)I", _inout_MethodID); // call method jint out( t.pEnv->CallIntMethod( object, _inout_MethodID , _nArgument) ); @@ -293,7 +293,7 @@ sal_Int32 java_lang_Object::callIntMethodWithIntArg( const char* _pMethodName, j void java_lang_Object::callVoidMethod( const char* _pMethodName, jmethodID& _inout_MethodID) const { SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" ); obtainMethodId(t.pEnv, _pMethodName,"()V", _inout_MethodID); // call method @@ -304,7 +304,7 @@ void java_lang_Object::callVoidMethod( const char* _pMethodName, jmethodID& _ino void java_lang_Object::callVoidMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException ) const { SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" ); obtainMethodId(t.pEnv, _pMethodName,"(I)V", _inout_MethodID); // call method @@ -318,7 +318,7 @@ void java_lang_Object::callVoidMethodWithIntArg( const char* _pMethodName, jmeth void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument,bool _bIgnoreException ) const { SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" ); obtainMethodId(t.pEnv, _pMethodName,"(Z)V", _inout_MethodID); // call method t.pEnv->CallVoidMethod( object, _inout_MethodID,int(_nArgument) ); @@ -331,7 +331,7 @@ void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmet OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const { SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java environment anymore!" ); // call method jstring out = (jstring)callObjectMethod(t.pEnv,_pMethodName,"()Ljava/lang/String;", _inout_MethodID); @@ -361,7 +361,7 @@ jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char* OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const { SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java environment anymore!" ); jstring out = (jstring)callObjectMethodWithIntArg(t.pEnv,_pMethodName,"(I)Ljava/lang/String;",_inout_MethodID,_nArgument); return JavaString2String( t.pEnv, out ); } @@ -369,7 +369,7 @@ OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName, void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const { SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" ); obtainMethodId(t.pEnv, _pMethodName,"(Ljava/lang/String;)V", _inout_MethodID); jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,_nArgument)); @@ -381,7 +381,7 @@ void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jm sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const { SDBThreadAttach t; - OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethodWithStringArg: no Java enviroment anymore!" ); + OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethodWithStringArg: no Java environment anymore!" ); obtainMethodId(t.pEnv, _pMethodName,"(Ljava/lang/String;)I", _inout_MethodID); //TODO: Check if the code below is needed diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index de0b47778da0..ff396615faef 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -575,7 +575,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) } else if( sPropertyType == "[]short" ) { - //create string sequence from comma seperated string + //create string sequence from comma separated string //uno::Sequence< OUString > seqStr; std::vector< OUString > seqStr; seqStr = commaStringToSequence( sNewValue ); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 91bef1a21abf..6168506a864d 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1113,7 +1113,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) : // since the diclist may get changed meanwhile (e.g. through the API). // We want the dialog to operate on the same set of dictionaries it // was started with. - // Also we have to take care to not loose the last reference when + // Also we have to take care to not lose the last reference when // someone else removes a dictionary from the list. // removed dics will be replaced by NULL new entries be added to the end // Thus we may use indices as consistent references. diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index a58b77b52e60..c6574742ff9d 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -272,7 +272,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec if ( e.TargetException >>= aSql ) showError( SQLExceptionInfo( e.TargetException ) ); else - OSL_FAIL( "OApplicationController::deleteObjects: something strange happended!" ); + OSL_FAIL( "OApplicationController::deleteObjects: something strange happened!" ); } catch( const Exception& ) { diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 2a85ef3ddb16..77c8c90d98fb 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2245,7 +2245,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent) if(e.TargetException >>= aSql) aInfo = aSql; else - SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::OnExpandEntry: something strange happended!"); + SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::OnExpandEntry: something strange happened!"); } catch( const Exception& ) { @@ -2713,7 +2713,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) if(e.TargetException >>= aSql) showError(SQLExceptionInfo(aSql)); else - SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::implSelect: something strange happended!"); + SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::implSelect: something strange happened!"); // reset the values xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any()); xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any()); @@ -3046,7 +3046,7 @@ void SbaTableQueryBrowser::unloadAndCleanup( bool _bDisposeConnection ) if(e.TargetException >>= aSql) showError(SQLExceptionInfo(aSql)); else - SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::unloadAndCleanup: something strange happended!"); + SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::unloadAndCleanup: something strange happened!"); } catch(const Exception&) { diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 62da7c841261..1a9a182fb634 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -277,7 +277,7 @@ namespace } /** - * The value of m_nLimit is updated when LimitBox loose its focus + * The value of m_nLimit is updated when LimitBox loses its focus * So in those case when execution needs recent data, grab the focus * (e.g. execute SQL statement, change views) */ diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx index ab7e1e3c947c..552d2af07634 100644 --- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx @@ -97,7 +97,7 @@ namespace drawinglayer // geraphics, independent from the color filtering stuff. This will enhance e.g. // SVG and print quality while reducing data size at the same time. // The other way around the old modifications when only used on already bitmap objects - // will not loose any quality. + // will not lose any quality. aTransformedGraphic = rGraphicObject.GetTransformedGraphic(&aSuppressGraphicAttr); // reset GraphicAttr after use to not apply double diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 50715a1e21b5..764d4fa97210 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2382,8 +2382,8 @@ EditPaM ImpEditEngine::ImpDeleteSelection(const EditSelection& rCurSel) EditPaM aStartPaM(aCurSel.Min()); EditPaM aEndPaM(aCurSel.Max()); - CursorMoved( aStartPaM.GetNode() ); // only so that newly set Attributes dissapear... - CursorMoved( aEndPaM.GetNode() ); // only so that newly set Attributes dissapear... + CursorMoved( aStartPaM.GetNode() ); // only so that newly set Attributes disappear... + CursorMoved( aEndPaM.GetNode() ); // only so that newly set Attributes disappear... OSL_ENSURE( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index out of range in ImpDeleteSelection" ); OSL_ENSURE( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index out of range in ImpDeleteSelection" ); diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index cc320e5413a1..c9d283466a5f 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2786,7 +2786,7 @@ const SvxAutocorrWord* SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *p bool not_suffix; while( nSttWdPos && !(bWasWordDelim = IsWordDelim( rTxt[ --nSttWdPos ]))) ; - // search the first occurance with a left word delimitation + // search the first occurrence with a left word delimitation sal_Int32 nFndPos = -1; do { nFndPos = rTxt.indexOf( sTmp, nFndPos + 1); diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 1634f060ff42..bd0494f27368 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -251,7 +251,7 @@ void DocumentHolder::FreeOffice() // the following code is commented out since for now there is still no completely correct way to detect // whether the office can be terminated, so it is better to have unnecessary process running than - // to loose any data + // to lose any data // uno::Reference< frame::XFramesSupplier > xFramesSupplier( xDesktop, uno::UNO_QUERY ); // if ( xFramesSupplier.is() ) diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx index 57cd399cbaeb..03c10c53109a 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx @@ -27,10 +27,6 @@ typedef std::deque< Point > DXFPointArray; - -//----------------------------- entity kind ------------------------------------ - - enum DXFEntityType { DXF_LINE, DXF_POINT, @@ -52,9 +48,7 @@ enum DXFEntityType { DXF_HATCH }; - -//------------------------ base class of an entity ----------------------------- - +// base class of an entity class DXFBasicEntity { @@ -98,10 +92,7 @@ protected: }; -//------------------- the different kinds of entities -------------------------- - - -//--------------------------Line------------------------------------------------ +// the different kinds of entities class DXFLineEntity : public DXFBasicEntity { @@ -117,8 +108,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------Point----------------------------------------------- - class DXFPointEntity : public DXFBasicEntity { public: @@ -132,8 +121,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------Circle---------------------------------------------- - class DXFCircleEntity : public DXFBasicEntity { public: @@ -148,8 +135,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------Arc------------------------------------------------- - class DXFArcEntity : public DXFBasicEntity { public: @@ -166,8 +151,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------Trace----------------------------------------------- - class DXFTraceEntity : public DXFBasicEntity { public: @@ -184,8 +167,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------Solid----------------------------------------------- - class DXFSolidEntity : public DXFBasicEntity { public: @@ -202,8 +183,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------Text------------------------------------------------ - class DXFTextEntity : public DXFBasicEntity { public: @@ -227,8 +206,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------Shape----------------------------------------------- - class DXFShapeEntity : public DXFBasicEntity { public: @@ -247,8 +224,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------Insert---------------------------------------------- - class DXFInsertEntity : public DXFBasicEntity { public: @@ -272,8 +247,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------AttDef---------------------------------------------- - class DXFAttDefEntity : public DXFBasicEntity { public: @@ -301,8 +274,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------Attrib---------------------------------------------- - class DXFAttribEntity : public DXFBasicEntity { public: @@ -329,8 +300,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------PolyLine-------------------------------------------- - class DXFPolyLineEntity : public DXFBasicEntity { public: @@ -375,8 +344,6 @@ class DXFLWPolyLineEntity : public DXFBasicEntity }; -//-------------------------- Hatch --------------------------------------------- - struct DXFEdgeType { sal_Int32 nEdgeType; @@ -487,9 +454,6 @@ class DXFHatchEntity : public DXFBasicEntity virtual void EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE; }; - -//--------------------------Vertex---------------------------------------------- - class DXFVertexEntity : public DXFBasicEntity { public: @@ -508,8 +472,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------SeqEnd---------------------------------------------- - class DXFSeqEndEntity : public DXFBasicEntity { public: @@ -517,8 +479,6 @@ public: DXFSeqEndEntity(); }; -//--------------------------3DFace---------------------------------------------- - class DXF3DFaceEntity : public DXFBasicEntity { public: @@ -536,8 +496,6 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; }; -//--------------------------Dimension------------------------------------------- - class DXFDimensionEntity : public DXFBasicEntity { public: @@ -552,9 +510,7 @@ protected: }; -//----------------- read and represent the set of entities --------------------- - - +// read and represent the set of entities class DXFEntities { public: @@ -565,7 +521,7 @@ public: DXFBasicEntity * pFirst; // list of entities, READ ONLY! void Read(DXFGroupReader & rDGR); - // read entities per rGDR of a DXF file untill a + // read entities per rGDR of a DXF file until a // ENDBLK, ENDSEC oder EOF (of group 0). // (all unknown thing will be skipped) @@ -573,10 +529,6 @@ public: // deletes all entities }; - -//--------------------------------- inlines ------------------------------------ - - inline DXFEntities::DXFEntities() { pFirst=NULL; diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java index b178b151734b..da7948e3d2af 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTools.java +++ b/framework/qa/complex/framework/recovery/RecoveryTools.java @@ -207,7 +207,7 @@ public class RecoveryTools { xMSF = null; desk.terminate(); - log.println("Waiting until ProcessHandler loose the office..."); + log.println("Waiting until ProcessHandler loses the office..."); } catch (java.lang.Exception e) { diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 715b4bac6730..eac5b1ed3e9a 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2309,7 +2309,7 @@ void AutoRecovery::implts_updateTimer() #endif } else if (m_eTimerType == AutoRecovery::E_POLL_TILL_AUTOSAVE_IS_ALLOWED) - nMilliSeconds = 300; // there is a minimum time frame, where the user can loose some key input data! + nMilliSeconds = 300; // there is a minimum time frame, where the user can lose some key input data! m_aTimer.SetTimeout(nMilliSeconds); m_aTimer.Start(); diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx index c1a94cf9934c..8d00056bffca 100644 --- a/helpcompiler/source/BasCodeTagger.cxx +++ b/helpcompiler/source/BasCodeTagger.cxx @@ -185,7 +185,7 @@ void BasicCodeTagger::tagBasicCodes() } catch (TaggerException &ex) { - std::cout << "BasCodeTagger error occured. Error code:" << ex << std::endl; + std::cout << "BasCodeTagger error occurred. Error code:" << ex << std::endl; } //tag basic code paragraphs in <bascode> tag diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 3ae1f437d05d..33816b3c7e0f 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -1907,7 +1907,7 @@ OUString LanguageTag::getGlibcLocaleString( const OUString & rEncoding ) const /* FIXME: use the aImplIsoLangGLIBCModifiersEntries table from * i18nlangtag/source/isolang/isolang.cxx or let liblangtag handle it. * So far no code was prepared for anything else than a simple - * language_country locale so we don't loose anything here right now. + * language_country locale so we don't lose anything here right now. * */ } return aRet; diff --git a/i18npool/source/breakiterator/gendict.cxx b/i18npool/source/breakiterator/gendict.cxx index c0f1e8ecd577..0b70a39f2596 100644 --- a/i18npool/source/breakiterator/gendict.cxx +++ b/i18npool/source/breakiterator/gendict.cxx @@ -253,7 +253,7 @@ static inline void printIndex2(FILE *source_fp, sal_Int16 *set) #endif } -/* Generates a bitmask for the existance of sal_Unicode values in dictionary; +/* Generates a bitmask for the existence of sal_Unicode values in dictionary; it packs 8 sal_Bool values in 1 sal_uInt8 */ static inline void printExistsMask(FILE *source_fp) { diff --git a/include/osl/file.h b/include/osl/file.h index cf1d61f4ebe6..c00a302a5c7d 100644 --- a/include/osl/file.h +++ b/include/osl/file.h @@ -323,7 +323,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_releaseDirectoryItem( @return sal_True: if the items point to an identical resource<br> - sal_False: if the items point to a different resource, or a fatal error occured<br> + sal_False: if the items point to a different resource, or a fatal error occurred<br> @see osl_getDirectoryItem() diff --git a/include/osl/file.hxx b/include/osl/file.hxx index 7dfafdcb2793..1e600e78ca80 100644 --- a/include/osl/file.hxx +++ b/include/osl/file.hxx @@ -1587,7 +1587,7 @@ public: @return true: if the items point to an identical resource<br> - false: if the items point to a different resource, or a fatal error occured<br> + false: if the items point to a different resource, or a fatal error occurred<br> @see osl_getDirectoryItem() diff --git a/include/rtl/textenc.h b/include/rtl/textenc.h index ba17f6841979..72c9b2cc5306 100644 --- a/include/rtl/textenc.h +++ b/include/rtl/textenc.h @@ -240,7 +240,7 @@ Western (Apple Macintosh/Icelandic) RTL_TEXTENCODING_APPLE_ICELAND Western (ASCII/US) RTL_TEXTENCODING_ASCII_US Western (DOS/OS2-437/US) RTL_TEXTENCODING_IBM_437 Western (DOS/OS2-850/International) RTL_TEXTENCODING_IBM_850 -Western (DOS/OS2-860/Portugese) RTL_TEXTENCODING_IBM_860 +Western (DOS/OS2-860/Portuguese) RTL_TEXTENCODING_IBM_860 Western (DOS/OS2-861/Icelandic) RTL_TEXTENCODING_IBM_861 Western (DOS/OS2-863/Canadian-French) RTL_TEXTENCODING_IBM_863 Western (DOS/OS2-865/Nordic) RTL_TEXTENCODING_IBM_865 diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index a8c3c3214a25..13eb515e9016 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -232,6 +232,7 @@ public: virtual void QueryObjAreaPixel( Rectangle& rRect ) const; virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; + /** retrieves the document which shall be considered the "current document" when the frame is active The default implementation simply returns the XModel of the associated SfxObjectShell. You will rarely @@ -239,6 +240,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetCurrentDocument() const; + /** forwards the current document, as returned by ->GetCurrentDocument, to SfxObjectShell::SetWorkingDocument */ void SetCurrentDocument() const; @@ -316,7 +318,7 @@ inline void SfxViewShell::LostFocus() const [Note] - <StarView> unfortunatly does not provide the possibility to define + <StarView> unfortunately does not provide the possibility to define such events 'from the side'. */ diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 321dd44f22d0..68729bb07011 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -753,7 +753,7 @@ inline void SfxMultiFixRecordWriter::NewContent() } /** - * Creates a SfxMultiMixRecord in the given stream with a seperate tags and + * Creates a SfxMultiMixRecord in the given stream with a separate tags and * versions of its content parts. The sizes of each part are calculated * automatically. * diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 65b368328ee9..d4b6e9014503 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -1109,7 +1109,7 @@ The following structure describes the permissions used in PDF security EndStructureElement for it. Best think of the structure tree as a stack. - Note: there is always one structural element in existance without having + Note: there is always one structural element in existence without having called BeginStructureElement; this is the root of the structure tree (called StructTreeRoot). The StructTreeRoot has always the id 0. diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index b08316c0000b..3509c6225f3d 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -924,7 +924,7 @@ public: static css::uno::Reference< css::awt::XDisplayConnection > GetDisplayConnection(); /** @deprecated AppEvent is used only in the Desktop class now. However, it is - intended to notify the application that an event has occured. It was in oldsv.cxx, + intended to notify the application that an event has occurred. It was in oldsv.cxx, but is still needed by a number of functions. @param rAppEvent const reference to ApplicationEvent event @@ -1093,7 +1093,7 @@ public: */ static Rectangle GetScreenPosSizePixel( unsigned int nScreen ); - /** Determines if the screens that make up a display are seperate or + /** Determines if the screens that make up a display are separate or form one large display area. @returns true when screens form up one large display area windows can be diff --git a/odk/config/setsdkenv_windows.template b/odk/config/setsdkenv_windows.template index ce55568b24fc..b7e5c047acf7 100644 --- a/odk/config/setsdkenv_windows.template +++ b/odk/config/setsdkenv_windows.template @@ -17,7 +17,7 @@ rem the License at http://www.apache.org/licenses/LICENSE-2.0 . rem @echo off -REM This script sets all enviroment variables, which +REM This script sets all environment variables, which REM are necessary for building the examples of the Office Development Kit. REM The Script was developed for the operating systems Windows. REM The SDK name diff --git a/offapi/com/sun/star/form/component/DatabaseListBox.idl b/offapi/com/sun/star/form/component/DatabaseListBox.idl index 967c9332c3da..0b8f95210dbe 100644 --- a/offapi/com/sun/star/form/component/DatabaseListBox.idl +++ b/offapi/com/sun/star/form/component/DatabaseListBox.idl @@ -128,7 +128,7 @@ published service DatabaseListBox <dd>The first element of the string sequence in ListBox::ListSource contains the SQL statement which the list result set should be based on.<br/> The statement is not analyzed by the parser. This means that you can use database specific - SQL features here, but, on the other hand, loose features like parameter value substitution.</dd> + SQL features here, but, on the other hand, lose features like parameter value substitution.</dd> <dt>com::sun::star::form::ListSourceType::TABLEFIELDS</dt> <dd>The first element of the string sequence in ListBox::ListSource diff --git a/oox/README b/oox/README index 31cb9de38d59..748966996c9e 100644 --- a/oox/README +++ b/oox/README @@ -180,10 +180,10 @@ cshape-all.pptx http://www.microsoft.com/en-us/download/details.aspx?id=30425 FUTURE WORK: because we have to make sure that all the roundtrips -like PPTX --> ODP --> PPTX work correctly and doesn't loose data. +like PPTX --> ODP --> PPTX work correctly and doesn't lose data. the only problematic part is probably saving custom shapes (ie. not presets) to PPTX. that part of code predates work on custom shapes and is unable to export general custom shapes yet. it will need a bit of work as LO has more complex equations than DrawingML. other parts -should work OK, PPTX --> ODP should work and don't loose any +should work OK, PPTX --> ODP should work and don't lose any data. presets should already survive PPTX --> ODP --> PPTX roundtrip diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx index 7df6ca4648be..cf8b4625c70b 100644 --- a/oox/source/ppt/pptfilterhelpers.cxx +++ b/oox/source/ppt/pptfilterhelpers.cxx @@ -91,7 +91,7 @@ namespace oox { namespace ppt { { bool bRet = false; - /* here we want to substitute all occurance of + /* here we want to substitute all occurrences of * [#]ppt_[xyhw] with * x,y,height and width respectively */ diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index 137bec9cfdb6..b6bc5cfaf494 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -357,7 +357,7 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry ) if( bWrite64Header ) { // FIXME64: need to append a ZIP64 header instead of throwing - // We're about to silently loose people's data - which they are + // We're about to silently lose people's data - which they are // unlikely to appreciate so fail instead: throw IOException( "File contains streams that are too large.", uno::Reference< XInterface >() ); @@ -379,7 +379,7 @@ void ZipOutputStream::writeEXT( const ZipEntry &rEntry ) if( bWrite64Header ) { // FIXME64: need to append a ZIP64 header instead of throwing - // We're about to silently loose people's data - which they are + // We're about to silently lose people's data - which they are // unlikely to appreciate so fail instead: throw IOException( "File contains streams that are too large.", uno::Reference< XInterface >() ); @@ -433,7 +433,7 @@ sal_Int32 ZipOutputStream::writeLOC( const ZipEntry &rEntry ) if( bWrite64Header ) { // FIXME64: need to append a ZIP64 header instead of throwing - // We're about to silently loose people's data - which they are + // We're about to silently lose people's data - which they are // unlikely to appreciate so fail instead: throw IOException( "File contains streams that are too large.", uno::Reference< XInterface >() ); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/module.properties b/reportbuilder/java/org/libreoffice/report/pentaho/module.properties index dad699e29e10..be552962a174 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/module.properties +++ b/reportbuilder/java/org/libreoffice/report/pentaho/module.properties @@ -22,7 +22,7 @@ module-info: name: factory-report-sun producer: The JFreeReport project - www.jfree.org/jfreereport description: XML-Parsers for OpenOffice.org report definitions. These definitions\ - are basicly similar to the old JFreeReport format, with some limited absolute\ + are basically similar to the old JFreeReport format, with some limited absolute\ positioning capabilities. version.major: 0 version.minor: 90 diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java index f8ad55fcdcd0..d17641550e57 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java @@ -218,8 +218,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget return; } - // All styles have to be processed or you will loose the paragraph-styles and inline text-styles. - + // All styles have to be processed or you will lose the paragraph-styles and inline text-styles. performStyleProcessing(attrs); final AttributeList attrList = buildAttributeList(attrs); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java index a6bf1e891bfe..bf9d2ce83d58 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java @@ -470,8 +470,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget // but we'll do this in the endElement, after we close this OfficeToken.TABLE_CELL } - // All styles have to be processed or you will loose the paragraph-styles and inline text-styles. - + // All styles have to be processed or you will lose the paragraph-styles and inline text-styles. performStyleProcessing(attrs); final AttributeList attrList = buildAttributeList(attrs); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableCellReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableCellReadHandler.java index e987dbbe8712..f37ac00f7453 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableCellReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableCellReadHandler.java @@ -21,7 +21,7 @@ import org.libreoffice.report.pentaho.model.TableCellElement; import org.libreoffice.report.pentaho.parser.text.NoCDATATextContentReadHandler; /** - * A read handler for table-cell contents. This is basicly a text-content + * A read handler for table-cell contents. This is basically a text-content * read handler; we may extend this implementation later. * * @since 05.03.2007 diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java index 83d44e04d301..b7c1a657752f 100644 --- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java +++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java @@ -538,7 +538,7 @@ public class ReportDesignerTest catch (com.sun.star.util.CloseVetoException e) { System.out.println("ERROR: CloseVetoException caught"); - System.out.println("CloseVetoException occured Can't close document."); + System.out.println("CloseVetoException occurred. Can't close document."); System.out.println("Message: " + e.getMessage()); } } diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index b08671180196..4dc7b1b97db5 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -4460,7 +4460,7 @@ void Test::testCopyPasteFormulas() ScDocFunc& rDocFunc = getDocShell().GetDocFunc(); bool bMoveDone = rDocFunc.MoveBlock(ScRange(0,0,0,0,4,0), ScAddress( 10, 10, 0), false, false, false, true); - // check that moving was succesful, mainly for editable tester + // check that moving was successful, mainly for editable tester CPPUNIT_ASSERT(bMoveDone); ASSERT_DOUBLES_EQUAL(m_pDoc->GetValue(10,10,0), 1.0); ASSERT_DOUBLES_EQUAL(m_pDoc->GetValue(10,11,0), 1.0); diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 534ae823acae..073508af58cf 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -1295,7 +1295,7 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& pNewObject->SetPage(pDestPage); uno::Reference< chart2::XChartDocument > xOldChart( ScChartHelper::GetChartFromSdrObject( pOldObject ) ); - if(!xOldChart.is())//#i110034# do not move charts as they loose all their data references otherwise + if(!xOldChart.is())//#i110034# do not move charts as they lose all their data references otherwise pNewObject->NbcMove(Size(0,0)); pDestPage->InsertObject( pNewObject ); diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx index a2e0f34f44bd..0a7f894b5300 100644 --- a/sc/source/core/tool/cellform.cxx +++ b/sc/source/core/tool/cellform.cxx @@ -91,7 +91,7 @@ void ScCellFormat::GetString( ScRefCellValue& rCell, sal_uLong nFormat, OUString // access to Formular Cells, becomes a CellText, even if // that triggers further interpretation, except if those // cells are already being interpreted. - // IdleCalc generally doesn't trigger futher interpretation, + // IdleCalc generally doesn't trigger further interpretation, // as not to get Err522 (circular). if ( pFCell->GetDocument()->IsInInterpreter() && (!pFCell->GetDocument()->GetMacroInterpretLevel() @@ -192,7 +192,7 @@ OUString ScCellFormat::GetString( // access to Formular Cells, becomes a CellText, even if // that triggers further interpretation, except if those // cells are already being interpreted. - // IdleCalc generally doesn't trigger futher interpretation, + // IdleCalc generally doesn't trigger further interpretation, // as not to get Err522 (circular). if (pFCell->GetDocument()->IsInInterpreter() && (!pFCell->GetDocument()->GetMacroInterpretLevel() diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index a3940de1da1d..dc81c9403621 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -39,7 +39,7 @@ #include "xltools.hxx" -// GUID import/export ========================================================= +// GUID import/export XclGuid::XclGuid() { @@ -89,10 +89,9 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclGuid& rGuid ) return rStrm; } -// Excel Tools ================================================================ - -// GUID's --------------------------------------------------------------------- +// Excel Tools +// GUID's const XclGuid XclTools::maGuidStdLink( 0x79EAC9D0, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B ); @@ -102,7 +101,7 @@ const XclGuid XclTools::maGuidUrlMoniker( const XclGuid XclTools::maGuidFileMoniker( 0x00000303, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 ); -// numeric conversion --------------------------------------------------------- +// numeric conversion double XclTools::GetDoubleFromRK( sal_Int32 nRKValue ) { @@ -335,7 +334,7 @@ double XclTools::GetXclDefColWidthCorrection( long nXclDefFontHeight ) return 40960.0 / ::std::max( nXclDefFontHeight - 15L, 60L ) + 50.0; } -// formatting ----------------------------------------------------------------- +// formatting Color XclTools::GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt16 nXclPattern ) { @@ -351,7 +350,7 @@ Color XclTools::GetPatternColor( const Color& rPattColor, const Color& rBackColo ScfTools::GetMixedColor( rPattColor, rBackColor, pnRatioTable[ nXclPattern ] ) : rPattColor; } -// text encoding -------------------------------------------------------------- +// text encoding namespace { @@ -371,7 +370,7 @@ pCodePageTable[] = { 855, RTL_TEXTENCODING_IBM_855 }, // OEM Cyrillic { 857, RTL_TEXTENCODING_IBM_857 }, // OEM Turkish // { 858, RTL_TEXTENCODING_IBM_858 }, // OEM Multilingual Latin I with Euro - { 860, RTL_TEXTENCODING_IBM_860 }, // OEM Portugese + { 860, RTL_TEXTENCODING_IBM_860 }, // OEM Portuguese { 861, RTL_TEXTENCODING_IBM_861 }, // OEM Icelandic { 862, RTL_TEXTENCODING_IBM_862 }, // OEM Hebrew { 863, RTL_TEXTENCODING_IBM_863 }, // OEM Canadian (French) @@ -442,8 +441,6 @@ sal_uInt16 XclTools::GetXclCodePage( rtl_TextEncoding eTextEnc ) return pEntry->mnCodePage; } -// font names ----------------------------------------------------------------- - OUString XclTools::GetXclFontName( const OUString& rFontName ) { // substitute with MS fonts @@ -451,8 +448,7 @@ OUString XclTools::GetXclFontName( const OUString& rFontName ) return aNewName.isEmpty() ? rFontName : aNewName; } -// built-in defined names ----------------------------------------------------- - +// built-in defined names const OUString XclTools::maDefNamePrefix( "Excel_BuiltIn_" ); const OUString XclTools::maDefNamePrefixXml ( "_xlnm." ); @@ -522,7 +518,7 @@ sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName ) return EXC_BUILTIN_UNKNOWN; } -// built-in style names ------------------------------------------------------- +// built-in style names const OUString XclTools::maStyleNamePrefix1( "Excel_BuiltIn_" ); const OUString XclTools::maStyleNamePrefix2( "Excel Built-in " ); @@ -645,7 +641,7 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons return false; } -// conditional formatting style names ----------------------------------------- +// conditional formatting style names const OUString XclTools::maCFStyleNamePrefix1( "Excel_CondFormat_" ); const OUString XclTools::maCFStyleNamePrefix2( "ConditionalStyle_" ); @@ -672,7 +668,7 @@ bool XclTools::IsCondFormatStyleName( const OUString& rStyleName ) return false; } -// stream handling ------------------------------------------------------------ +// stream handling void XclTools::SkipSubStream( XclImpStream& rStrm ) { @@ -686,7 +682,7 @@ void XclTools::SkipSubStream( XclImpStream& rStrm ) } } -// Basic macro names ---------------------------------------------------------- +// Basic macro names const OUString XclTools::maSbMacroPrefix( "vnd.sun.star.script:" ); const OUString XclTools::maSbMacroSuffix( "?language=Basic&location=document" ); @@ -713,7 +709,7 @@ OUString XclTools::GetXclMacroName( const OUString& rSbMacroUrl ) return OUString(); } -// read/write colors ---------------------------------------------------------- +// read/write colors XclImpStream& operator>>( XclImpStream& rStrm, Color& rColor ) { diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 2333e47553b7..c0db303be969 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1337,7 +1337,7 @@ static const BuiltinFormat spBuiltinFormats_pl_PL[] = NUMFMT_ENDTABLE() }; -/** Portugese, Brazil. */ +/** Portuguese, Brazil. */ static const BuiltinFormat spBuiltinFormats_pt_BR[] = { NUMFMT_ALLDATETIMES( "D/M/YYYY", "D", "/", "MMM", "/", "YY", "h", "hh" ), @@ -1345,7 +1345,7 @@ static const BuiltinFormat spBuiltinFormats_pt_BR[] = NUMFMT_ENDTABLE() }; -/** Portugese, Portugal. */ +/** Portuguese, Portugal. */ static const BuiltinFormat spBuiltinFormats_pt_PT[] = { NUMFMT_ALLDATETIMES( "DD-MM-YYYY", "DD", "-", "MMM", "-", "YY", "h", "h" ), @@ -1743,8 +1743,8 @@ static const BuiltinFormatTable spBuiltinFormatTables[] = { "nso-ZA", "*", spBuiltinFormats_en_ZA }, // Northern Sotho, South Africa { "pa-IN", "*", spBuiltinFormats_pa_IN }, // Punjabi, India { "pl-PL", "*", spBuiltinFormats_pl_PL }, // Polish, Poland - { "pt-BR", "*", spBuiltinFormats_pt_BR }, // Portugese, Brazil - { "pt-PT", "*", spBuiltinFormats_pt_PT }, // Portugese, Portugal + { "pt-BR", "*", spBuiltinFormats_pt_BR }, // Portuguese, Brazil + { "pt-PT", "*", spBuiltinFormats_pt_PT }, // Portuguese, Portugal { "qu-BO", "*", spBuiltinFormats_es_BO }, // Quechua, Bolivia { "qu-EC", "*", spBuiltinFormats_es_EC }, // Quechua, Ecuador { "qu-PE", "*", spBuiltinFormats_es_PE }, // Quechua, Peru diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index 7ad71c53fb5b..acd373ec346c 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -89,7 +89,7 @@ SvXMLImportContext *ScXMLNamedExpressionsContext::CreateChildContext( sal_uInt16 void ScXMLNamedExpressionsContext::EndElement() { - // happends in ScXMLImport::EndDocument() + // happens in ScXMLImport::EndDocument() // because it has to be set after the Database Ranges } diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 9c87bc3334d0..96ff21564a21 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -325,7 +325,7 @@ namespace basprov sal_Int32 nIndex = 0; // In some strange circumstances the Library name can have an - // apparantly illegal '.' in it ( in imported VBA ) + // apparently illegal '.' in it ( in imported VBA ) BasicManager* pBasicMgr = NULL; if ( aLocation == "document" ) diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx index 81d2817cd262..aec961d68bb5 100644 --- a/sd/inc/cusshow.hxx +++ b/sd/inc/cusshow.hxx @@ -28,11 +28,6 @@ class SdDrawDocument; class SdPage; -/************************************************************************* -|* -|* CustomShow -|* -\************************************************************************/ class SD_DLLPUBLIC SdCustomShow { public: @@ -62,11 +57,11 @@ public: /** Provides a direct access to the collection of the SdPage objects. */ PageVec& PagesVector(); /** - * Replaces all occurences of pOldPage with pNewPage. - * If pNewPage is 0 then removes all occurences of pOldPage. + * Replaces all occurrences of pOldPage with pNewPage. + * If pNewPage is 0 then removes all occurrences of pOldPage. */ void ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage ); - /** Removes all occurences of pPage. */ + /** Removes all occurrences of pPage. */ void RemovePage( const SdPage* pPage ); void SetName(const OUString& rName); diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h index 2600f3111f05..ec1f43a6aeae 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h @@ -1099,7 +1099,7 @@ DNSServiceErrorType DNSSD_API DNSServiceRegister * * sdRef: A DNSServiceRef initialized by DNSServiceRegister(). * - * RecordRef: A pointer to an uninitialized DNSRecordRef. Upon succesfull completion of this + * RecordRef: A pointer to an uninitialized DNSRecordRef. Upon successful completion of this * call, this ref may be passed to DNSServiceUpdateRecord() or DNSServiceRemoveRecord(). * If the above DNSServiceRef is passed to DNSServiceRefDeallocate(), RecordRef is also * invalidated and may not be used further. @@ -1722,7 +1722,7 @@ typedef void (DNSSD_API *DNSServiceRegisterRecordReply) * * sdRef: A DNSServiceRef initialized by DNSServiceCreateConnection(). * - * RecordRef: A pointer to an uninitialized DNSRecordRef. Upon succesfull completion of this + * RecordRef: A pointer to an uninitialized DNSRecordRef. Upon successful completion of this * call, this ref may be passed to DNSServiceUpdateRecord() or DNSServiceRemoveRecord(). * (To deregister ALL records registered on a single connected DNSServiceRef * and deallocate each of their corresponding DNSServiceRecordRefs, call diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h index 29466c1c0138..17d84f99dd6e 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h @@ -162,7 +162,7 @@ typedef enum #endif // Define context object big enough to hold a 64-bit pointer, -// to accomodate 64-bit clients communicating with 32-bit daemon. +// to accommodate 64-bit clients communicating with 32-bit daemon. // There's no reason for the daemon to ever be a 64-bit process, but its clients might be typedef packedunion { diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index d0a59e989951..4a44c6d5267d 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -194,7 +194,7 @@ void RecentDocsView::Reload() CalculateItemPositions(); Invalidate(); - // Set prefered width + // Set preferred width if( mFilteredItemList.empty() ) { Font aOldFont(GetFont()); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 0c6fa6cb132d..733abce27130 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -335,7 +335,7 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) /* [Description] - StarView Handler; loose-focus-handler of the edits of the template name. + StarView Handler; lose-focus-handler of the edits of the template name. This will update the listbox with the subsequent templates. The current template itself is not returned in the listbox of the base templates. */ diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 57c5bfe62515..9c5250f9e8b1 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2069,7 +2069,7 @@ bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed ) {} } - // before the title regenerated the document must loose the signatures + // before the title regenerated the document must lose the signatures pImp->nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES; pImp->nScriptingSignatureState = pNewMed->GetCachedSignatureState_Impl(); OSL_ENSURE( pImp->nScriptingSignatureState != SIGNATURESTATE_SIGNATURES_BROKEN, "The signature must not be broken at this place" ); diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 318e630547ab..a781a6c88a48 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -73,7 +73,7 @@ endif ifeq ($(COM_GCC_IS_CLANG),) gb_GccLess460 := $(shell expr $(GCC_VERSION) \< 406) -#At least SLED 10.2 gcc 4.3 overly agressively optimizes uno::Sequence into +#At least SLED 10.2 gcc 4.3 overly aggressively optimizes uno::Sequence into #junk, so only strict-alias on >= 4.6.0 gb_StrictAliasingUnsafe := $(gb_GccLess460) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 0de4a72e41e6..6d89207bf3ee 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -58,7 +58,7 @@ else gb_CXXFLAGS += -Wnon-virtual-dtor endif -#At least SLED 10.2 gcc 4.3 overly agressively optimizes uno::Sequence into +#At least SLED 10.2 gcc 4.3 overly aggressively optimizes uno::Sequence into #junk, so only strict-alias on >= 4.6.0 gb_StrictAliasingUnsafe := $(gb_GccLess460) diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx index a3bd84a47d69..ba22e1642630 100644 --- a/solenv/gcc-wrappers/wrapper.cxx +++ b/solenv/gcc-wrappers/wrapper.cxx @@ -20,7 +20,7 @@ string getexe(string exename) { size_t cmdlen; _dupenv_s(&cmdbuf,&cmdlen,exename.c_str()); if(!cmdbuf) { - cout << "Error " << exename << " not defined. Did you forget to source the enviroment?" << endl; + cout << "Error " << exename << " not defined. Did you forget to source the environment?" << endl; exit(1); } string command(cmdbuf); diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 7a62677434c1..015447684a51 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -126,7 +126,7 @@ public: bool bResizeOnPaint; // outstanding resize-event bool bUpdateOnUnlock; // Update() while locked bool bInUpdateScrollbars; // prevents recursions - bool bHadRecursion; // a recursion occured + bool bHadRecursion; // a recursion occurred bool bOwnDataChangedHdl; // dont change colors in DataChanged bool bCallingDropCallback; // we're in a callback to AcceptDrop or ExecuteDrop curently sal_uInt16 nUpdateLock; // lock count, dont call Control::Update()! diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 6000dde1a79d..114e37772a72 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -425,7 +425,7 @@ int SvParser::GetNextToken() pTokenStackPos->nTokenId = nRet; } else if( SVPAR_ACCEPTED != eState && SVPAR_PENDING != eState ) - eState = SVPAR_ERROR; // an error occured + eState = SVPAR_ERROR; // an error occurred return nRet; } diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 579c78530649..1e5fae376e87 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -1319,7 +1319,7 @@ void AccessibleShape::disposing (void) SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); - // Make sure to send an event that this object looses the focus in the + // Make sure to send an event that this object loses the focus in the // case that it has the focus. ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 2bb3d41e21ab..ad3ac459dcf8 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -1365,7 +1365,7 @@ namespace accessibility case HINT_ENDEDIT: { - // focused child now looses focus + // focused child now loses focus ESelection aSelection; if( GetEditViewForwarder().GetSelection( aSelection ) ) SetChildFocus( aSelection.nEndPara, false ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index d774574d2a6e..93f443966e92 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -532,9 +532,6 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) m_pModel->Insert( insertPos, pFilterItems ); } - -// class FmFilterModel - TYPEINIT1(FmFilterModel, FmParentData); FmFilterModel::FmFilterModel() @@ -558,7 +555,7 @@ void FmFilterModel::Clear() FilterClearingHint aClearedHint; Broadcast( aClearedHint ); - // loose endings + // lose endings if (m_pAdapter) { m_pAdapter->dispose(); diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 17d20c15d813..0c34c1967307 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1190,10 +1190,10 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) // #105899# First, guarantee that all objects are converted to polyobjects, // especially for SdrGrafObj with bitmap filling this is necessary to not - // loose the bitmap filling. + // lose the bitmap filling. // #i12392# - // ConvertMarkedToPolyObj was too strong here, it will loose quality and + // ConvertMarkedToPolyObj was too strong here, it will lose quality and // information when curve objects are combined. This can be replaced by // using ConvertMarkedToPathObj without changing the previous fix. diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 0b6643ff0fa4..54dbea75e293 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -553,7 +553,7 @@ void AccessibleCell::disposing (void) SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); - // Make sure to send an event that this object looses the focus in the + // Make sure to send an event that this object loses the focus in the // case that it has the focus. ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); if (pStateSet != NULL) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 67ee861dc48d..ebf2d336b833 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2475,8 +2475,8 @@ DECLARE_OOXMLEXPORT_TEST(testIndentation, "test_indentation.docx") DECLARE_OOXMLEXPORT_TEST(testCaption1, "EquationAsScientificNumbering.docx") { - // fdo#74431 : This test case is to verify the Captions are comming properly - //earlier it was comming as "SEQ "scientific"\*ROMAN now it is SEQ scientific\* ROMAN" + // fdo#74431 : This test case is to verify the Captions are coming properly + // earlier it was coming as "SEQ "scientific"\*ROMAN now it is SEQ scientific\* ROMAN" xmlDocPtr pXmlDoc = parseExport(); if (!pXmlDoc) diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 56803434581c..46446c2f18fa 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1497,7 +1497,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd ) if(!m_pTblCrsr) { SAL_WARN("sw", "fdo#74854: " - "this should not happen, but better loose the selection " + "this should not happen, but better lose the selection " "rather than crashing"); return; } diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index eb62fcf6d5f2..58cff5cd7375 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1067,7 +1067,7 @@ SwPosFlyFrms SwDoc::GetAllFlyFmts( const SwPaM* pCmpRange, bool bDrawAlso, if ( !pCntntFrm ) { // Oops! An empty page. - // In order not to loose the whole frame (RTF) we + // In order not to lose the whole frame (RTF) we // look for the last Cntnt before the page. SwPageFrm *pPrv = (SwPageFrm*)pPage->GetPrev(); while ( !pCntntFrm && pPrv ) diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 2f660a3cbcf2..5196ea9f163c 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -381,7 +381,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, bool bTst, bool ) Frm().Pos().X() += nDist; } - // growing happends upwards, so successors to not need to be invalidated + // growing happens upwards, so successors to not need to be invalidated if( nReal ) { _InvalidateSize(); diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index a7b786d5e8ef..6fc290f235b4 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1150,7 +1150,7 @@ static sal_uInt64 CalcDiff(const Point &rPt1, const Point &rPt2) return (dX * dX) + (dY * dY); } -/** Check if the point lies inside the page part in wich also the CntntFrame lies. +/** Check if the point lies inside the page part in which also the CntntFrame lies. * * In this context header, page body, footer and footnote-container count as page part. * This will suit the purpose that the CntntFrm which lies in the "right" page part will be diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index dc7968477301..9493250777be 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -696,7 +696,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa // This is a hack for the wollowing situation: In the paragraph there's a // text frame with relative size. Then let's take 0.5 cm as minimum width // and KSHRT_MAX as maximum width - // It were cleaner and maybe neccessary later on to iterate over the content + // It were cleaner and maybe necessary later on to iterate over the content // of the text frame and call GetMinMaxSize recursively nAktWidth = FLYINCNT_MIN_WIDTH; // 0.5 cm if( (long)rMax < KSHRT_MAX ) diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 104c8ccc8c25..1a6fd1cb4a7c 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -422,8 +422,8 @@ void SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ) pScrFont = pPrtFont; FontMetric aMet = pPrt->GetFontMetric( ); - //Don't loose "faked" properties of the logical font that don't truly - //exist in the physical font metrics which vcl which fake up for us + // Don't lose "faked" properties of the logical font that don't truly + // exist in the physical font metrics which vcl which fake up for us aMet.SetWeight(pScrFont->GetWeight()); aMet.SetItalic(pScrFont->GetItalic()); diff --git a/sw/source/core/uibase/uiview/formatclipboard.cxx b/sw/source/core/uibase/uiview/formatclipboard.cxx index efa48b876e0c..5a06d660d372 100644 --- a/sw/source/core/uibase/uiview/formatclipboard.cxx +++ b/sw/source/core/uibase/uiview/formatclipboard.cxx @@ -511,7 +511,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo // temporary SfxItemSet SfxItemSet* pTemplateItemSet = lcl_CreateEmptyItemSet( nSelectionType, *m_pItemSet_ParAttr->GetPool(), false); - // no need to verify the existance of pTemplateItemSet as we + // no need to verify the existence of pTemplateItemSet as we // know that here the selection type is SEL_TXT pTemplateItemSet->Put( *m_pItemSet_ParAttr ); diff --git a/sw/source/core/uibase/uiview/viewport.cxx b/sw/source/core/uibase/uiview/viewport.cxx index 7c119bf608c0..6e9ab88a6f72 100644 --- a/sw/source/core/uibase/uiview/viewport.cxx +++ b/sw/source/core/uibase/uiview/viewport.cxx @@ -305,7 +305,7 @@ void SwView::SetVisArea( const Point &rPt, bool bUpdateScrollbar ) // This goes wrong in the BrowseView, because the entire document may // not be visible. Since the content in frames is fitting exactly, // align is not possible (better idea?!?!) - // (fix: Bild.de, 200%) It does not work completly without alignment + // (fix: Bild.de, 200%) It does not work completely without alignment // Let's see how far we get with half BrushSize. Point aPt( rPt ); aPt = GetEditWin().LogicToPixel( aPt ); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 1bcaea7a1e43..9a29d9fa6f69 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1646,7 +1646,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const sw::Frame& rFrame, const Poin m_nTableDepth = 0; /* - * Save m_aRun as we should not loose the opening brace. + * Save m_aRun as we should not lose the opening brace. * OTOH, just drop the contents of m_aRunText in case something * would be there, causing a problem later. */ diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index a8b7563cee40..a4c45c9d2069 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -627,7 +627,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly, /* Just in case our original size is too big to fit inside a ushort we can - substitute the final size and loose on retaining the scaling factor but + substitute the final size and lose on retaining the scaling factor but still keep the correct display size anyway. */ const bool bIsSubstitutedSize = (aGrTwipSz.Width() > SHRT_MAX) || (aGrTwipSz.Height() > SHRT_MAX) || diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index bf4b67ae5561..5e9c930897e8 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -820,7 +820,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) OSL_ENSURE(bOk, "WW8: Bad Field!\n"); if (aF.nId == 33) aF.bCodeNest=false; // do not recurse into nested page fields bool bCodeNest = aF.bCodeNest; - if ( aF.nId == 6 ) bCodeNest = false; // We can handle them and loose the inner data + if ( aF.nId == 6 ) bCodeNest = false; // We can handle them and lose the inner data maFieldStack.push_back(WW8FieldEntry(*pPaM->GetPoint(), aF.nId)); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 9a7fe34d2225..3f0204f80a2b 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -1684,7 +1684,7 @@ void SwInsertDBColAutoPilot::Load() OUString sColumn; pSubProps[0] >>= sColumn; - //check for existance of the loaded column name + // check for existence of the loaded column name bool bFound = false; for(size_t nRealColumn = 0; nRealColumn < aDBColumns.size(); ++nRealColumn) { diff --git a/udkapi/com/sun/star/io/ObjectOutputStream.idl b/udkapi/com/sun/star/io/ObjectOutputStream.idl index b84c8db5c12c..2a31b67e2074 100644 --- a/udkapi/com/sun/star/io/ObjectOutputStream.idl +++ b/udkapi/com/sun/star/io/ObjectOutputStream.idl @@ -32,7 +32,7 @@ module com { module sun { module star { module io { /** is a stream which allows writing the data of persistent objects. <p>Implementations of this service must fulfill the specifications of the - DataOutputStream service; futhermore, the stream needs to be chained to a + DataOutputStream service; furthermore, the stream needs to be chained to a XMarkableStream. Therefore, it also provides the XMarkableStream interface, but it delegates the calls to the chained object. The written objects are held until this instance is destroyed. diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index 7250964deb6b..bf65e32423f6 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -202,7 +202,7 @@ OUString psp::getFontPath() // replace net and user paths if the path exists aPathBuffer.append(aConfigPath); aPathBuffer.appendAscii("/" LIBO_SHARE_FOLDER "/fonts"); - // check existance of config path + // check existence of config path struct stat aStat; if( 0 != stat( OUStringToOString( aPathBuffer.makeStringAndClear(), osl_getThreadTextEncoding() ).getStr(), &aStat ) || ! S_ISDIR( aStat.st_mode ) ) diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx index fa7280e574e1..c07fe8a46840 100644 --- a/vcl/inc/osx/saldata.hxx +++ b/vcl/inc/osx/saldata.hxx @@ -70,7 +70,7 @@ public: SALTIMERPROC mpTimerProc; // timer callback proc AquaSalInstance *mpFirstInstance; // pointer of first instance std::list<AquaSalFrame*> maFrames; // list of all frames - boost::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existance + boost::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existence std::list<AquaSalFrame*> maPresentationFrames; // list of frames in presentation mode SalObject *mpFirstObject; // pointer of first object window SalVirtualDevice *mpFirstVD; // first VirDev diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 0f0a52a88f73..10118a7a42e4 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -123,7 +123,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, CPPUNIT_ASSERT_MESSAGE( "Color space not there", aLayout.ColorSpace.is()); - CPPUNIT_ASSERT_MESSAGE( "Palette existance does not conform to bitmap", + CPPUNIT_ASSERT_MESSAGE( "Palette existence does not conform to bitmap", aLayout.Palette.is() == (nDepth <= 8)); uno::Sequence<sal_Int8> aPixelData2 = xBmp->getPixel( aLayout, geometry::IntegerPoint2D(0,0) ); diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 331bb0b2aa34..6baf5ae8ad9e 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -370,7 +370,7 @@ void Control::ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect ) void Control::DataChanged( const DataChangedEvent& rDCEvt) { - // we don't want to loose some style settings for controls created with the + // we don't want to lose some style settings for controls created with the // toolkit if ( IsCreatedWithToolkit() && (rDCEvt.GetType() == DATACHANGED_SETTINGS) && diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index 94f1a7258d32..a3633cd1eedf 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -738,7 +738,7 @@ bool GIFReader::ProcessGIF() } break; - // an error occured + // an error occurred case( ABORT_READING ): { bEnd = true; diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index 4d8e86d05c07..2a710b5cf6c4 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -385,15 +385,7 @@ sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, } // extern "C" -/************************************************************************* -|* -|* NaturalSpline() -|* -|* Description calculates the coefficients of natural -|* cubic splines with n intervals. -|* -*************************************************************************/ - +// Calculates the coefficients of natural cubic splines with n intervals. sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, double Marg0, double MargN, sal_uInt8 MargCond, @@ -488,15 +480,7 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, return 0; } -/************************************************************************* -|* -|* PeriodicSpline() -|* -|* Description calculates the coefficients of periodical -|* cubic splines with n intervals. -|* -*************************************************************************/ - +// calculates the coefficients of periodical cubic splines with n intervals. sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, double* b, double* c, double* d) { // array dimensions should range from [0..n]! @@ -555,15 +539,8 @@ sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, return 0; } -/************************************************************************* -|* -|* ParaSpline() -|* -|* Description calculate the coefficients of parametric -|* natural of periodical cubic splines with n intervals -|* -*************************************************************************/ - +// calculate the coefficients of parametric natural of periodical cubic splines +// with n intervals sal_uInt16 ParaSpline(sal_uInt16 n, double* x, double* y, sal_uInt8 MargCond, double Marg01, double Marg02, double MargN1, double MargN2, @@ -629,20 +606,6 @@ sal_uInt16 ParaSpline(sal_uInt16 n, double* x, double* y, sal_uInt8 MargCond, return 0; } -/************************************************************************* -|* -|* CalcSpline() -|* -|* Description Calculates the coefficients of parametrised -|* natural or periodic cubic polynom-splines. -|* The corner points of the polygon passed are used -|* as support points. n returns the number of partial polynoms. -|* This function returns TRUE if no error occured. -|* Only in this case memory for the coefficient array -|* has been allocated, which can be freed by the caller -|* using a delete. -*************************************************************************/ - bool CalcSpline(Polygon& rPoly, bool Periodic, sal_uInt16& n, double*& ax, double*& ay, double*& bx, double*& by, double*& cx, double*& cy, double*& dx, double*& dy, double*& T) @@ -712,21 +675,6 @@ bool CalcSpline(Polygon& rPoly, bool Periodic, sal_uInt16& n, return bRet; } -/************************************************************************* -|* -|* Spline2Poly() -|* -|* Description converts a parametrised cubic spline (natural -|* or periodic) to an approximate polygon. -|* The function returns false, if an error occured -|* during the calculation of the coefficients or -|* the polygon became too large (>PolyMax=16380). -|* In the first case the polygon has 0, in the -|* second case PolyMax points. -|* To prevent coordinate overflows we limit -|* them to +/-32000. -|* -*************************************************************************/ bool Spline2Poly(Polygon& rSpln, bool Periodic, Polygon& rPoly) { short MinKoord=-32000; // to prevent diff --git a/vcl/source/filter/sgvspln.hxx b/vcl/source/filter/sgvspln.hxx index f58891639ad3..4eb822e854a4 100644 --- a/vcl/source/filter/sgvspln.hxx +++ b/vcl/source/filter/sgvspln.hxx @@ -20,40 +20,25 @@ #ifndef INCLUDED_VCL_SOURCE_FILTER_SGVSPLN_HXX #define INCLUDED_VCL_SOURCE_FILTER_SGVSPLN_HXX -/************************************************************************* -|* -|* CalcSpline() -|* -|* Description Calculates the coefficients of parametrised -|* natural or periodic cubic polynom-splines. -|* The corner points of the polygon passed are used -|* as support points. n returns the number of partial polynoms. -|* This function returns TRUE if no error occured. -|* Only in this case memory for the coefficient array -|* has been allocated, which can be freed by the caller -|* using a delete. -|* -*************************************************************************/ - +/* + * Calculates the coefficients of parametrised natural or periodic cubic + * polynom-splines. The corner points of the polygon passed are used as + * support points. n returns the number of partial polynoms. This function + * returns TRUE if no error occurred. Only in this case memory for the + * coefficient array has been allocated, which can be freed by the caller + * using a delete. + */ bool CalcSpline(Polygon& rPoly, bool Periodic, sal_uInt16& n, double*& ax, double*& ay, double*& bx, double*& by, double*& cx, double*& cy, double*& dx, double*& dy, double*& T); -/************************************************************************* -|* -|* Spline2Poly() -|* -|* Description converts a parametrised cubic spline (natural -|* or periodic) to an approximate polygon. -|* The function returns false, if an error occured -|* during the calculation of the coefficients or -|* the polygon became too large (>PolyMax=16380). -|* In the first case the polygon has 0, in the -|* second case PolyMax points. -|* To prevent coordinate overflows we limit -|* them to +/-32000. -|* -*************************************************************************/ +/* + * Converts a parametrised cubic spline (natural or periodic) to an approximate + * polygon. The function returns false, if an error occurred during the + * calculation of the coefficients or the polygon became too large (>PolyMax=16380). + * In the first case the polygon has 0, in the second case PolyMax points. + * To prevent coordinate overflows we limit them to +/-32000. + */ bool Spline2Poly(Polygon& rSpln, bool Periodic, Polygon& rPoly); #endif // INCLUDED_VCL_SOURCE_FILTER_SGVSPLN_HXX diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 5f825e04f6fc..2906bb2690c9 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -5987,7 +5987,7 @@ bool PDFWriterImpl::finalizeSignature() if (!cert) { - SAL_WARN("vcl.gdi", "PDF Signing: Error occured, certificate cannot be reconstructed."); + SAL_WARN("vcl.gdi", "PDF Signing: Error occurred, certificate cannot be reconstructed."); return false; } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index a12de7b6eeb4..51491368e059 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4897,7 +4897,7 @@ bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) if( pToolItem && pToolItem->mpWindow && HasFocus() ) { ImplHideFocus(); - mbChangingHighlight = true; // avoid focus change due to loose focus + mbChangingHighlight = true; // avoid focus change due to loss of focus pToolItem->mpWindow->ImplControlFocus( GETFOCUS_TAB ); mbChangingHighlight = false; } @@ -5153,7 +5153,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) { Window *pFocusWindow = Application::GetFocusWindow(); ImplHideFocus(); - mbChangingHighlight = true; // avoid focus change due to loose focus + mbChangingHighlight = true; // avoid focus change due to loss of focus pItem->mpWindow->ImplControlFocus( GETFOCUS_TAB ); mbChangingHighlight = false; if( pFocusWindow != Application::GetFocusWindow() ) diff --git a/vcl/unx/generic/window/FWS.cxx b/vcl/unx/generic/window/FWS.cxx index b6887dae7a67..a2dbdae3da16 100644 --- a/vcl/unx/generic/window/FWS.cxx +++ b/vcl/unx/generic/window/FWS.cxx @@ -52,15 +52,8 @@ static Bool fwsHandlesFocus; static Window fwsCommWindow; -/*************************************<->*********************************** - * - * WMSupportsFWS() - - * - * Initialize our atoms and determine if the current window manager is - * providing FWS extension support. - * - *************************************<->***********************************/ - +// Initialize our atoms and determine if the current window manager is +// providing FWS extension support. Bool WMSupportsFWS (Display *display, int screen) { @@ -174,16 +167,9 @@ WMSupportsFWS (Display *display, int screen) return True; } -/*************************************<->*********************************** - * - * newHandler() - - * - * Handle X errors (temporarily) to record the occurrence of BadWindow - * errors without crashing. Used to detect the FWS_COMM_WINDOW root window - * property containing an old or obsolete window id. - * - *************************************<->***********************************/ - +// Handle X errors (temporarily) to record the occurrence of BadWindow +// errors without crashing. Used to detect the FWS_COMM_WINDOW root window +// property containing an old or obsolete window id. extern "C" { static Bool badWindowFound; @@ -202,17 +188,10 @@ newHandler (Display *display, XErrorEvent *xerror) } -/*************************************<->*********************************** - * - * RegisterFwsWindow() - - * - * Send a client message to the FWS_COMM_WINDOW indicating the existance - * of a new FWS client window. Be careful to avoid BadWindow errors on - * the XSendEvent in case the FWS_COMM_WINDOW root window property had - * old/obsolete junk in it. - * - *************************************<->***********************************/ - +// Send a client message to the FWS_COMM_WINDOW indicating the existence +// of a new FWS client window. Be careful to avoid BadWindow errors on +// the XSendEvent in case the FWS_COMM_WINDOW root window property had +// old/obsolete junk in it. Bool RegisterFwsWindow (Display *display, Window window) { @@ -241,14 +220,7 @@ RegisterFwsWindow (Display *display, Window window) return !badWindowFound; } -/*************************************<->*********************************** - * - * AddFwsProtocols - - * - * Add the FWS protocol atoms to the WMProtocols property for the window. - * - *************************************<->***********************************/ - +// Add the FWS protocol atoms to the WMProtocols property for the window. void AddFwsProtocols (Display *display, Window window) { diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index a504baa2837e..55d45552d8fd 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -4017,7 +4017,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) break; case ButtonPress: - // if we loose the focus in presentation mode + // if we lose the focus in presentation mode // there are good chances that we never get it back // since the WM ignores us if( IsOverrideRedirect() ) @@ -4072,7 +4072,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) if( ! (nStyle_ & SAL_FRAME_STYLE_FLOAT ) && mbInShow && GetDisplay()->getWMAdaptor()->getWindowManagerName().equalsAscii( "Sawfish" ) ) { // don't set the focus into the IME status window - // since this will lead to a parent loose-focus, close status, + // since this will lead to a parent loss of focus, close status, // reget focus, open status, .... flicker loop if ( (I18NStatus::get().getStatusFrame() != this) ) bSetFocus = true; diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.py b/wizards/com/sun/star/wizards/web/WWD_Startup.py index 668747801931..f5d6fcf2c78c 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Startup.py +++ b/wizards/com/sun/star/wizards/web/WWD_Startup.py @@ -67,7 +67,7 @@ Different groups of DataAware objects are grouped into vectors. Each group (all elements of a vector) uses the same DataObject, so when I change the underlying dataObject, I change the whole vector's DataObject, thus actualizing UI.<br/> -This is what happends when a session loads: I Load the session into +This is what happens when a session loads: I Load the session into a tree of DataObjects, and change the DataAware's DataObject. <br/> One could also look at this as a kind of "View-Model" relationship. The controls are the View, The DataObjects are the Model, containing the @@ -195,9 +195,9 @@ class WWD_Startup(WWD_General): ''' def insertRoadmap(self): - + self.insertRoadMapItems( - self.resources.RoadmapLabels, + self.resources.RoadmapLabels, [True, True, False, False, False, False, False]) self.setRoadmapInteractive(True) self.setRoadmapComplete(True) diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 3dfb3927cc50..ec3ee348b8cd 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -715,7 +715,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) { // HACK: This is for bnc#780851, where a table has one cell that has w:framePr, // which causes that paragraph to be converted to a text frame, and the original - // paragraph object no longer exists, which makes table creation fail and futhermore + // paragraph object no longer exists, which makes table creation fail and furthermore // it would be missing in the table layout anyway. So actually no letting that paragraph // be a text frame "fixes" it. I'm not sure what "inline" is supposed to mean in practice // anyway, so as long as this doesn't cause trouble elsewhere ... @@ -1571,7 +1571,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) if(pSectionContext) { // Ignore continuous section break at the end of the document, if the previous section had the same type as well - // It makes the importer loose margin settings with no benefit + // It makes the importer lose margin settings with no benefit SectionPropertyMap* pLastContext = m_pImpl->GetLastSectionContext(); int nPrevBreakType = 0; bool bHasPrevSection = false; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index f62827e4a734..6b31a1cdf331 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -922,7 +922,7 @@ int RTFDocumentImpl::resolvePict(bool bInline) if (!m_aStates.top().pCurrentBuffer) { Mapper().props(pProperties); - // Make sure we don't loose these properties with a too early reset. + // Make sure we don't lose these properties with a too early reset. m_bHadPicture = true; } else diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 5f8ef2ecac1e..cfd0c1f5c4ff 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -1537,7 +1537,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& // (is included as subelement of chart) if( bExportContent ) { - // #85929# always export table, otherwise clipboard may loose data + // #85929# always export table, otherwise clipboard may lose data exportTable(); } diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index 91cb4cb74938..9b4a765b139e 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -200,7 +200,7 @@ public: static void ExportBibliographyConfiguration(SvXMLExport& rExport); /** export a heading for every level. This is used by master documents - * to not loose the heading information if master documents are exported + * to not lose the heading information if master documents are exported * without section contents */ void ExportMasterDocHeadingDummies(); |