diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2010-12-04 13:02:52 +0900 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-06 09:12:45 +0000 |
commit | 2b22b5f4ee8674229a16c8bd59bda1f99d2eca1f (patch) | |
tree | b6b8ff0e08910491f16587664db6254c1b98c981 | |
parent | 3709037e92dc9eb5d7e12caac385e49fe42d23c7 (diff) |
Replace all occured, occurance etc.
17 files changed, 30 insertions, 30 deletions
diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx index 21b4e845945f..35e560025a5f 100644 --- a/filter/inc/filter/msfilter/escherex.hxx +++ b/filter/inc/filter/msfilter/escherex.hxx @@ -312,7 +312,7 @@ enum ESCHER_BlibType { // GEL provided types... - ERROR = 0, // An error occured during loading + ERROR = 0, // An error occurred during loading UNKNOWN, // An unknown blip type EMF, // Windows Enhanced Metafile WMF, // Windows Metafile diff --git a/filter/inc/filter/msfilter/mscodec.hxx b/filter/inc/filter/msfilter/mscodec.hxx index fc8c7cbd2113..b455267b0154 100644 --- a/filter/inc/filter/msfilter/mscodec.hxx +++ b/filter/inc/filter/msfilter/mscodec.hxx @@ -257,7 +257,7 @@ public: Size of the destination buffer. @return - true = Encoding was successful (no error occured). + true = Encoding was successful (no error occurred). */ bool Encode( const void* pData, sal_Size nDatLen, @@ -283,7 +283,7 @@ public: Size of the destination buffer. @return - true = Decoding was successful (no error occured). + true = Decoding was successful (no error occurred). */ bool Decode( const void* pData, sal_Size nDatLen, diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 7394f75ef1df..0804ccb03033 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -587,7 +587,7 @@ class FilterCache : public BaseLock attributes there. @throw [css::uno::Exception] - if an internal error occured. + if an internal error occurred. Note: If the item is missing inside the underlying configuration no exception will be thrown. In such case the item is marked as finalized/mandatory automaticly @@ -740,7 +740,7 @@ class FilterCache : public BaseLock @return [css::uno::Any] the value of the requested key. - Can be empty if an internal error occured or if the requested + Can be empty if an internal error occurred or if the requested key does not exists! */ css::uno::Any impl_getDirectCFGValue(const ::rtl::OUString& sDirectKey); @@ -898,7 +898,7 @@ class FilterCache : public BaseLock the set node name of the requested item. @return An iterator, which points directly to the new cached item. - Is a valid iterator if no exception occured here! + Is a valid iterator if no exception occurred here! But to improve robustness - it should be checked :-) @throw [css::container::NoSuchElementException] diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 53ad148dd827..0c475521bbcc 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -182,7 +182,7 @@ TypeDetection::~TypeDetection() //******************************************* // if no flat detected (nor preselected!) type could be - // verified and no error occured during creation of + // verified and no error occurred during creation of // the might needed input stream, start detection // which uses all registered deep detection services. if ( @@ -741,7 +741,7 @@ void TypeDetection::impl_getPreselection(const css::util::URL& aP // a) no types => no detection // b) deep detection not allowed => return first valid type of list (because its the preferred or the first valid one) // or(!) match by URLPattern => in such case a deep detection will be supressed! - // c) type has no detect service => safe the first occured type without a detect service + // c) type has no detect service => safe the first occurred type without a detect service // as "last chance"(!). It will be used outside of this method // if no further type could be detected. // It must be the first one, because it can be a preferred type. diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 4f64511caa84..349119549afc 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -550,7 +550,7 @@ sal_Bool Writer::streamSound( const char * filename ) // not the sum of the number of samples in the L and R channels. // // The return code = number of bytes output in mp3buffer. This can be 0. -// If it is <0, an error occured. +// If it is <0, an error occurred. for (int samples_written = 0; samples_written < info.frames; samples_written += samples_per_frame) diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx index b44a2d143eed..35fba0f64009 100644 --- a/filter/source/msfilter/countryid.cxx +++ b/filter/source/msfilter/countryid.cxx @@ -331,7 +331,7 @@ CountryId ConvertLanguageToCountry( LanguageType eLanguage ) LanguageType ConvertCountryToLanguage( CountryId eCountry ) { - // just find the first occurance of eCountry and return the language type + // just find the first occurrence of eCountry and return the language type const CountryEntry* pEntry = std::find_if( pTable, pEnd, CountryEntryPred_Country( eCountry ) ); return (pEntry != pEnd) ? pEntry->meLanguage : LANGUAGE_DONTKNOW; } diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index 02079fe52c47..baff6df9c161 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -187,7 +187,7 @@ Reference< com::sun::star::frame::XModel > xModel; } catch(Exception &) { - OSL_ENSURE( sal_False, "An Exception occured while opening File stream" ); + OSL_ENSURE( sal_False, "An Exception occurred while opening File stream" ); } if(sTypeName.equalsAscii("")) { diff --git a/filter/source/xslt/import/wordml/wordml2ooo_path.xsl b/filter/source/xslt/import/wordml/wordml2ooo_path.xsl index 2ad46a1a96a0..736d62a38015 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_path.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_path.xsl @@ -1533,7 +1533,7 @@ <xsl:value-of select="concat( $curr-char,$second-char , ':' , $position +2)"/> </xsl:if> <xsl:if test="$isvalid = '0' "> - <xsl:message>ooo2wordml_path.xsl: Error command occured </xsl:message> + <xsl:message>ooo2wordml_path.xsl: Error command occurred </xsl:message> </xsl:if> </xsl:when> <xsl:when test="$curr-char = 'n' "> @@ -1550,7 +1550,7 @@ <xsl:value-of select="concat( $curr-char,$second-char , ':' , $position +2)"/> </xsl:if> <xsl:if test="$isvalid = '0' "> - <xsl:message>ooo2wordml_path.xsl: Error command occured </xsl:message> + <xsl:message>ooo2wordml_path.xsl: Error command occurred </xsl:message> </xsl:if> </xsl:when> <xsl:when test="$curr-char = 'w' "> @@ -1567,7 +1567,7 @@ <xsl:value-of select="concat( $curr-char,$second-char , ':' , $position +2)"/> </xsl:if> <xsl:if test="$isvalid = '0' "> - <xsl:message>ooo2wordml_path.xsl: Error command occured </xsl:message> + <xsl:message>ooo2wordml_path.xsl: Error command occurred </xsl:message> </xsl:if> </xsl:when> <xsl:when test="$curr-char = 'q' "> @@ -1585,7 +1585,7 @@ <xsl:value-of select="concat( $curr-char,$second-char , ':' , $position +2)"/> </xsl:if> <xsl:if test="$isvalid = '0' "> - <xsl:message>ooo2wordml_path.xsl: Error command occured </xsl:message> + <xsl:message>ooo2wordml_path.xsl: Error command occurred </xsl:message> </xsl:if> </xsl:when> <xsl:when test="$curr-char = 'h' "> @@ -1601,7 +1601,7 @@ <xsl:value-of select="concat( $curr-char,$second-char , ':' , $position +2)"/> </xsl:if> <xsl:if test="$isvalid = '0' "> - <xsl:message>ooo2wordml_path.xsl: Error command occured </xsl:message> + <xsl:message>ooo2wordml_path.xsl: Error command occurred </xsl:message> </xsl:if> </xsl:when> <xsl:when test="string-length(translate($curr-char , 'mlcxetrv' ,'')) = 0 "> diff --git a/oox/inc/oox/core/binarycodec.hxx b/oox/inc/oox/core/binarycodec.hxx index 3c423219197c..f60dca65eb1d 100644 --- a/oox/inc/oox/core/binarycodec.hxx +++ b/oox/inc/oox/core/binarycodec.hxx @@ -127,7 +127,7 @@ public: this size. @return - True = decoding was successful (no error occured). + True = decoding was successful (no error occurred). */ bool decode( sal_uInt8* pnDestData, @@ -147,7 +147,7 @@ public: Number of bytes to be skipped (cipher "seeks" forward). @return - True = skip was successful (no error occured). + True = skip was successful (no error occurred). */ bool skip( sal_Int32 nBytes ); @@ -254,7 +254,7 @@ public: this size. @return - True = decoding was successful (no error occured). + True = decoding was successful (no error occurred). */ bool decode( sal_uInt8* pnDestData, @@ -274,7 +274,7 @@ public: Number of bytes to be skipped (cipher "seeks" forward). @return - True = skip was successful (no error occured). + True = skip was successful (no error occurred). */ bool skip( sal_Int32 nBytes ); diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx index d305f3189492..54a2a0c4f8be 100644 --- a/oox/inc/oox/helper/propertyset.hxx +++ b/oox/inc/oox/helper/propertyset.hxx @@ -98,7 +98,7 @@ public: ::com::sun::star::uno::Any getAnyProperty( sal_Int32 nPropId ) const; /** Gets the specified boolean property from the property set. - @return true = property contains true; false = property contains false or error occured. */ + @return true = property contains true; false = property contains false or error occurred. */ bool getBoolProperty( sal_Int32 nPropId ) const; /** Gets the specified properties from the property set. Tries to use the XMultiPropertySet interface. diff --git a/oox/source/export/preset-definitions-to-shape-types.pl b/oox/source/export/preset-definitions-to-shape-types.pl index a2cda8483dd6..c185a07cdce3 100644 --- a/oox/source/export/preset-definitions-to-shape-types.pl +++ b/oox/source/export/preset-definitions-to-shape-types.pl @@ -288,7 +288,7 @@ $path_h = 1; 201 => 'hostControl', # should not be used 202 => 'textBox' ); -# An error occured, we have to ignore this shape +# An error occurred, we have to ignore this shape sub error( $ ) { my ( $msg ) = @_; diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index aed3be113d52..69a039dada31 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -89,7 +89,7 @@ inline void lclAppendToBuffer( OStringBuffer& rBuffer, const sal_Char* pcBeg, co void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd ) { /* Map attribute names to char-pointer of all attributes. This map is used - to find multiple occurences of attributes with the same name. The + to find multiple occurrences of attributes with the same name. The mapped pointers are used as map key in the next map below. */ typedef ::std::map< OString, const sal_Char* > AttributeNameMap; AttributeNameMap aAttributeNames; @@ -140,7 +140,7 @@ void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal } } - // if no error has occured, build the resulting attribute list + // if no error has occurred, build the resulting attribute list if( bOk ) for( AttributeDataMap::iterator aIt = aAttributes.begin(), aEnd = aAttributes.end(); aIt != aEnd; ++aIt ) rBuffer.append( ' ' ).append( aIt->second ); diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx index 6a0ac295fbc1..847c99b4e69e 100644 --- a/writerfilter/inc/resourcemodel/TableManager.hxx +++ b/writerfilter/inc/resourcemodel/TableManager.hxx @@ -542,7 +542,7 @@ public: virtual void props(PropertiesPointer pProps); /** - Handle occurance of character 0x7. + Handle occurrence of character 0x7. */ virtual void handle0x7(); diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 4b6873ea49c2..bc770e12e26c 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -724,7 +724,7 @@ void SectionPropertyMap::CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Imp catch ( const uno::Exception& e ) { #if DEBUG - clog << "An exception occured in SectionPropertyMap::CopyLastHeaderFooter( ) - "; + clog << "An exception occurred in SectionPropertyMap::CopyLastHeaderFooter( ) - "; clog << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ) << endl; #endif } diff --git a/writerperfect/source/filter/DocumentCollector.cxx b/writerperfect/source/filter/DocumentCollector.cxx index 22605664cc65..39aa1dc9f991 100644 --- a/writerperfect/source/filter/DocumentCollector.cxx +++ b/writerperfect/source/filter/DocumentCollector.cxx @@ -460,7 +460,7 @@ void DocumentCollector::openHeader(const WPXPropertyList &propList) { std::vector<DocumentElement *> * pHeaderFooterContentElements = new std::vector<DocumentElement *>; - if (propList["libwpd:occurence"]->getStr() == "even") + if (propList["libwpd:occurrence"]->getStr() == "even") mpCurrentPageSpan->setHeaderLeftContent(pHeaderFooterContentElements); else mpCurrentPageSpan->setHeaderContent(pHeaderFooterContentElements); @@ -477,7 +477,7 @@ void DocumentCollector::openFooter(const WPXPropertyList &propList) { std::vector<DocumentElement *> * pHeaderFooterContentElements = new std::vector<DocumentElement *>; - if (propList["libwpd:occurence"]->getStr() == "even") + if (propList["libwpd:occurrence"]->getStr() == "even") mpCurrentPageSpan->setFooterLeftContent(pHeaderFooterContentElements); else mpCurrentPageSpan->setFooterContent(pHeaderFooterContentElements); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java index e118cc690ea0..fefd0bdf7261 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java @@ -231,7 +231,7 @@ public final class DocumentDeserializerImpl throw sOE; } catch(Exception e){ - System.out.println("An error occured in the transformation : "+e); + System.out.println("An error occurred in the transformation : "+e); } return baos; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java index 5bf8d4983da1..4fb0a0e68813 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java @@ -287,7 +287,7 @@ public final class DocumentSerializerImpl */ } catch(Exception e){ - System.out.println("An error occured in the transformation : "+e); + System.out.println("An error occurred in the transformation : "+e); } return baos; } |