diff options
93 files changed, 175 insertions, 175 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 23e2510eee..018cc2e4c2 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -228,7 +228,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) } } else if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ERROR ) { if( mnWidth == 0 ) { - // an error occured, set condition so that OOo thread doesn't wait for us + // an error occurred, set condition so that OOo thread doesn't wait for us #if DEBUG sal_Bool aSuccess = #endif diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 150fe832e0..286b70c874 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1425,7 +1425,7 @@ void SbModule::GlobalRunInit( BOOL bBasicStart ) // Initialise GlobalInitErr-Flag for Compiler-Error // With the help of this flags could be located in SbModule::Run() after the call of // GlobalRunInit, if at the intialising of the module - // an error occured. Then it will not be launched. + // an error occurred. Then it will not be launched. GetSbData()->bGlobalInitErr = FALSE; // Parent of the module is a Basic diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index c7feec6fb6..8739e3857c 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -595,7 +595,7 @@ void SbiParser::DefType( BOOL bPrivate ) pDim = NULL; pElem = VarDecl(&pDim,FALSE,FALSE); if( !pElem ) - bDone = TRUE; // Error occured + bDone = TRUE; // Error occurred } if( pElem ) { @@ -727,14 +727,14 @@ void SbiParser::DefEnum( BOOL bPrivate ) pElem = VarDecl( &pDim, FALSE, TRUE ); if( !pElem ) { - bDone = TRUE; // Error occured + bDone = TRUE; // Error occurred break; } else if( pDim ) { delete pDim; Error( SbERR_SYNTAX ); - bDone = TRUE; // Error occured + bDone = TRUE; // Error occurred break; } @@ -764,7 +764,7 @@ void SbiParser::DefEnum( BOOL bPrivate ) if( pOld ) { Error( SbERR_VAR_DEFINED, pElem->GetName() ); - bDone = TRUE; // Error occured + bDone = TRUE; // Error occurred break; } diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 450388b7e8..ded4ba0176 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -785,7 +785,7 @@ BOOL SbiRuntime::Step() pInst->nErl = nLine; pErrCode = pCode; pErrStmnt = pStmnt; - // An error occured in an error handler + // An error occurred in an error handler // force parent handler ( if there is one ) // to handle the error bool bLetParentHandleThis = false; diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx index d360a32bea..afccfc9381 100644 --- a/connectivity/inc/connectivity/sqlerror.hxx +++ b/connectivity/inc/connectivity/sqlerror.hxx @@ -178,7 +178,7 @@ namespace connectivity the ErrorCondition which hit you @param _rxContext - the context in which the error occured. This will be filled in as + the context in which the error occurred. This will be filled in as <member scope="com::sun::star::uno">Exception::Context</member> member. @param _rParamValue1 @@ -215,7 +215,7 @@ namespace connectivity Note: You should prefer the version of <type>raiseException</type> which takes an additional <type>Context</type> parameter, since this allows clients of your - exception to examine where the error occured. + exception to examine where the error occurred. @param _eCondition the ErrorCondition which hit you @@ -253,7 +253,7 @@ namespace connectivity the ErrorCondition which hit you @param _rxContext - the context in which the error occured. This will be filled in as + the context in which the error occurred. This will be filled in as <member scope="com::sun::star::uno">Exception::Context</member> member. @param _rExceptionType @@ -299,7 +299,7 @@ namespace connectivity the ErrorCondition which hit you @param _rxContext - the context in which the error occured. This will be filled in as + the context in which the error occurred. This will be filled in as <member scope="com::sun::star::uno">Exception::Context</member> member. @param _rParamValue1 diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx index 0e61f34bc7..6512752f9d 100644 --- a/connectivity/inc/connectivity/sqliterator.hxx +++ b/connectivity/inc/connectivity/sqliterator.hxx @@ -171,7 +171,7 @@ namespace connectivity const OSQLParseNode* getSimpleGroupByTree() const; const OSQLParseNode* getSimpleHavingTree() const; - /** returns the errors which occured during parsing. + /** returns the errors which occurred during parsing. The returned object contains a chain (via SQLException::NextException) of SQLExceptions. */ @@ -338,12 +338,12 @@ namespace connectivity /** appends an SQLException corresponding to the given error code to our error collection @param _eError - the code of the error which occured + the code of the error which occurred @param _pReplaceToken1 - if not <NULL/>, the first occurance of '#' in the error message will be replaced + if not <NULL/>, the first occurrence of '#' in the error message will be replaced with the given token @param _pReplaceToken2 - if not <NULL/>, and if _rReplaceToken1 is not <NULL/>, the second occurance of '#' + if not <NULL/>, and if _rReplaceToken1 is not <NULL/>, the second occurrence of '#' in the error message will be replaced with _rReplaceToken2 */ void impl_appendError( IParseContext::ErrorCode _eError, diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx index 65a1185515..c7cca43ccf 100644 --- a/connectivity/inc/connectivity/sqlnode.hxx +++ b/connectivity/inc/connectivity/sqlnode.hxx @@ -303,7 +303,7 @@ namespace connectivity too, to check whether they contain nested sub queries. @param _pErrorHolder - takes the error which occured while generating the statement, if any. Might be <NULL/>, + takes the error which occurred while generating the statement, if any. Might be <NULL/>, in this case the error is not reported back, and can only be recognized by examing the return value. @@ -414,7 +414,7 @@ namespace connectivity ::rtl::OUString &_rTable ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData); - // susbtitute all occurences of :var or [name] into the dynamic parameter ? + // susbtitute all occurrences of :var or [name] into the dynamic parameter ? // _pNode will be modified if parameters exists static void substituteParameterNames(OSQLParseNode* _pNode); diff --git a/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java b/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java index e18e966fbd..cd0bd2936d 100644 --- a/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java +++ b/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java @@ -49,7 +49,7 @@ public class DatabaseMetaData { } catch( java.lang.IllegalAccessException ex ) { assure("IllegalAccessException!",false); } catch( SQLException ex ) { - assure("SQLException occured: " + ex.getMessage() ,false); + assure("SQLException occurred: " + ex.getMessage() ,false); } catch( java.lang.reflect.InvocationTargetException ex ) { assure("IllegalAccessException!",false); } finally { diff --git a/connectivity/qa/drivers/jdbc/LongVarCharTest.java b/connectivity/qa/drivers/jdbc/LongVarCharTest.java index 86de0b3409..27e88d77e8 100644 --- a/connectivity/qa/drivers/jdbc/LongVarCharTest.java +++ b/connectivity/qa/drivers/jdbc/LongVarCharTest.java @@ -120,7 +120,7 @@ public class LongVarCharTest extends ComplexTestCase } catch (java.lang.Exception e) { - System.out.println("== Exception occured while testing =="); + System.out.println("== Exception occurred while testing =="); e.printStackTrace(); } finally { diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 3261f6ed08..5b7056c584 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -76,7 +76,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInf OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,sql); if(pNode) { // special handling for parameters - /* we recusive replace all occurences of ? in the statement and replace them with name like "æ¬å" */ + /* we recusive replace all occurrences of ? in the statement and replace them with name like "æ¬å" */ sal_Int32 nParameterCount = 0; ::rtl::OUString sDefaultName( RTL_CONSTASCII_USTRINGPARAM( "parame" )); replaceParameterNodeName(pNode,sDefaultName,nParameterCount); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 88d5b9f0b8..fd941e08a4 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2281,7 +2281,7 @@ void ODbaseTable::alterColumn(sal_Int32 index, } catch(const Exception&) { - OSL_ENSURE(0,"ODbaseTable::alterColumn: Exception occured!"); + OSL_ENSURE(0,"ODbaseTable::alterColumn: Exception occurred!"); throw; } } diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 64b65a590d..d7467f50ea 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -428,7 +428,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) m_pConnection->throwGenericSQLException(STR_QUERY_NOT_LIKE_TOO_COMPLEX,*this); } else if( (aMatchString.indexOf ( WILDCARD ) == aMatchString.lastIndexOf ( WILDCARD ) ) ) - { // One occurance of '%' matches... + { // One occurrence of '%' matches... if ( aMatchString.indexOf ( WILDCARD ) == 0 ) pResult = createTest( aColumnName, E_BOOK_QUERY_ENDS_WITH, aMatchString.copy( 1 ) ); else if ( aMatchString.indexOf ( WILDCARD ) == aMatchString.getLength() - 1 ) diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 27d7833272..c426e065d0 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -133,7 +133,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( // Java-Call absetzen static jmethodID mID(NULL); obtainMethodId(t.pEnv, cMethodName,cSignature, mID); - OSL_VERIFY_RES( !isExceptionOccured(t.pEnv,sal_True),"Exception occured!"); + OSL_VERIFY_RES( !isExceptionOccurred(t.pEnv,sal_True),"Exception occurred!"); jvalue args[4]; args[3].l = 0; @@ -141,7 +141,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( if ( typeFilterCount ) { jobjectArray pObjArray = static_cast< jobjectArray >( t.pEnv->NewObjectArray( (jsize)typeFilterCount, java_lang_String::st_getMyClass(), 0 ) ); - OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" ); + OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" ); const ::rtl::OUString* typeFilter = _types.getConstArray(); bool bIncludeAllTypes = false; for ( sal_Int32 i=0; i<typeFilterCount; ++i, ++typeFilter ) @@ -153,7 +153,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( } jstring aT = convertwchar_tToJavaString( t.pEnv, *typeFilter ); t.pEnv->SetObjectArrayElement( pObjArray, (jsize)i, aT ); - OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" ); + OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" ); } if ( bIncludeAllTypes ) @@ -161,7 +161,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( // the SDBC API allows to pass "%" as table type filter, but in JDBC, "all table types" // is represented by the table type being <null/> t.pEnv->DeleteLocalRef( pObjArray ); - OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" ); + OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" ); } else { @@ -189,23 +189,23 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( if ( aCatalogFilter.hasValue() ) { t.pEnv->DeleteLocalRef((jstring)args[0].l); - OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" ); + OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" ); } if(args[1].l) { t.pEnv->DeleteLocalRef((jstring)args[1].l); - OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" ); + OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" ); } if(tableNamePattern.getLength()) { t.pEnv->DeleteLocalRef((jstring)args[2].l); - OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" ); + OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" ); } //for(INT16 i=0;i<len;i++) if ( args[3].l ) { t.pEnv->DeleteLocalRef( (jobjectArray)args[3].l ); - OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" ); + OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" ); } if ( jThrow ) diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index ad9f8d947f..8decaa3751 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -116,7 +116,7 @@ Reference< XConnection > SAL_CALL java_sql_Driver::connect( const ::rtl::OUStrin java_sql_Connection* pConnection = new java_sql_Connection( *this ); xOut = pConnection; if ( !pConnection->construct(url,info) ) - xOut.clear(); // an error occured and the java driver didn't throw an exception + xOut.clear(); // an error occurred and the java driver didn't throw an exception else m_aLogger.log( LogLevel::INFO, STR_LOG_DRIVER_SUCCESS ); } diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 3a7184393f..811c2e5de9 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -281,7 +281,7 @@ sal_Int32 java_lang_Object::callIntMethod( const char* _pMethodName, jmethodID& // call method jint out( t.pEnv->CallIntMethod( object, _inout_MethodID ) ); if ( _bIgnoreException ) - isExceptionOccured(t.pEnv,sal_True); + isExceptionOccurred(t.pEnv,sal_True); else ThrowSQLException( t.pEnv, NULL ); @@ -320,7 +320,7 @@ void java_lang_Object::callVoidMethodWithIntArg( const char* _pMethodName, jmeth // call method t.pEnv->CallVoidMethod( object, _inout_MethodID,_nArgument ); if ( _bIgnoreException ) - isExceptionOccured(t.pEnv,sal_True); + isExceptionOccurred(t.pEnv,sal_True); else ThrowSQLException( t.pEnv, NULL ); } @@ -333,7 +333,7 @@ void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmet // call method t.pEnv->CallVoidMethod( object, _inout_MethodID,_nArgument ); if ( _bIgnoreException ) - isExceptionOccured(t.pEnv,sal_True); + isExceptionOccurred(t.pEnv,sal_True); else ThrowSQLException( t.pEnv, NULL ); } diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index 2485943db4..a8b22c0f19 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -191,7 +191,7 @@ jobject connectivity::convertTypeMapToJavaMap(JNIEnv* /*pEnv*/,const Reference< return 0; } // ----------------------------------------------------------------------------- -sal_Bool connectivity::isExceptionOccured(JNIEnv *pEnv,sal_Bool _bClear) +sal_Bool connectivity::isExceptionOccurred(JNIEnv *pEnv,sal_Bool _bClear) { if ( !pEnv ) return sal_False; diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx index 3b38bc8929..9e005d38e2 100644 --- a/connectivity/source/drivers/macab/MacabRecords.cxx +++ b/connectivity/source/drivers/macab/MacabRecords.cxx @@ -939,7 +939,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT * scalar type, an error, or an unknown type are found. * Because of that, the following checks only occur for this type. * We store whether we have successfully placed this property - * into the MacabRecord (or whether an unrecoverable error occured). + * into the MacabRecord (or whether an unrecoverable error occurred). * Then, we try over and over again to place the property into the * record. There are three possible results: * 1) Success! diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index 8ca4e57b81..685c1fe65a 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -981,7 +981,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT && matchString.indexOf( MATCHCHAR ) == -1 ) { - // One occurance of '%' - no '_' matches... + // One occurrence of '%' - no '_' matches... if ( matchString.indexOf ( WILDCARD ) == 0 ) { op = MQueryOp::EndsWith; diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index 7924edba02..eec4b99c0f 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.hxx @@ -73,15 +73,15 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > Map2XNameAccess(JNIEnv *pEnv,jobject _pMap); jobject convertTypeMapToJavaMap(JNIEnv *pEnv,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & _rMap); - /** return if a exception occured + /** return if a exception occurred @param pEnv The native java env @param _bClear <TRUE/> if the execption should be cleared @return - <TRUE/> if an exception is occured + <TRUE/> if an exception is occurred */ - sal_Bool isExceptionOccured(JNIEnv *pEnv,sal_Bool _bClear); + sal_Bool isExceptionOccurred(JNIEnv *pEnv,sal_Bool _bClear); jobject createByteInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length); jobject createCharArrayReader(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length); diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 46993dbc6d..72c8291b61 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -702,7 +702,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rSt } catch ( Exception& ) { - OSL_ENSURE( false, "OSQLParseNode::impl_parseLikeNodeToString_throw Exception occured!" ); + OSL_ENSURE( false, "OSQLParseNode::impl_parseLikeNodeToString_throw Exception occurred!" ); } if ( !m_aChildren[0]->isLeaf() ) { diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src index faccf586a0..9772787cb6 100644 --- a/connectivity/source/resource/conn_shared_res.src +++ b/connectivity/source/resource/conn_shared_res.src @@ -131,7 +131,7 @@ String STR_STMT_TYPE_NOT_SUPPORTED String STR_UNSPECIFIED_ERROR { - Text [ en-US ] = "An unknown error occured."; + Text [ en-US ] = "An unknown error occurred."; }; String STR_COULD_NOT_CREATE_ADDRESSBOOK @@ -146,12 +146,12 @@ String STR_COULD_NOT_LOAD_LIB String STR_ERROR_REFRESH_ROW { - Text [ en-US ] = "An error occured while refreshing the current row."; + Text [ en-US ] = "An error occurred while refreshing the current row."; }; String STR_ERROR_GET_ROW { - Text [ en-US ] = "An error occured while getting the current row."; + Text [ en-US ] = "An error occurred while getting the current row."; }; String STR_CAN_NOT_CANCEL_ROW_UPDATE @@ -171,7 +171,7 @@ String STR_QUERY_INVALID_IS_NULL_COLUMN String STR_ILLEGAL_MOVEMENT { - Text [ en-US ] = "Illegal cursor movement occured."; + Text [ en-US ] = "Illegal cursor movement occurred."; }; String STR_COMMIT_ROW @@ -383,7 +383,7 @@ String STR_NO_CONNECTION // dbase String STR_COULD_NOT_DELETE_INDEX { - Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occured."; + Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occurred."; }; String STR_ONL_ONE_COLUMN_PER_INDEX { @@ -628,11 +628,11 @@ String STR_INVALID_FILE_URL }; String STR_NO_TABLE_CONTAINER { - Text [ en-US ] = "An error occured while obtaining the connection's table container."; + Text [ en-US ] = "An error occurred while obtaining the connection's table container."; }; String STR_NO_TABLE_EDITOR_DIALOG { - Text [ en-US ] = "An error occured while creating the table editor dialog."; + Text [ en-US ] = "An error occurred while creating the table editor dialog."; }; String STR_NO_TABLENAME { diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index a08e9bede4..4910b8c78e 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.cxx @@ -157,17 +157,17 @@ namespace connectivity size_t lcl_substitute( ::rtl::OUString& _inout_rString, const sal_Char* _pAsciiPattern, const ::rtl::OUString& _rReplace ) { - size_t nOccurences = 0; + size_t nOccurrences = 0; ::rtl::OUString sPattern( ::rtl::OUString::createFromAscii( _pAsciiPattern ) ); sal_Int32 nIndex = 0; while ( ( nIndex = _inout_rString.indexOf( sPattern ) ) > -1 ) { - ++nOccurences; + ++nOccurrences; _inout_rString = _inout_rString.replaceAt( nIndex, sPattern.getLength(), _rReplace ); } - return nOccurences; + return nOccurrences; } } diff --git a/connectivity/workben/skeleton/how_to_write_a_driver.txt b/connectivity/workben/skeleton/how_to_write_a_driver.txt index 596a934902..f76c1209e3 100644 --- a/connectivity/workben/skeleton/how_to_write_a_driver.txt +++ b/connectivity/workben/skeleton/how_to_write_a_driver.txt @@ -6,7 +6,7 @@ Pre implementation steps - copy all files from connectivity/workben/skeleton into your new created directory under connectivity/source/drivers and rename the first char of the files to one which isn't used so far ( please have a look at the other drivers ) -- search all occurances of skeleton and replace them to a name which you prefer +- search all occurrences of skeleton and replace them to a name which you prefer 1. Implement a class called driver or modify the existing skeleton -> have a look at SDriver.?xx 2. Implement a class called connection -> have a look at SConnection.?xx diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index cefe65e2b8..deccfe5997 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -289,7 +289,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) if ( pResMgr ) aDiagnosticMessage.append( OUString(String(ResId(STR_INTERNAL_ERRMSG, *pResMgr ))) ); else - aDiagnosticMessage.appendAscii( "The following internal error has occured:\n\n" ); + aDiagnosticMessage.appendAscii( "The following internal error has occurred:\n\n" ); aDiagnosticMessage.append( aInternalErrMsg ); } diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 0efc0ae091..6444193a77 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -128,7 +128,7 @@ class ExtensionDescription public: /**throws an exception if the description.xml is not available, cannot be read, does not contain the expected data, - or any other error occured. Therefore it shoult only be used with + or any other error occurred. Therefore it shoult only be used with new extensions. Throws com::sun::star::uno::RuntimeException, diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index f0ac23d2fb..520b2a5699 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -419,7 +419,7 @@ oslProcess raiseProcess( case osl_Process_E_NotFound: throw RuntimeException( OUSTR("image not found!"), 0 ); case osl_Process_E_TimedOut: - throw RuntimeException( OUSTR("timout occured!"), 0 ); + throw RuntimeException( OUSTR("timout occurred!"), 0 ); case osl_Process_E_NoPermission: throw RuntimeException( OUSTR("permission denied!"), 0 ); case osl_Process_E_Unknown: diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 170a403ddc..cbfde03cc8 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -161,7 +161,7 @@ bool create_folder( } catch (CommandFailedException &) { // Interaction Handler already handled the error - // that has occured... + // that has occurred... } catch (Exception &) { if (throw_exc) diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 4ed6794854..9a0262c4ed 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -627,7 +627,7 @@ beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered( catch (Exception &) { Any exc( ::cppu::getCaughtException() ); throw deployment::DeploymentException( - OUSTR("unexpected exception occured!"), + OUSTR("unexpected exception occurred!"), static_cast<OWeakObject *>(this), exc ); } } diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index f6ad3f54bc..623389ba49 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -345,7 +345,7 @@ void JavaMigration::migrateJavarc() { OSL_ENSURE(0, "[Service implementation " IMPL_NAME "] XJob::execute: jfw_setSelectedJRE failed."); - fprintf(stderr, "\nCannot migrate Java. An error occured.\n"); + fprintf(stderr, "\nCannot migrate Java. An error occurred.\n"); } } else if (err == JFW_E_FAILED_VERSION) diff --git a/desktop/win32/source/setup/setup.ulf b/desktop/win32/source/setup/setup.ulf index d0e867d49f..85d43f43aa 100644 --- a/desktop/win32/source/setup/setup.ulf +++ b/desktop/win32/source/setup/setup.ulf @@ -46,7 +46,7 @@ en-US = "There is already a setup process running." [%UNKNOWN_ERROR%] -en-US = "An Unknown Error occured!" +en-US = "An Unknown Error occurred!" [%INVALID_PROFILE%] diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 83b3ad4836..b3aeda3d3d 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -968,7 +968,7 @@ namespace editeng if( sChangeInto.getLength() ) { - // change the current occurence + // change the current occurrence implChange( sChangeInto ); // put into the "change all" list diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index 0a4ba3ec6b..0435e132ec 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -350,7 +350,7 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource, } catch ( ::com::sun::star::ucb::CommandFailedException const & ) { - // Interaction Handler already handled the error that has occured... + // Interaction Handler already handled the error that has occurred... } } @@ -378,7 +378,7 @@ void OFileAccess::kill( const rtl::OUString& FileURL ) } catch ( ::com::sun::star::ucb::CommandFailedException const & ) { - // Interaction Handler already handled the error that has occured... + // Interaction Handler already handled the error that has occurred... } } @@ -480,7 +480,7 @@ void OFileAccess::createFolder( const rtl::OUString& NewFolderURL ) } catch ( ::com::sun::star::ucb::CommandFailedException const & ) { - // Interaction Handler already handled the error that has occured... + // Interaction Handler already handled the error that has occurred... continue; } } @@ -546,7 +546,7 @@ Sequence< rtl::OUString > OFileAccess::getFolderContents( const rtl::OUString& F } catch ( ::com::sun::star::ucb::CommandFailedException const & ) { - // Interaction Handler already handled the error that has occured... + // Interaction Handler already handled the error that has occurred... } if ( xResultSet.is() ) @@ -617,7 +617,7 @@ Reference< XInputStream > OFileAccess::openFileRead( const rtl::OUString& FileUR } catch ( ::com::sun::star::ucb::CommandFailedException const & ) { - // Interaction Handler already handled the error that has occured... + // Interaction Handler already handled the error that has occurred... } return xRet; @@ -756,7 +756,7 @@ bool OFileAccess::createNewFile( const rtl::OUString & rParentURL, catch ( CommandFailedException const & ) { // Interaction Handler already handled the - // error that has occured... + // error that has occurred... continue; } } @@ -781,7 +781,7 @@ void SAL_CALL OFileAccess::writeFile( const rtl::OUString& FileURL, } catch ( CommandFailedException const & ) { - // Interaction Handler already handled the error that has occured... + // Interaction Handler already handled the error that has occurred... } } catch ( ContentCreationException const & e ) diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx index a351a994a6..8446605b5f 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx @@ -212,10 +212,10 @@ public: // the method returns: // 0 - when the dialog was canceled by the user // 1 - when the dialog was closed with ok - // -1 - when an error occured + // -1 - when an error occurred sal_Int16 SAL_CALL doModal(); - // returns the last dialog error that occured + // returns the last dialog error that occurred sal_uInt32 SAL_CALL getLastDialogError() const; // retrievs the currently selected file diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx index 82a29ae05d..59ce99693f 100644 --- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx +++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx @@ -419,7 +419,7 @@ sal_Bool SAL_CALL CFilePreview::show( sal_Bool bShow ) // if the preview is shown and enabled // preview of the given file will be shown // returns true on success or false if an error -// occured (the file in not there or not accessible etc.) +// occurred (the file in not there or not accessible etc.) //--------------------------------------------------- sal_Bool SAL_CALL CFilePreview::update( const rtl::OUString& aFileName ) diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx index 32937c7c69..818a78b711 100644 --- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx +++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx @@ -152,7 +152,7 @@ public: // if the preview is shown and enabled // preview of the given file will be shown // returns true on success or false if an error - // occured (the file in not there or not accessible etc.) + // occurred (the file in not there or not accessible etc.) virtual sal_Bool SAL_CALL update( const rtl::OUString& aFileName ); protected: diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx index f057c99620..8c66df5051 100644 --- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx +++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx @@ -270,7 +270,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) ); Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) ); - // Print a message if an error occured. + // Print a message if an error occurred. if ( g_xFactory.is() == sal_False ) { OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory"); @@ -369,7 +369,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) // Cast factory to XComponent Reference< XComponent > xComponent( g_xFactory, UNO_QUERY ); - // Print a message if an error occured. + // Print a message if an error occurred. if ( xComponent.is() == sal_False ) { OSL_ENSURE(sal_False, "Error shuting down"); diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx index 160d715e82..9a8e6a5b37 100644 --- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx +++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx @@ -128,7 +128,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/ ) OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) ); Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) ); - // Print a message if an error occured. + // Print a message if an error occurred. if ( g_xFactory.is() == sal_False ) { OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory"); @@ -179,7 +179,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/ ) // Cast factory to XComponent Reference< XComponent > xComponent( g_xFactory, UNO_QUERY ); - // Print a message if an error occured. + // Print a message if an error occurred. if ( xComponent.is() == sal_False ) { OSL_ENSURE(sal_False, "Error shuting down"); diff --git a/framework/inc/classes/servicemanager.hxx b/framework/inc/classes/servicemanager.hxx index dbb48a8807..b0ce5ee325 100644 --- a/framework/inc/classes/servicemanager.hxx +++ b/framework/inc/classes/servicemanager.hxx @@ -229,7 +229,7 @@ class ServiceManager @param "sRegistryFile", file name of user registry. @return A reference to a new initialized servicemanager with a valid registry. - It can be NULL, if an error occured. + It can be NULL, if an error occurred. @onerror Return a NULL-reference. *//*-*****************************************************************************************************/ diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index d26247a7d9..26faece82c 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -75,7 +75,7 @@ namespace framework{ /** @short protocol handler for "mailto:" URLs @descr It's a special dispatch object which is used registered for "mailto:*" URLs and - will be automaticly used from the framework dispatch mechanism if such URL occured. + will be automaticly used from the framework dispatch mechanism if such URL occurred. @base ThreadHelpBase exports a lock member to guarantee right initialize value of it diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index 2f8970b40c..85197c3245 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -176,7 +176,7 @@ class MenuDispatcher : // interfaces @seealso method loadCancelled() @param "xControl" , css::uno::Reference to a valid listener for state events. - @param "aURL" , URL about listener will be informed, if something occured. + @param "aURL" , URL about listener will be informed, if something occurred. @return - @onerror - diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index 33b572d0ca..54bbefab4c 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -75,7 +75,7 @@ namespace framework{ /** @short protocol handler for "service:*" URLs @descr It's a special dispatch/provider object which is registered for such URL pattern and will - be automaticly used by the framework dispatch mechanism if such URL occured. + be automaticly used by the framework dispatch mechanism if such URL occurred. His job is to create any registered uno components which must be coded inside dispatched URL (may with some optional given parameters). After that such created service must be hold his self alive. Such mechanism can be usefull for UI components diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index e93d54a62d..2a6755d6bd 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -75,7 +75,7 @@ namespace framework{ /** @short protocol handler for "systemexec:*" URLs @descr It's a special dispatch/provider object which is registered for such URL pattern and will - be automaticly used by the framework dispatch mechanism if such URL occured. + be automaticly used by the framework dispatch mechanism if such URL occurred. It forwards all URL's to the underlying operating system. So it would e.g. be possible to open HTML files outside the office within a web browser. diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx index d003baed32..ea13c21d7a 100644 --- a/framework/inc/services/logindialog.hxx +++ b/framework/inc/services/logindialog.hxx @@ -804,7 +804,7 @@ class LoginDialog : public XTYPEPROVIDER , @short helper methods to read/write properties from/to ini file @descr Using of Config-Class isn't easy everytime :-( Thats the reason for these helper. State of operation isn't realy important .. - but we assert impossible cases or occured errors! + but we assert impossible cases or occurred errors! @seealso - diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index 0afd03b525..fb3cd6ee3f 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -719,7 +719,7 @@ public class RecoveryTest extends ComplexTestCase { try{ xMathDoc = SOF.createMathDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating math document '"+frameName+"':"); + log.println("Exception occurred while creating math document '"+frameName+"':"); failed("Couldn't create test environment"); } return xMathDoc; @@ -733,16 +733,16 @@ public class RecoveryTest extends ComplexTestCase { try { xPS.setPropertyValue("Formula", expFormula); } catch(com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } catch(com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } catch(com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } catch(com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } } @@ -752,7 +752,7 @@ public class RecoveryTest extends ComplexTestCase { try{ xImpressDoc = SOF.createImpressDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating impress document '"+frameName+"':"); + log.println("Exception occurred while creating impress document '"+frameName+"':"); failed("Couldn't create test environment"); } return xImpressDoc; @@ -803,7 +803,7 @@ public class RecoveryTest extends ComplexTestCase { try{ xDrawDoc = SOF.createDrawDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating draw document '"+frameName+"':"); + log.println("Exception occurred while creating draw document '"+frameName+"':"); failed("Couldn't create test environment"); } return xDrawDoc; @@ -855,16 +855,16 @@ public class RecoveryTest extends ComplexTestCase { new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); oShapeProps.setPropertyValue("ZOrder", new Integer(1)); } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } } @@ -882,7 +882,7 @@ public class RecoveryTest extends ComplexTestCase { try { xTextDoc = SOF.createTextDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating text document '"+frameName+"':"); + log.println("Exception occurred while creating text document '"+frameName+"':"); failed("Couldn't create test environment"); } return xTextDoc; @@ -909,10 +909,10 @@ public class RecoveryTest extends ComplexTestCase { oCursor, ControlCharacter.LINE_BREAK, false ); } } catch ( com.sun.star.lang.IllegalArgumentException e ){ - log.println("Exception occured while filling text document with content."); + log.println("Exception occurred while filling text document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while filling text document with content."); + log.println("Exception occurred while filling text document with content."); failed("Couldn't create test environment"); } } @@ -924,7 +924,7 @@ public class RecoveryTest extends ComplexTestCase { try { xSheetDoc = SOF.createCalcDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating calc document '"+frameName+"':"); + log.println("Exception occurred while creating calc document '"+frameName+"':"); failed("Couldn't create test environment"); } return xSheetDoc; @@ -950,19 +950,19 @@ public class RecoveryTest extends ComplexTestCase { oSheet.getCellByPosition(3, 2).setFormula("xTextDoc"); oSheet.getCellByPosition(3, 3).setFormula("xTextDoc"); } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } } diff --git a/framework/qa/complex/imageManager/interfaces/_XInitialization.java b/framework/qa/complex/imageManager/interfaces/_XInitialization.java index 115f581f7e..d9ca13d917 100755..100644 --- a/framework/qa/complex/imageManager/interfaces/_XInitialization.java +++ b/framework/qa/complex/imageManager/interfaces/_XInitialization.java @@ -75,7 +75,7 @@ public class _XInitialization { } } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while method calling.") ; + log.println("Exception occurred while method calling.") ; e.printStackTrace((java.io.PrintWriter)log) ; result = false ; } diff --git a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java index 7af00b163e..1b0f5fe2dc 100755..100644 --- a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java +++ b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java @@ -59,7 +59,7 @@ public class _XTypeProvider { /** * Just calls the method.<p> - * Has <b>OK</b> status if no runtime exceptions occured. + * Has <b>OK</b> status if no runtime exceptions occurred. */ public boolean _getImplementationId() { boolean result = true; diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 45835eecb9..8eee860a45 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -500,7 +500,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::u //----------------------------------------------- // IStorageListener -void XMLBasedAcceleratorConfiguration::changesOccured(const ::rtl::OUString& /*sPath*/) +void XMLBasedAcceleratorConfiguration::changesOccurred(const ::rtl::OUString& /*sPath*/) { reload(); } diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index a66d953d25..43051b58ba 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -361,7 +361,7 @@ void StorageHolder::notifyPath(const ::rtl::OUString& sPath) { IStorageListener* pListener = *pIt2; if (pListener) - pListener->changesOccured(sNormedPath); + pListener->changesOccurred(sNormedPath); } aReadLock.unlock(); diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index b2b9f61a4a..023b9c02dd 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -310,7 +310,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& @param xListener reference to a valid listener for state events @param aURL - URL about listener will be informed, if something occured + URL about listener will be informed, if something occurred @modified 30.04.2002 14:49, as96863 */ diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 928f350661..60f796e54d 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -331,7 +331,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con @param xListener reference to a valid listener for state events @param aURL - URL about listener will be informed, if something occured + URL about listener will be informed, if something occurred @modified 30.04.2002 14:49, as96863 */ diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index fdd086ead7..d4d2112885 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -220,7 +220,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase throw(css::uno::RuntimeException); // IStorageListener - virtual void changesOccured(const ::rtl::OUString& sPath); + virtual void changesOccurred(const ::rtl::OUString& sPath); //______________________________________ // helper for derived classes diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx index 01464a0ea6..5b86638cd3 100644 --- a/framework/source/inc/accelerators/istoragelistener.hxx +++ b/framework/source/inc/accelerators/istoragelistener.hxx @@ -57,7 +57,7 @@ class IStorageListener //-------------------------------------- /** @short TODO */ - virtual void changesOccured(const ::rtl::OUString& sPath) = 0; + virtual void changesOccurred(const ::rtl::OUString& sPath) = 0; }; } // namespace framework diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 62db6a49a4..bd308fb618 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -97,7 +97,7 @@ class WindowCommandDispatch : private ThreadHelpBase /// knows the frame, where we dispatch our commands as weak reference css::uno::WeakReference< css::frame::XFrame > m_xFrame; - /// knows the VCL window (where the hard coded commands occured) as weak XWindow reference + /// knows the VCL window (where the hard coded commands occurred) as weak XWindow reference css::uno::WeakReference< css::awt::XWindow > m_xWindow; //___________________________________________ diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index b3ea775857..ee666d0d02 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -58,7 +58,7 @@ namespace css = ::com::sun::star; load environment only. @descr Of course outside code must wrapp it, to transport - the occured information to its caller. + the occurred information to its caller. @author as96863 */ @@ -133,7 +133,7 @@ class LoadEnvException /** @short An ID, which make this exception unique among others. */ sal_Int32 m_nID; - /** @short Contains the original exception, if any occured. */ + /** @short Contains the original exception, if any occurred. */ css::uno::Any m_exOriginal; /** TODO diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index a10c90bafa..2c5bbe864c 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -326,7 +326,7 @@ void JobURL::impldbg_checkIt() JobURL::impldbg_checkURL("vnd.sun.star.job:service=;" , E_UNKNOWN, "" , "" , "" , NULL, NULL, NULL); // check combinations - // Note: No additional spaces or tabs are allowed after a seperator occured. + // Note: No additional spaces or tabs are allowed after a seperator occurred. // Tab and spaces before a seperator will be used as value! JobURL::impldbg_checkURL("vnd.sun.star.job:event=onMyEvent;alias=myAlias;service=css.Service" , E_EVENT | E_ALIAS | E_SERVICE , "onMyEvent", "myAlias", "css.Service" , NULL, NULL, NULL); JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service;alias=myAlias" , E_ALIAS | E_SERVICE , "" , "myAlias", "css.Service" , NULL, NULL, NULL); diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 1f23db3fa6..f3d1c23753 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -210,7 +210,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , // get access to the element // Note: Dont use impl_getConfig() method here. Because it creates a readonly access only, further // it cache it as a member of this module manager instance. If we change some props there ... but dont - // flush changes (because an error occured) we will read them later. If we use a different config access + // flush changes (because an error occurred) we will read them later. If we use a different config access // we can close it without a flush ... and our read data wont be affected .-) css::uno::Reference< css::uno::XInterface > xCfg = ::comphelper::ConfigurationHelper::openConfig( xSMGR, diff --git a/framework/source/unotypes/fwk.xml b/framework/source/unotypes/fwk.xml index 513c759e38..081c7cb05f 100644 --- a/framework/source/unotypes/fwk.xml +++ b/framework/source/unotypes/fwk.xml @@ -106,7 +106,7 @@ <name> com.sun.star.comp.framework.ServiceHandler </name> <description> It's a special dispatch object which is registered for "service:*" URL pattern - and will be automaticly used by the framework dispatch mechanism if such URL occured. + and will be automaticly used by the framework dispatch mechanism if such URL occurred. His job is to create any registered uno components which must be coded inside dispatched URL (may with some optional given parameters). After that such created service must be hold his self alive. Such mechanism can be usefull for UI components @@ -123,7 +123,7 @@ <name> com.sun.star.comp.framework.JobHandler </name> <description> It's a special dispatch object which is registered for "vnd.sun.star.job:*" URL pattern - and will be automaticly used by the framework dispatch mechanism if such URL occured. + and will be automaticly used by the framework dispatch mechanism if such URL occurred. It binds the dispatch mechanism to the generic job execution of this framework module. That can be used for e.g. addon purposes. </description> diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index bd748b2ce8..5ddfa4d6b4 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -58,7 +58,7 @@ namespace framework{ structure was detected. This macro combined the given comment with a generic - way to find out the XML line (where the error occured) + way to find out the XML line (where the error occurred) to format a suitable message. @param COMMENT diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index 5b89996ac5..e28a4f17ed 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -166,7 +166,7 @@ String GetModulePath( SvtPathOptions::Pathes ePath, BOOL bAddAccessDelim = TRUE String GetWritableDictionaryURL( const String &rDicName ); // looks for the specified file in the list of paths. -// In case of multiple occurences only the first found is returned. +// In case of multiple occurrences only the first found is returned. String SearchFileInPaths( const String &rFile, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rPaths ); diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java index 3a2ff76bc9..e7bce06905 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java @@ -170,7 +170,7 @@ public class ScriptEditorForBeanShell /** - * Indicates the line where error occured + * Indicates the line where error occurred * */ public void indicateErrorLine( int lineNum ) diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java index 46ccea6931..dde0286538 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java @@ -254,7 +254,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor } /** - * Indicates the line where error occured + * Indicates the line where error occurred * */ public void indicateErrorLine( int lineNum ) diff --git a/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java index 1b0e2345a0..8722bcbe17 100644 --- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java +++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.java @@ -64,7 +64,7 @@ public SecurityDialogUtil(XMultiServiceFactory xMSF, String btnName, boolean che } /** - * Returns the error message that occured while + * Returns the error message that occurred while * accessing and pressing the button. * @return Error message. */ diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx index dc7ef398c5..e65deece1e 100644 --- a/shell/source/win32/workbench/TestProxySet.cxx +++ b/shell/source/win32/workbench/TestProxySet.cxx @@ -98,7 +98,7 @@ int SAL_CALL main(int, char*, char* ) OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) ); Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) ); - // Print a message if an error occured. + // Print a message if an error occurred. if ( g_xFactory.is() == sal_False ) { OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory"); @@ -184,7 +184,7 @@ int SAL_CALL main(int, char*, char* ) // Cast factory to XComponent Reference< XComponent > xComponent( g_xFactory, UNO_QUERY ); - // Print a message if an error occured. + // Print a message if an error occurred. if ( xComponent.is() == sal_False ) { OSL_ENSURE(sal_False, "Error shuting down"); diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx index c1a30185f6..09f11925c2 100644 --- a/shell/source/win32/workbench/TestSmplMail.cxx +++ b/shell/source/win32/workbench/TestSmplMail.cxx @@ -93,7 +93,7 @@ int SAL_CALL main(int , char*, char* ) OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) ); Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) ); - // Print a message if an error occured. + // Print a message if an error occurred. if ( g_xFactory.is() == sal_False ) { OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory"); @@ -172,7 +172,7 @@ int SAL_CALL main(int , char*, char* ) // Cast factory to XComponent Reference< XComponent > xComponent( g_xFactory, UNO_QUERY ); - // Print a message if an error occured. + // Print a message if an error occurred. if ( xComponent.is() == sal_False ) { OSL_ENSURE(sal_False, "Error shuting down"); diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx index 56ae4db0e2..797947e1cd 100644 --- a/shell/source/win32/workbench/TestSysShExec.cxx +++ b/shell/source/win32/workbench/TestSysShExec.cxx @@ -103,7 +103,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* ) OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) ); Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) ); - // Print a message if an error occured. + // Print a message if an error occurred. if ( g_xFactory.is() == sal_False ) { OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory"); @@ -149,7 +149,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* ) // Cast factory to XComponent Reference< XComponent > xComponent( g_xFactory, UNO_QUERY ); - // Print a message if an error occured. + // Print a message if an error occurred. if ( xComponent.is() == sal_False ) { OSL_ENSURE(sal_False, "Error shuting down"); diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx index 297065ea57..fbac729f54 100644 --- a/svx/inc/svx/msdffdef.hxx +++ b/svx/inc/svx/msdffdef.hxx @@ -1097,7 +1097,7 @@ typedef enum { } MSO_BLIPUSAGE; typedef enum { // GEL provided types... - mso_blipERROR = 0, // An error occured during loading + mso_blipERROR = 0, // An error occurred during loading mso_blipUNKNOWN, // An unknown blip type mso_blipEMF, // Windows Enhanced Metafile mso_blipWMF, // Windows Metafile diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx index 70dd580871..e836695321 100644 --- a/svx/source/accessibility/DGColorNameLookUp.cxx +++ b/svx/source/accessibility/DGColorNameLookUp.cxx @@ -114,7 +114,7 @@ DGColorNameLookUp::DGColorNameLookUp (void) } catch (uno::RuntimeException e) { - // When an excpetion occured then whe have an empty name sequence + // When an excpetion occurred then whe have an empty name sequence // and the loop below is not entered. } diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index b906c7474e..71fefd2d0c 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -507,7 +507,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) } catch(Exception&) { - DBG_ERROR("FmGridHeader::ExecuteDrop: Exception occured!"); + DBG_ERROR("FmGridHeader::ExecuteDrop: Exception occurred!"); } sal_Int32 nPreferedType = -1; @@ -2128,7 +2128,7 @@ void FmGridControl::KeyInput( const KeyEvent& rKEvt ) } catch(const Exception&) { - OSL_ENSURE(0,"exception occured while deleting a column"); + OSL_ENSURE(0,"exception occurred while deleting a column"); } } } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 8d21c21e8b..c4475a4038 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1806,7 +1806,7 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) // +---+---+---+---+---+---+ // // Now, all is consistent again. - // (except of the hidden column : The cycling of the cols occured on the model, not on the view. maybe + // (except of the hidden column : The cycling of the cols occurred on the model, not on the view. maybe // the user expected the latter but there really is no good argument against our method ;) ...) // // And no, this large explanation isn't just because I wanted to play a board game or something like diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 52bc42fee7..8f52296bba 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -719,7 +719,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool } catch (Exception&) { - DBG_ERROR("FmPropBrw::StateChanged: Exception occured!"); + DBG_ERROR("FmPropBrw::StateChanged: Exception occurred!"); } m_bInStateChange = false; } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index c1fbafbe62..aa36fa53b5 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1773,7 +1773,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) } catch(Exception&) { - DBG_ERROR("FmXFormShell::SetY2KState: Exception occured!"); + DBG_ERROR("FmXFormShell::SetY2KState: Exception occurred!"); } } @@ -1814,7 +1814,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) } catch(Exception&) { - DBG_ERROR("FmXFormShell::SetY2KState: Exception occured!"); + DBG_ERROR("FmXFormShell::SetY2KState: Exception occurred!"); } } @@ -3238,7 +3238,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) } catch(Exception&) { - DBG_ERROR("FmXFormShell::stopFiltering: Exception occured!"); + DBG_ERROR("FmXFormShell::stopFiltering: Exception occurred!"); } if (!isRowSetAlive(xFormSet)) diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index b3649535f0..5822d9bc64 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -913,7 +913,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) } catch(Exception&) { - DBG_ERROR("Exception occured!"); + DBG_ERROR("Exception occurred!"); } } diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index a1d8c98745..81d622d80b 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -463,7 +463,7 @@ namespace svx if ( bSuccess ) return true; - // display the error. Prefer the one reported in errorOccured over the one caught. + // display the error. Prefer the one reported in errorOccurred over the one caught. if ( m_aOperationError.hasValue() ) displayException( m_aOperationError ); else if ( aError.hasValue() ) @@ -545,7 +545,7 @@ namespace svx //-------------------------------------------------------------------- void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& _Event ) throw (RuntimeException) { - OSL_ENSURE( !m_aOperationError.hasValue(), "FormControllerHelper::errorOccured: two errors during one operation?" ); + OSL_ENSURE( !m_aOperationError.hasValue(), "FormControllerHelper::errorOccurred: two errors during one operation?" ); m_aOperationError = _Event.Reason; } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index a640a6e343..f7878d4a78 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -88,7 +88,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) if( aAny >>= bValue ) m_aCB_Use_Variants.Check( bValue ); - // #117820# (search for other occurences!) + // #117820# (search for other occurrences!) // disable and hide that checkbox until it is decided if it is needed or not. // If it is to be removed later the respective code needs to be removed as // well, otherwise we just have to remove the next lines again. @@ -130,7 +130,7 @@ void ChineseTranslationDialog::getSettings( sal_Bool& rbDirectionToSimplified void ChineseTranslationDialog::impl_UpdateVariantsCheckBox() { -// #117820# (search for other occurences!) +// #117820# (search for other occurrences!) // m_aCB_Use_Variants.Enable( m_aRB_To_Traditional.IsChecked() ); } @@ -142,7 +142,7 @@ IMPL_LINK( ChineseTranslationDialog, DirectionHdl, void*, EMPTYARG ) IMPL_LINK( ChineseTranslationDialog, CommonTermsHdl, void*, EMPTYARG ) { -// #117820# (search for other occurences!) +// #117820# (search for other occurrences!) // if( m_aCB_Translate_Commonterms.IsChecked() && m_aRB_To_Traditional.IsChecked() ) // m_aCB_Use_Variants.Check( true ); return 0; diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl index 65ab6e2b03..cebb7147e2 100644 --- a/sysui/desktop/share/brand.pl +++ b/sysui/desktop/share/brand.pl @@ -86,15 +86,15 @@ while (<>) { # remove possible Windows line-ends chomp; - # patch all occurances of openoffice in ICON line with + # patch all occurrences of openoffice in ICON line with # $prefix s/Icon=/Icon=$iconprefix/; - # patch all occurances of openoffice in icon_filename + # patch all occurrences of openoffice in icon_filename # line with $prefix s/icon_filename=/icon_filename=$iconprefix/; - # patch all occurances of openoffice in EXEC line with + # patch all occurrences of openoffice in EXEC line with # $productfilename if ( /Exec/ ) { s/openoffice/$productfilename/; diff --git a/ucb/qa/complex/tdoc/interfaces/_XChild.java b/ucb/qa/complex/tdoc/interfaces/_XChild.java index 1638c6aa6a..0ef43e9550 100755..100644 --- a/ucb/qa/complex/tdoc/interfaces/_XChild.java +++ b/ucb/qa/complex/tdoc/interfaces/_XChild.java @@ -90,7 +90,7 @@ public class _XChild { oObj.setParent(gotten); } catch (com.sun.star.lang.NoSupportException ex) { - log.println("Exception occured during setParent() - " + (supported?"FAILED":"OK")); + log.println("Exception occurred during setParent() - " + (supported?"FAILED":"OK")); if (supported) { ex.printStackTrace((java.io.PrintWriter)log); return false; diff --git a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java b/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java index 2fcf59d56f..79cc1f9a75 100755..100644 --- a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java +++ b/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java @@ -50,7 +50,7 @@ public class _XServiceInfo { /** * Just calls the method.<p> - * Has <b>OK</b> status if no runtime exceptions occured. + * Has <b>OK</b> status if no runtime exceptions occurred. */ public boolean _getImplementationName() { boolean result = true; @@ -66,7 +66,7 @@ public class _XServiceInfo { /** * Just calls the method.<p> - * Has <b>OK</b> status if no runtime exceptions occured. + * Has <b>OK</b> status if no runtime exceptions occurred. */ public boolean _getSupportedServiceNames() { boolean result = true; diff --git a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java b/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java index 5f71388832..d8a787b41f 100755..100644 --- a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java +++ b/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java @@ -51,7 +51,7 @@ public class _XTypeProvider { /** * Just calls the method.<p> - * Has <b>OK</b> status if no runtime exceptions occured. + * Has <b>OK</b> status if no runtime exceptions occurred. */ public boolean _getImplementationId() { boolean result = true; diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 49c9e62236..6aad4da227 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -509,7 +509,7 @@ bool setTitle( if ( aErrors[ 0 ].hasValue() ) { - // error occured. + // error occurred. OSL_ENSURE( sal_False, "error setting Title property!" ); return false; } diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 6bcea45829..c5dcd4cbf2 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -389,7 +389,7 @@ namespace fileaccess { xEnv, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "an error occured during file opening")), + "an error occurred during file opening")), xComProc); } else if( errorCode == TASKHANDLING_OPEN_FOR_DIRECTORYLISTING || @@ -444,7 +444,7 @@ namespace fileaccess { xEnv, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "an error occured during opening a directory")), + "an error occurred during opening a directory")), xComProc); } else if( errorCode == TASKHANDLING_NOTCONNECTED_FOR_WRITE || @@ -461,7 +461,7 @@ namespace fileaccess { xEnv, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "an error occured writing or reading from a file")), + "an error occurred writing or reading from a file")), xComProc ); } else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_NO_SPACE ) @@ -527,7 +527,7 @@ namespace fileaccess { xEnv, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "an error occured during opening a file")), + "an error occurred during opening a file")), xComProc); } else if( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND || diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx index 9641b1de7a..e578ebd78f 100644 --- a/ucb/source/ucp/odma/odma_content.cxx +++ b/ucb/source/ucp/odma/odma_content.cxx @@ -394,7 +394,7 @@ uno::Any SAL_CALL Content::execute( } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception occured while creating the file content!"); + OSL_ENSURE(0,"Exception occurred while creating the file content!"); } xDataSink->setInputStream( xIn ); } diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx index bfd9c5df43..3f08378024 100644 --- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx +++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx @@ -123,7 +123,7 @@ protected: const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException) = 0; /** Derived classes may do additional postprocessing. Called even if the - event handler does not exist, or if an error occured during execution. */ + event handler does not exist, or if an error occurred during execution. */ virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, diff --git a/xmloff/inc/xmlerror.hxx b/xmloff/inc/xmlerror.hxx index ef8e1140cb..bc071fa765 100644 --- a/xmloff/inc/xmlerror.hxx +++ b/xmloff/inc/xmlerror.hxx @@ -91,8 +91,8 @@ // SvXMLExport/SvXMLImport error flags #define ERROR_NO 0x0000 #define ERROR_DO_NOTHING 0x0001 -#define ERROR_ERROR_OCCURED 0x0002 -#define ERROR_WARNING_OCCURED 0x0004 +#define ERROR_ERROR_OCCURRED 0x0002 +#define ERROR_WARNING_OCCURRED 0x0004 diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index 848b8744da..0d64a36381 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -530,7 +530,7 @@ public: void IgnorableWhitespace(); /** - * Record an error condition that occured during export. The + * Record an error condition that occurred during export. The * behavior of SetError can be modified using the error flag * constants. */ diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx index 415c45d23f..eb9a5f6daf 100644 --- a/xmloff/inc/xmloff/xmlimp.hxx +++ b/xmloff/inc/xmloff/xmlimp.hxx @@ -362,7 +362,7 @@ public: ::rtl::OUString GetODFVersion() const; /** - * Record an error condition that occured during import. The + * Record an error condition that occurred during import. The * behavior of SetError can be modified using the error flag * constants. */ diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index 044d9fe788..ea0e9518ec 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -74,8 +74,8 @@ public: OUString sExceptionMessage;/// message of original exception (if available) // XLocator information: - sal_Int32 nRow; /// row number where error occured (or -1 for unknown) - sal_Int32 nColumn; /// column number where error occured (or -1) + sal_Int32 nRow; /// row number where error occurred (or -1 for unknown) + sal_Int32 nColumn; /// column number where error occurred (or -1) OUString sPublicId; /// public identifier OUString sSystemId; /// public identifier @@ -130,7 +130,7 @@ void XMLErrors::AddRecord( OUStringBuffer sMessage; - sMessage.appendAscii( "An error or a warning has occured during XML import/export!\n" ); + sMessage.appendAscii( "An error or a warning has occurred during XML import/export!\n" ); // ID & flags sMessage.appendAscii( "Error-Id: 0x"); diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 45413cfc92..9f35e03e3c 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -923,8 +923,8 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue aSeq, e.Message, NULL ); } - // return true only if no error occured - return (GetErrorFlags() & (ERROR_DO_NOTHING|ERROR_ERROR_OCCURED)) == 0; + // return true only if no error occurred + return (GetErrorFlags() & (ERROR_DO_NOTHING|ERROR_ERROR_OCCURRED)) == 0; } void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException) @@ -2399,9 +2399,9 @@ void SvXMLExport::SetError( // maintain error flags if ( ( nId & XMLERROR_FLAG_ERROR ) != 0 ) - mnErrorFlags |= ERROR_ERROR_OCCURED; + mnErrorFlags |= ERROR_ERROR_OCCURRED; if ( ( nId & XMLERROR_FLAG_WARNING ) != 0 ) - mnErrorFlags |= ERROR_WARNING_OCCURED; + mnErrorFlags |= ERROR_WARNING_OCCURRED; if ( ( nId & XMLERROR_FLAG_SEVERE ) != 0 ) mnErrorFlags |= ERROR_DO_NOTHING; diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 11f53cd995..21f22affda 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1754,9 +1754,9 @@ void SvXMLImport::SetError( { // maintain error flags if ( ( nId & XMLERROR_FLAG_ERROR ) != 0 ) - mnErrorFlags |= ERROR_ERROR_OCCURED; + mnErrorFlags |= ERROR_ERROR_OCCURRED; if ( ( nId & XMLERROR_FLAG_WARNING ) != 0 ) - mnErrorFlags |= ERROR_WARNING_OCCURED; + mnErrorFlags |= ERROR_WARNING_OCCURRED; if ( ( nId & XMLERROR_FLAG_SEVERE ) != 0 ) mnErrorFlags |= ERROR_DO_NOTHING; diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 2f272dd1c6..a9b16d2ae8 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -122,7 +122,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( if (bFoundControlShapeDataStyle) { DBG_ERROR("SvXMLAutoStylePoolP::exportStyleAttributes: found two properties with the ControlShapeDataStyle context id!"); - // already added the attribute for the first occurence + // already added the attribute for the first occurrence break; } @@ -137,7 +137,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( if (bFoundNumberingRulesName) { DBG_ERROR("SvXMLAutoStylePoolP::exportStyleAttributes: found two properties with the numbering rules name context id!"); - // already added the attribute for the first occurence + // already added the attribute for the first occurrence break; } diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 55228488ef..c24c3c023e 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -847,7 +847,7 @@ void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNumFormat else if ( rParent.GetType() == XML_TOK_STYLES_PERCENTAGE_STYLE && nLength > 1 ) { // the percent character in percentage styles must be left out of quoting - // (one occurence is enough even if there are several percent characters in the string) + // (one occurrence is enough even if there are several percent characters in the string) rtl::OUString aString( rContent.getStr() ); sal_Int32 nPos = aString.indexOf( (sal_Unicode) '%' ); diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 47adb97914..dd60790878 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -896,7 +896,7 @@ void XMLSectionExport::ExportBaseIndexSource( aAny = xLevelTemplates->getByIndex(i); aAny >>= aTemplateSequence; - // export the sequence (abort export if an error occured; #91214#) + // export the sequence (abort export if an error occurred; #91214#) sal_Bool bResult = ExportIndexTemplate(eType, i, rPropertySet, aTemplateSequence); if ( !bResult ) diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index dc40a898b5..57038a3dee 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3137,7 +3137,7 @@ void XMLDdeFieldDeclImportContext::StartElement( UNO_QUERY); if( xFactory.is() ) { - /* #i6432# There might be multiple occurances of one DDE + /* #i6432# There might be multiple occurrences of one DDE declaration if it is used in more than one of header/footer/body. createInstance will throw an exception if we try to create the second, third, etc. instance of such a diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index f9ceaaefb8..e09f2d6b51 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -722,7 +722,7 @@ void FormattedFieldElement::endElement() } catch (util::MalformedNumberFormatException & exc) { - OSL_ENSURE( 0, "### util::MalformedNumberFormatException occured!" ); + OSL_ENSURE( 0, "### util::MalformedNumberFormatException occurred!" ); // rethrow throw xml::sax::SAXException( exc.Message, Reference< XInterface >(), Any() ); } |