diff options
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/config/cache/basecontainer.cxx | 4 | ||||
-rw-r--r-- | filter/source/config/cache/basecontainer.hxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/cacheitem.hxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 14 | ||||
-rw-r--r-- | filter/source/config/cache/filtercache.hxx | 12 | ||||
-rw-r--r-- | filter/source/config/cache/querytokenizer.hxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/typedetection.cxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/typedetection.hxx | 4 | ||||
-rw-r--r-- | filter/source/config/tools/merge/FCFGMerge.cfg | 4 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
-rw-r--r-- | filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 2 |
11 files changed, 26 insertions, 26 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index f32bc8a94022..fc93f4f39b2a 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -469,7 +469,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea catch(const css::uno::Exception&) { // invalid cache, internal failure, wrong conversion ...!? - // doesnt matter + // doesn't matter lKeys.clear(); } @@ -520,7 +520,7 @@ void SAL_CALL BaseContainer::flush() catch(const css::uno::Exception& ex) { // Dont remove the clone. May be the outside - // user whish to repair it now and calls flush() + // user wish to repair it now and calls flush() // later again ... throw css::lang::WrappedTargetRuntimeException( "Flush rejected by internal container.", diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index f52a63da4f68..2a6510d72734 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -178,7 +178,7 @@ class BaseContainer : public BaseLock of the global instance m_rCache, and will be used to change the configuration. - @descr If no exception occures, its guaranteed, that the member m_rFlushCache + @descr If no exception occurs, its guaranteed, that the member m_rFlushCache was initialized right and can be used further. */ void impl_initFlushMode() diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 8285644df326..1dcfcbc154ee 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -157,7 +157,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap @descr Normaly the converter routines of the base class SequenceAsHashMap do this job already. - But it doesnt provide a "pack" mechanism to + But it doesn't provide a "pack" mechanism to ignore properties with empty (means "void") values. @return css::uno::Sequence< css::beans::PropertyValue > diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index d69897db7a15..0c6bd3789077 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -412,7 +412,7 @@ CacheItem FilterCache::getItem( EItemType eType, if ( !bIsHelpFilter && !impl_isModuleInstalled(sDocService) ) { OUString sMsg("The requested filter '" + sItem + - "' exists ... but it shouldnt; because the corresponding LibreOffice module was not installed."); + "' exists ... but it should not; because the corresponding LibreOffice module was not installed."); throw css::container::NoSuchElementException(sMsg, css::uno::Reference< css::uno::XInterface >()); } } @@ -1053,7 +1053,7 @@ void FilterCache::impl_validateAndOptimize() impl_resolveItem4TypeRegistration(&m_lDetectServices, sDetectService, sType); // get its registration for file Extensions AND(!) URLPattern ... - // It doesnt matter if these items exists or if our + // It doesn't matter if these items exists or if our // used index access create some default ones ... // only in case there is no filled set of Extensions AND // no filled set of URLPattern -> we must try to remove this invalid item @@ -1083,7 +1083,7 @@ void FilterCache::impl_validateAndOptimize() #endif // create an optimized registration for this type to - // its set list of extensions/url pattern. If its a "normal" type + // its set list of extensions/url pattern. If it's a "normal" type // set it at the end of this optimized list. But if its // a "Preferred" one - set it to the front of this list. // Of course multiple "Preferred" registrations can occur @@ -1128,7 +1128,7 @@ void FilterCache::impl_validateAndOptimize() // Dont check cross references between types and filters, if // not all filters read from disk! // OK - this cache can read single filters on demand too ... - // but then the fill state of this cache shouldnt be set to E_CONTAINS_FILTERS! + // but then the fill state of this cache should not be set to E_CONTAINS_FILTERS! if (!bAllFiltersShouldExist) continue; @@ -1341,7 +1341,7 @@ void FilterCache::impl_resolveItem4TypeRegistration( CacheItemList* pList throw(css::uno::Exception) { CacheItem& rItem = (*pList)[sItem]; - // In case its a new created entry (automaticly done by the boost::unordered_map index operator!) + // In case it's a new created entry (automaticly done by the boost::unordered_map index operator!) // we must be shure, that this entry has its own name as property available. // Its needed later at our container interface! rItem[PROPNAME_NAME] <<= sItem; @@ -1450,7 +1450,7 @@ void FilterCache::impl_load(EFillState eRequiredState) } } - // update fill state. Note: its a bit field, which combines different parts. + // update fill state. Note: it's a bit field, which combines different parts. m_eFillState = (EFillState) ((sal_Int32)m_eFillState | (sal_Int32)eRequiredState); // any data readed? @@ -2237,7 +2237,7 @@ void FilterCache::impl_readOldFormat() throw(css::uno::Exception) { // Attention: Opening/Reading of this old configuration format has to be handled gracefully. - // Its optional and shouldnt disturb our normal work! + // Its optional and should not disturb our normal work! // E.g. we must check, if the package exists ... css::uno::Reference< css::container::XNameAccess > xCfg; diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 595927ea693d..92defa6d4433 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -322,16 +322,16 @@ class FilterCache : public BaseLock /** @short force special fill state of this cache. - @descr This method check if all requested items/properties already - exists. Only missing information will be readed. + @descr This method checks, if all requested items/properties already + exist. Only missing information will be readed. Otherwise this method does nothing! This method must be called from every user of this cache - every time it need a filled cache. Normaly we load + every time it needs a filled cache. Normally we load only standard information into this cache on startup. After a few seconds we start a special thread, which - may fill this cache completely. But if somehwere outside - need a filled cache before ... it can run into trouble, + may fill this cache completely. But if someone outside + needs a filled cache before ... it can run into trouble, if this "load-on-demand" thread does not finished its work before. This method "load(xxx)" synchronize such load-on-demand requests. @@ -872,7 +872,7 @@ class FilterCache : public BaseLock @descr The outside code has to be shure, that the item does not already exists inside this cachse. Otherwise it will be loaded twice. This method - doesnt check such constellations! + doesn't check such constellations! @param eType specify the type of config item, which must be interpreted. diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index 3b9ab22c4622..b1ef32642e35 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -58,7 +58,7 @@ class QueryTokenizer : public ::boost::unordered_map< OUString /** @short Because the given query can contain errors, it should be checked outside. - TODO May its a good idea to describe the real problem + TODO May it's a good idea to describe the real problem more detailed ... */ sal_Bool m_bValid; diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index fd0e64c959ba..efb4051474fb 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -711,7 +711,7 @@ bool TypeDetection::impl_getPreselectionForType( } } - // if its a valid type - set it on all return values! + // if it's a valid type - set it on all return values! if (!sType.isEmpty()) { FlatDetection::iterator it = std::find_if(rFlatTypes.begin(), rFlatTypes.end(), FindByType(sType)); diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 3ce6042c30be..f885e60eff85 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -93,7 +93,7 @@ private: detection service), a "sugested" type name will be returned as "rLastChance". It can be used after e.g. all well known deep detection services was used without getting any result. Then this "last-chance-type" - should be returned. Of course using of it can fail too ... but its a try :-) + should be returned. Of course using of it can fail too ... but it's a try :-) As an optimization - this method collects the names of all used deep detection services. This information can be useful inside the may be @@ -137,7 +137,7 @@ private: /** @short seek a might existing stream to position 0. @descr This is an optinal action to be more robust - in case any detect service doesnt make this seek ... + in case any detect service doesn't make this seek ... Normaly it's part of any called detect service or filter ... but sometimes it's not done there. diff --git a/filter/source/config/tools/merge/FCFGMerge.cfg b/filter/source/config/tools/merge/FCFGMerge.cfg index 4516a777bc57..834c7ac57bd6 100644 --- a/filter/source/config/tools/merge/FCFGMerge.cfg +++ b/filter/source/config/tools/merge/FCFGMerge.cfg @@ -29,7 +29,7 @@ loglevel = 2 #************************************************ -# This extension is used for all XML files. It doesnt +# This extension is used for all XML files. It doesn't # matter if its used for reading fragments or writing # XML packages. # Must be given without any additional signes like "." @@ -41,7 +41,7 @@ loglevel = 2 extension_xcu=xcu #************************************************ -# This extension is used for all Package files. It doesnt +# This extension is used for all Package files. It doesn't # matter if its used for reading such files or writing # it. # Must be given without any additional signes like "." diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c869d1e2684f..34638f96215f 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4959,8 +4959,8 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, if (!bTextFrame) { //Either - //a) its a simple text object or - //b) its a rectangle with text and square wrapping. + //a) it's a simple text object or + //b) it's a rectangle with text and square wrapping. bTextFrame = ( (pImpRec->eShapeType == mso_sptTextSimple) || diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index c36ff763ad17..8869952740db 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -7401,7 +7401,7 @@ <xsl:with-param name="current-pos" select="$current-pos + 1 + $font-size-length"/> </xsl:call-template> </xsl:when> - <!-- dont' consider tangled or adjoined '&X' and '&Y', '&U' & '&E', processing-check is necessary, too complex. :( --> + <!-- don't consider tangled or adjoined '&X' and '&Y', '&U' & '&E', processing-check is necessary, too complex. :( --> <xsl:when test="starts-with($current-style-data,'&X')"> <xsl:variable name="superscript-count-before"> <xsl:call-template name="get-substyle-count-in-data"> |