diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2010-12-04 13:16:21 +0900 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-06 09:13:26 +0000 |
commit | 50a0d1170ac8cd85373687f00d3b03a9aadefe40 (patch) | |
tree | aef5cba1522c1d9a2f95c9217e709f884618782e /xmloff/source | |
parent | ebe931d8572c6698e97907cf042ccd471a15e2b7 (diff) |
Replace all occured, occurance etc.
Diffstat (limited to 'xmloff/source')
-rw-r--r-- | xmloff/source/core/xmlerror.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/xmlaustp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/XMLSectionExport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtfldi.cxx | 2 |
7 files changed, 14 insertions, 14 deletions
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 |