diff options
author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /comphelper | |
parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) |
Resync to trunk, windows non-pro build
aoo/aw080
Diffstat (limited to 'comphelper')
32 files changed, 88 insertions, 88 deletions
diff --git a/comphelper/inc/comphelper/IdPropArrayHelper.hxx b/comphelper/inc/comphelper/IdPropArrayHelper.hxx index c81a1e7d8d2a..63d640e8d261 100644 --- a/comphelper/inc/comphelper/IdPropArrayHelper.hxx +++ b/comphelper/inc/comphelper/IdPropArrayHelper.hxx @@ -66,7 +66,7 @@ namespace comphelper } /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the - class, which is created if neccessary. + class, which is created if necessary. */ ::cppu::IPropertyArrayHelper* getArrayHelper(sal_Int32 nId); diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/comphelper/inc/comphelper/accessiblecontexthelper.hxx index e1c8f3b622b7..e2eefb89bc5b 100644 --- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx +++ b/comphelper/inc/comphelper/accessiblecontexthelper.hxx @@ -118,7 +118,7 @@ namespace comphelper the context does. A good approach to implement the lock may be to derive you own context not only from OAccessibleContextHelper, but also from IMutex.</p> - <p>One more note. This lock is definately not used once the dtor is reached. Means whatever + <p>One more note. This lock is definitely not used once the dtor is reached. Means whatever the dtor implementation does, it does <em>not</em> guard the external lock. See this as a contract. <br/>You should ensure the same thing for own derivees which do not supply the lock themself, but get them from yet another derivee.</p> diff --git a/comphelper/inc/comphelper/accimplaccess.hxx b/comphelper/inc/comphelper/accimplaccess.hxx index eb8ce5826771..218d22214710 100644 --- a/comphelper/inc/comphelper/accimplaccess.hxx +++ b/comphelper/inc/comphelper/accimplaccess.hxx @@ -105,7 +105,7 @@ namespace comphelper @param _rxComponent is the component which should be examined. @return - the pointer to the implementation, if successfull. The only known error condition so far + the pointer to the implementation, if successful. The only known error condition so far is an invalid context (which means it is <NULL/>, or the implementation is not derived from <type>OAccessibleImplementationAccess</type>, or retrieving the implementation failed). */ diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/comphelper/inc/comphelper/componentcontext.hxx index 74485ba93b51..cada747372f0 100644 --- a/comphelper/inc/comphelper/componentcontext.hxx +++ b/comphelper/inc/comphelper/componentcontext.hxx @@ -137,7 +137,7 @@ namespace comphelper @throws ::com::sun::star::lang::ServiceNotRegisteredException if the given service is not registered @throws Exception - if an exception occured during creating the component + if an exception occurred during creating the component @return the newly created component. Is never <NULL/>. */ @@ -148,7 +148,7 @@ namespace comphelper @throws ::com::sun::star::lang::ServiceNotRegisteredException if the given service is not registered @throws Exception - if an exception occured during creating the component + if an exception occurred during creating the component @return the newly created component. Is never <NULL/>. */ @@ -162,7 +162,7 @@ namespace comphelper @throws ::com::sun::star::lang::ServiceNotRegisteredException if the given service is not registered @throws Exception - if an exception occured during creating the component + if an exception occurred during creating the component @return the newly created component. Is never <NULL/>. */ @@ -176,7 +176,7 @@ namespace comphelper @throws ::com::sun::star::lang::ServiceNotRegisteredException if the given service is not registered @throws Exception - if an exception occured during creating the component + if an exception occurred during creating the component @return the newly created component. Is never <NULL/>. */ diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx index 0531e2103c5a..63c2bf9f7ca5 100644 --- a/comphelper/inc/comphelper/configurationhelper.hxx +++ b/comphelper/inc/comphelper/configurationhelper.hxx @@ -41,7 +41,7 @@ // namespaces // no panic .. this define will be reseted at the end of this file. -// BUT doing so it's neccessary to add all includes BEFORE this css-value +// BUT doing so it's necessary to add all includes BEFORE this css-value // will be defined :_) #ifdef css #error "Who use css? I need it as namespace alias." @@ -98,7 +98,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * * @param eMode * specify the open mode for the returned configuration access. - * It's interpreted as a flag field and can be any usefull combination + * It's interpreted as a flag field and can be any useful combination * of values of EConfigurationModes. * * @throw Any exceptions the underlying configuration can throw. @@ -191,7 +191,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * or which should be created with default values. * * @return A reference to the found (or new created) set node. - * Cant be NULL .. in such case an exception occure ! + * Can't be NULL .. in such case an exception occurred ! * * @throw Any exceptions the underlying configuration can throw. * E.g. css::uno::Exception if the provided configuration @@ -208,7 +208,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * The cached configuration access must be provided here. * * @param xCFG - * the configuration root, where changes should be commited. + * the configuration root, where changes should be committed. * * @throw Any exceptions the underlying configuration can throw. * E.g. css::uno::Exception if the provided configuration @@ -223,7 +223,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * Because it opens the specified configuration package, reads the key and * closes the configuration again. * - * So its not very usefull to use this method for reading multiple keys at the same time. + * So its not very useful to use this method for reading multiple keys at the same time. * (Excepting these keys exists inside different configuration packages ...)) */ static css::uno::Any readDirectKey(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR , @@ -239,7 +239,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * Because it opens the specified configuration package, writes the key, flush * all changes and closes the configuration again. * - * So its not very usefull to use this method for writing multiple keys at the same time. + * So its not very useful to use this method for writing multiple keys at the same time. * (Excepting these keys exists inside different configuration packages ...)) */ static void writeDirectKey(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR , diff --git a/comphelper/inc/comphelper/containermultiplexer.hxx b/comphelper/inc/comphelper/containermultiplexer.hxx index 131a27b8c0e1..4ca28c329cdc 100644 --- a/comphelper/inc/comphelper/containermultiplexer.hxx +++ b/comphelper/inc/comphelper/containermultiplexer.hxx @@ -39,7 +39,7 @@ namespace comphelper //= OContainerListener //===================================================================== /** a non-UNO container listener - <p>Usefull if you have a non-refcountable class which should act as container listener.<br/> + <p>Useful if you have a non-refcountable class which should act as container listener.<br/> In this case, derive this class from OContainerListener, and create an adapter <type>OContainerListenerAdapter</type> which multiplexes the changes.</p> */ diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx index 989329298ca2..d434ee694625 100644 --- a/comphelper/inc/comphelper/docpasswordhelper.hxx +++ b/comphelper/inc/comphelper/docpasswordhelper.hxx @@ -58,7 +58,7 @@ class COMPHELPER_DLLPUBLIC IDocPasswordVerifier public: virtual ~IDocPasswordVerifier(); - /** Will be called everytime a password needs to be verified. + /** Will be called every time a password needs to be verified. @param rPassword The password to be verified @@ -74,12 +74,12 @@ public: - DocPasswordVerifierResult_WRONG_PASSWORD, if the password is wrong. The user may be asked again for a new password. - DocPasswordVerifierResult_ABORT, if an unrecoverable error - occured while password verification. The password request loop + occurred while password verification. The password request loop will be aborted. */ virtual DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0; - /** Will be called everytime an encryption data needs to be verified. + /** Will be called every time an encryption data needs to be verified. @param rEncryptionData The data will be validated @@ -90,7 +90,7 @@ public: - DocPasswordVerifierResult_WRONG_PASSWORD, if the encryption data is wrong. - DocPasswordVerifierResult_ABORT, if an unrecoverable error - occured while data verification. The password request loop + occurred while data verification. The password request loop will be aborted. */ virtual DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0; diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx index 320f494b8d26..060fd7355f29 100644 --- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx +++ b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx @@ -101,7 +101,7 @@ public: CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, ::rtl::OUString& ); - // insert an embedded object into the container - objects persistant representation will be added to the storage + // insert an embedded object into the container - objects persistent representation will be added to the storage sal_Bool InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& ); // load an embedded object from a MediaDescriptor and insert it into the container @@ -175,7 +175,7 @@ sal_Bool RemoveEmbeddedObject( const ::com::sun::star::uno::Reference * * \param _xStorage The storeage where to store the objects. * \param _bClearModifedFlag If <TRUE/> then the modifed flag will be set to <FALSE/> otherwise nothing happen. - * \return <FALSE/> if no error occured, otherwise <TRUE/>. + * \return <FALSE/> if no error occurred, otherwise <TRUE/>. */ sal_Bool SetPersistentEntries(const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& _xStorage,bool _bClearModifedFlag = true); }; diff --git a/comphelper/inc/comphelper/implementationreference.hxx b/comphelper/inc/comphelper/implementationreference.hxx index 3719dc693c0f..b0fb49d07a80 100644 --- a/comphelper/inc/comphelper/implementationreference.hxx +++ b/comphelper/inc/comphelper/implementationreference.hxx @@ -56,7 +56,7 @@ namespace comphelper As this template is geared towards fast, internal pointer access, validity of the UNO reference is _not_ checked for every pointer access. The client of this template is - responsible to check that, whereever necessary, via the is() + responsible to check that, wherever necessary, via the is() method. @tpl CppType diff --git a/comphelper/inc/comphelper/interaction.hxx b/comphelper/inc/comphelper/interaction.hxx index 54592ca515bb..53a8489a80b2 100644 --- a/comphelper/inc/comphelper/interaction.hxx +++ b/comphelper/inc/comphelper/interaction.hxx @@ -47,7 +47,7 @@ namespace comphelper */ class OInteractionSelect { - sal_Bool m_bSelected : 1; /// indicates if the select event occured + sal_Bool m_bSelected : 1; /// indicates if the select event occurred protected: OInteractionSelect() : m_bSelected(sal_False) { } diff --git a/comphelper/inc/comphelper/locale.hxx b/comphelper/inc/comphelper/locale.hxx index e227720f6d00..4ea878ecf073 100644 --- a/comphelper/inc/comphelper/locale.hxx +++ b/comphelper/inc/comphelper/locale.hxx @@ -53,13 +53,13 @@ class COMPHELPER_DLLPUBLIC Locale public: - /** @short seperates LANGUAGE and COUNTRY part of an ISO formated Locale. */ + /** @short separates LANGUAGE and COUNTRY part of an ISO formated Locale. */ static const sal_Unicode SEPERATOR_LC; - /** @short seperates COUNTRY and VARIANT part of an ISO formated Locale. */ + /** @short separates COUNTRY and VARIANT part of an ISO formated Locale. */ static const sal_Unicode SEPERATOR_CV; - /** @short seperates COUNTRY and VARIANT part of an ISO formated Locale. + /** @short separates COUNTRY and VARIANT part of an ISO formated Locale. @descr Its true for some linux derivates only :-( */ static const sal_Unicode SEPERATOR_CV_LINUX; @@ -105,7 +105,7 @@ class COMPHELPER_DLLPUBLIC Locale public: - /** @short will be throw during convertion, if a Locale cant be interpreted. */ + /** @short will be throw during conversion, if a Locale can't be interpreted. */ struct MalFormedLocaleException { public: @@ -343,8 +343,8 @@ class COMPHELPER_DLLPUBLIC Locale If no "same" nor any "similar" locale could be found, we try "x-default" and "x-notranslate" explicitly. - Sometimes localized variables are optimized and doesnt use - localzation realy. E.g. in case the localized value is a fix + Sometimes localized variables are optimized and doesn't use + localzation really. E.g. in case the localized value is a fix product name. If no locale match till now, we use any other existing @@ -429,7 +429,7 @@ class COMPHELPER_DLLPUBLIC Locale @return [boolean] TRUE if at least one part of such Locale - isnt the same. + isn't the same. */ sal_Bool operator!=(const Locale& aComparable) const; }; diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx index 250153208b6a..8797252aa688 100644 --- a/comphelper/inc/comphelper/mediadescriptor.hxx +++ b/comphelper/inc/comphelper/mediadescriptor.hxx @@ -51,7 +51,7 @@ namespace comphelper{ Further this helper defines often used functions (as e.g. open of the required streams, consistent checks etcpp.) and it defines all useable property names. - @attention This class isnt threadsafe and must be guarded from outside! + @attention This class isn't threadsafe and must be guarded from outside! */ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap { @@ -144,7 +144,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap to open the stream (as e.g. URL, ReadOnly, PostData etcpp.). It creates a seekable stream and put it into the descriptor. - A might existing InteractionHandler will be used automaticly, + A might existing InteractionHandler will be used automatically, to solve problems! In case of local file the system file locking is used. @@ -162,7 +162,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap to open the stream (as e.g. URL, ReadOnly, PostData etcpp.). It creates a seekable stream and put it into the descriptor. - A might existing InteractionHandler will be used automaticly, + A might existing InteractionHandler will be used automatically, to solve problems! In case of local file the system file locking is used based on @@ -176,7 +176,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap //--------------------------------------- /** @short it checks if the descriptor describes a readonly stream. - @descr The descriptor itself isnt changed doing so. + @descr The descriptor itself isn't changed doing so. It's only checked if the stream seems to be based of a real readonly file. @@ -318,7 +318,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap to open the stream (as e.g. URL, ReadOnly, PostData etcpp.). It creates a seekable stream and put it into the descriptor. - A might existing InteractionHandler will be used automaticly, + A might existing InteractionHandler will be used automatically, to solve problems! @param bLockFile diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx index 47780e49b4dc..5576c1912f2b 100644 --- a/comphelper/inc/comphelper/numberedcollection.hxx +++ b/comphelper/inc/comphelper/numberedcollection.hxx @@ -58,7 +58,7 @@ namespace comphelper{ /** @short defines a collection of UNO components, where every component will get it's own unique number. @descr Such number will be unique at runtime only ... but it supports fragmentation. - Note: This collection uses weak refrences only to know her components. + Note: This collection uses weak references only to know her components. So lifetime of thise components must be controlled outside. @threadsafe @@ -154,14 +154,14 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex //--------------------------------------- /** @short trys to find an unique number not already used within this collection. - @descr It reuses the smalles number which isnt used by any component + @descr It reuses the smalles number which isn't used by any component of this collection. (fragmentation!) If collection is full (means there is no free number) the special value INVALID_NUMBER will be returned. - @note Those method cant be called within a multithreaded environment .. + @note Those method can't be called within a multithreaded environment .. Because such number wont be "reserved" for the calli of these method it can happen that two calls returns the same number (reasoned by the fact that first calli - doesnt used the returned number already. + doesn't used the returned number already. So the outside code has to make sure that retrieving and using of those number will be an atomic operation. diff --git a/comphelper/inc/comphelper/propagg.hxx b/comphelper/inc/comphelper/propagg.hxx index 4057a87a11f2..b3197f2cbeb4 100644 --- a/comphelper/inc/comphelper/propagg.hxx +++ b/comphelper/inc/comphelper/propagg.hxx @@ -72,9 +72,9 @@ namespace internal class IPropertyInfoService { public: - /** get the prefered handle for the given property + /** get the preferred handle for the given property @param _rName the property name - @return the handle the property should be refered by, or -1 if there are no + @return the handle the property should be referred by, or -1 if there are no preferences for the given property */ virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName) = 0; @@ -108,11 +108,11 @@ public: aggregate properties get depend from the following two parameters. @param _pInfoService If not NULL, the object pointed to is used to calc handles which should be used - for refering the aggregate's properties from outside. + for referring the aggregate's properties from outside. If one of the properties returned from the info service conflict with other handles alread present (e.g. through _rProperties), the property is handled as if -1 was returned. If NULL (or, for a special property, a call to getPreferedPropertyId returns -1), - the aggregate property(ies) get a new handle which they can be refered by from outside. + the aggregate property(ies) get a new handle which they can be referred by from outside. @param _nFirstAggregateId if the object is about to create new handles for the aggregate properties, it uses id's ascending from this given id. @@ -143,8 +143,8 @@ public: virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropNames ); /** returns information about a property of the aggregate. - @param _pPropName points to a string to recieve the property name. No name is returned if this is NULL. - @param _pOriginalHandle points to a sal_Int32 to recieve the original property hande. No original handle is returned + @param _pPropName points to a string to receive the property name. No name is returned if this is NULL. + @param _pOriginalHandle points to a sal_Int32 to receive the original property hande. No original handle is returned if this is NULL. @param _nHandle the handle of the property as got by, for instance, fillHandles diff --git a/comphelper/inc/comphelper/proparrhlp.hxx b/comphelper/inc/comphelper/proparrhlp.hxx index 420b2ac44cce..651d2a067b5e 100644 --- a/comphelper/inc/comphelper/proparrhlp.hxx +++ b/comphelper/inc/comphelper/proparrhlp.hxx @@ -73,7 +73,7 @@ public: } /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the - class, which is created if neccessary. + class, which is created if necessary. */ ::cppu::IPropertyArrayHelper* getArrayHelper(); diff --git a/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx index 041570e67b52..e0eeaf005754 100644 --- a/comphelper/inc/comphelper/property.hxx +++ b/comphelper/inc/comphelper/property.hxx @@ -138,7 +138,7 @@ COMPHELPER_DLLPUBLIC void copyProperties(const staruno::Reference<starbeans::XPr //================================================================== /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue - @param _rConvertedValue the conversion result (if successfull) + @param _rConvertedValue the conversion result (if successful) @param _rOldValue the old value of the property, calculated from _rCurrentValue @param _rValueToSet the new value which is about to be set @param _rCurrentValue the current value of the property @@ -162,7 +162,7 @@ sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& / } /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue for enum values - @param _rConvertedValue the conversion result (if successfull) + @param _rConvertedValue the conversion result (if successful) @param _rOldValue the old value of the property, calculated from _rCurrentValue @param _rValueToSet the new value which is about to be set @param _rCurrentValue the current value of the property @@ -192,7 +192,7 @@ sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::An } /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue for boolean properties - @param _rConvertedValue the conversion result (if successfull) + @param _rConvertedValue the conversion result (if successful) @param _rOldValue the old value of the property, calculated from _rCurrentValue @param _rValueToSet the new value which is about to be set @param _rCurrentValue the current value of the property @@ -215,7 +215,7 @@ inline sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno: } /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue - @param _rConvertedValue the conversion result (if successfull) + @param _rConvertedValue the conversion result (if successful) @param _rOldValue the old value of the property, calculated from _rCurrentValue @param _rValueToSet the new value which is about to be set @param _rCurrentValue the current value of the property diff --git a/comphelper/inc/comphelper/seqstream.hxx b/comphelper/inc/comphelper/seqstream.hxx index 411da4360b43..3f0fe1bf27d6 100644 --- a/comphelper/inc/comphelper/seqstream.hxx +++ b/comphelper/inc/comphelper/seqstream.hxx @@ -103,12 +103,12 @@ protected: public: /** constructs the object. Everything written into the stream through the XOutputStream methods will be forwarded - to the sequence, reallocating it if neccessary. Writing will start at offset 0 within the sequence. + to the sequence, reallocating it if necessary. Writing will start at offset 0 within the sequence. @param _rSeq a reference to the sequence which will be used for output. The caller is responsible for taking care of the lifetime of the stream object and the sequence. If you're in doubt about this, use <code>closeOutput</code> before destroying the sequence - @param _nResizeFactor the factor which is used for resizing the sequence when neccessary. In every + @param _nResizeFactor the factor which is used for resizing the sequence when necessary. In every resize step, the new sequence size will be calculated by multiplying the current size with this factor, rounded off to the next multiple of 4. @param _nMinimumResize the minmal number of bytes which is additionally allocated on resizing diff --git a/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx index 14552484d694..096c7129e0d6 100644 --- a/comphelper/inc/comphelper/sequence.hxx +++ b/comphelper/inc/comphelper/sequence.hxx @@ -43,7 +43,7 @@ namespace comphelper //------------------------------------------------------------------------- /** search the given string within the given sequence, return the positions where it was found. - if _bOnlyFirst is sal_True, only the first occurence will be returned. + if _bOnlyFirst is sal_True, only the first occurrence will be returned. */ COMPHELPER_DLLPUBLIC staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString >& _rList, const ::rtl::OUString& _rValue, sal_Bool _bOnlyFirst = sal_False); diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx index 1b54292185d5..92e2b8dd7d6f 100644 --- a/comphelper/inc/comphelper/sequenceashashmap.hxx +++ b/comphelper/inc/comphelper/sequenceashashmap.hxx @@ -109,7 +109,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lSource); //--------------------------------------- - /** @short not realy used but maybe usefull :-) + /** @short not really used but maybe useful :-) */ ~SequenceAsHashMap(); @@ -254,7 +254,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase specified default value otherwhise. @descr If a value should be extracted only in case - the requsted property exists realy (without creating + the requsted property exists really (without creating of new items as it the index operator of a has_map does!) this method can be used. @@ -292,7 +292,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase does not already exist. @descr To check if the property already exists only - her name is used for compare. Its value isnt + her name is used for compare. Its value isn't checked! @param sKey @@ -356,18 +356,18 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase the current content of this instance. @descr Because the content of STL container - cant be analyzed easy, such dump function - seem to be usefull. + can't be analyzed easy, such dump function + seems to be useful. Of course its available in debug versions only. @param pFileName a system file name. - (doesnt matter if relativ or absolute) + (doesn't matter if relativ or absolute) @param pComment used to mark the dump inside the same log file. - Can be usefull to analyze changes of this + Can be useful to analyze changes of this hash map due to the parts of an operation. */ #if OSL_DEBUG_LEVEL > 1 diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx index f72ded99332d..eb93228b3367 100644 --- a/comphelper/inc/comphelper/sequenceasvector.hxx +++ b/comphelper/inc/comphelper/sequenceasvector.hxx @@ -48,7 +48,7 @@ namespace comphelper{ @descr That provides the possibility to modify sequences very easy ... - Of course this can be usefull only, if + Of course this can be useful only, if count of modifications is high, so copying of the sequence make sense! */ diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx index a760507843be..34d4dabea5e0 100644 --- a/comphelper/inc/comphelper/string.hxx +++ b/comphelper/inc/comphelper/string.hxx @@ -70,14 +70,14 @@ COMPHELPER_DLLPUBLIC rtl::OUString searchAndReplaceAsciiL( rtl::OUString const & to, sal_Int32 beginAt = 0, sal_Int32 * replacedAt = NULL); -/** replaces, in the given source string, all occurences of a given ASCII pattern +/** replaces, in the given source string, all occurrences of a given ASCII pattern with another ASCII pattern */ COMPHELPER_DLLPUBLIC ::rtl::OUString searchAndReplaceAllAsciiWithAscii( const ::rtl::OUString& source, const sal_Char* from, const sal_Char* to, const sal_Int32 beginAt = 0 ); -/** does an in-place replacement of the first occurance of a sub string with +/** does an in-place replacement of the first occurrence of a sub string with another string @param source diff --git a/comphelper/inc/comphelper/types.hxx b/comphelper/inc/comphelper/types.hxx index 3e0483d0a2b9..9bbbcefda095 100644 --- a/comphelper/inc/comphelper/types.hxx +++ b/comphelper/inc/comphelper/types.hxx @@ -99,7 +99,7 @@ namespace comphelper /** check if a type you have at hand at runtime is equal to another type you have at compile time */ template <class TYPE> - sal_Bool isAReference(const staruno::Any& _rVal, TYPE* pDummy) + sal_Bool isAReference(const staruno::Any& _rVal, TYPE*) { return _rVal.getValueType().equals( cppu::getTypeFavourUnsigned( diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 4a02119d4bbe..91a9a86a0763 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -445,7 +445,7 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re uno::Reference < container::XNameAccess > xAccess( pImpl->mxStorage, uno::UNO_QUERY ); uno::Reference < embed::XEmbedPersist > xEmb( xObj, uno::UNO_QUERY ); uno::Reference < embed::XLinkageSupport > xLink( xEmb, uno::UNO_QUERY ); - // if the object has a persistance and the object is not a link than it must have persistence entry in the storage + // if the object has a persistence and the object is not a link than it must have persistence entry in the storage OSL_ENSURE( !( xEmb.is() && ( !xLink.is() || !xLink->isLink() ) ) || xAccess->hasByName(rName), "Added element not in storage!" ); #endif @@ -751,7 +751,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb if ( rName.isEmpty() ) rName = CreateUniqueObjectName(); - // objects without persistance are not really stored by the method + // objects without persistence are not really stored by the method if ( xObj.is() && StoreEmbeddedObject( xObj, rName, sal_True ) ) { xResult = Get_Impl( rName, xObj); @@ -798,7 +798,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb // this must be an object based on properties, otherwise we can not copy it currently uno::Reference< beans::XPropertySet > xOrigProps( xObj->getComponent(), uno::UNO_QUERY_THROW ); - // use object class ID to create a new one and tranfer all the properties + // use object class ID to create a new one and transfer all the properties uno::Reference < embed::XEmbedObjectCreator > xCreator( ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.EmbeddedObjectCreator") ) ), @@ -863,7 +863,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb } } - OSL_ENSURE( xResult.is(), "Can not copy embedded object that has no persistance!\n" ); + OSL_ENSURE( xResult.is(), "Can not copy embedded object that has no persistence!\n" ); if ( xResult.is() ) { @@ -1033,7 +1033,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e uno::Reference < embed::XLinkageSupport > xLink( xPersist, uno::UNO_QUERY ); sal_Bool bIsNotEmbedded = !xPersist.is() || xLink.is() && xLink->isLink(); - // if the object has a persistance and the object is not a link than it must have persistence entry in the storage + // if the object has a persistence and the object is not a link than it must have persistence entry in the storage OSL_ENSURE( bIsNotEmbedded || xAccess->hasByName(aName), "Removing element not present in storage!" ); #endif @@ -1147,7 +1147,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e try { #if OSL_DEBUG_LEVEL > 1 - // if the object has a persistance and the object is not a link than it must have persistence entry in storage + // if the object has a persistence and the object is not a link than it must have persistence entry in storage OSL_ENSURE( bIsNotEmbedded || pImpl->mxStorage->hasByName( aName ), "The object has no persistence entry in the storage!" ); #endif if ( xPersist.is() && pImpl->mxStorage->hasByName( aName ) ) @@ -1551,10 +1551,10 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool } else { - //do nothing.embeded model is not modified, no need to persist. + //do nothing. Embedded model is not modified, no need to persist. } } - else //the embeded object is in active status, always store back it. + else //the embedded object is in active status, always store back it. { xPersist->storeOwn(); } diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 6ac8775ab9bc..45191b0bce3d 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -344,7 +344,7 @@ namespace comphelper } private: - // sicne we share our mutex with the main map, we need to keep it alive as long as we live + // since we share our mutex with the main map, we need to keep it alive as long as we live Reference< XInterface > m_xKeepMapAlive; ::std::auto_ptr< MapData > m_pMapDataCopy; MapEnumerator m_aEnumerator; diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index aa093182bb4a..1bf4f69f439e 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -216,7 +216,7 @@ namespace comphelper { // TODO: this whole method (as well as the class AccessibleEventBuffer) should be removed // The reasons why they have been introduces id that we needed to collect a set of events - // before notifying them alltogether (after releasing our mutex). With the other + // before notifying them altogether (after releasing our mutex). With the other // NotifyAccessibleEvent being asynchronous now, this should not be necessary anymore // - clients could use the other version now. diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx index 795df3ec6f3b..1c2336f21aad 100644 --- a/comphelper/source/misc/asyncnotification.cxx +++ b/comphelper/source/misc/asyncnotification.cxx @@ -249,7 +249,7 @@ namespace comphelper void SAL_CALL AsyncEventNotifier::onTerminated() { AsyncEventNotifier_TBASE::onTerminated(); - // when we were started (->run), we aquired ourself. Release this now + // when we were started (->run), we acquired ourself. Release this now // that we were finally terminated release(); } diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx index c16e14dbe9d9..5ef0b0eaab00 100644 --- a/comphelper/source/misc/locale.cxx +++ b/comphelper/source/misc/locale.cxx @@ -426,7 +426,7 @@ void Locale::setVariant(const ::rtl::OUString& sVariant) /* Attention: Use own interface methods to set the different parts of this locale. Because the check the incoming value and throw an exception - automaticly ... + automatically ... */ void Locale::fromISO(const ::rtl::OUString& sISO) throw(Locale::MalFormedLocaleException) @@ -511,7 +511,7 @@ sal_Bool Locale::similar(const Locale& aComparable) const Locale aReference(sReferenceISO); // Note: The same language or "en"/"en-US" should be preferred as fallback. - // On the other side some localized variables doesnt use localzation in real. + // On the other side some localized variables doesn't use localzation in real. // May be the use a "fix" value only ... marked as X-DEFAULT or X-NOTRANSLATE. // At least it can be discussed, if any language is a valid fallback ... // But in case some office functionality depends on that (that means real functionality instead diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index bb7e52f63667..9b13f7679f14 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -715,7 +715,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s css::uno::Reference< css::ucb::XCommandEnvironment > xCommandEnv(static_cast< css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY); // try to create the content - // no content -> no stream => return immediatly with FALSE + // no content -> no stream => return immediately with FALSE ::ucbhelper::Content aContent; css::uno::Reference< css::ucb::XContent > xContent; try @@ -733,7 +733,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s // try to open the file in read/write mode // (if its allowed to do so). // But handle errors in a "hidden mode". Because - // we try it readonly later - if read/write isnt an option. + // we try it readonly later - if read/write isn't an option. css::uno::Reference< css::io::XStream > xStream ; css::uno::Reference< css::io::XInputStream > xInputStream; @@ -750,7 +750,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s { try { - // TODO: use "special" still interaction to supress error messages + // TODO: use "special" still interaction to suppress error messages xStream = aContent.openWriteableStream(); if (xStream.is()) xInputStream = xStream->getInputStream(); @@ -771,7 +771,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s } } - // If opening of the stream in read/write mode wasnt allowed + // If opening of the stream in read/write mode wasn't allowed // or failed by an error - we must try it in readonly mode. if (!xInputStream.is()) { @@ -846,7 +846,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s they are part of an URL. Do not use the URLTransformer service here. Because - it parses the URL in another way. It's main part isnt enough + it parses the URL in another way. It's main part isn't enough and it's complete part contains the jumpmark (fragment) parameter ... */ static ::rtl::OUString SERVICENAME_URIREFERENCEFACTORY = ::rtl::OUString::createFromAscii("com.sun.star.uri.UriReferenceFactory"); @@ -867,7 +867,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s catch(const css::uno::Exception&) {} - // If an error ocurred ... return the original URL. + // If an error occurred ... return the original URL. // It's a try .-) return sURL; } diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index b6a1e1e371bf..1dc77cf59b15 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -213,7 +213,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe ::sal_Int32 c = (::sal_Int32)m_lComponents.size (); ::sal_Int32 i = 1; - // c cant be less then 0 ... otherwhise hash.size() has an error :-) + // c can't be less than 0 ... otherwise hash.size() has an error :-) // But we need at least n+1 numbers here. c += 1; diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index e02c91da3093..da849f6a2247 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.cxx @@ -58,7 +58,7 @@ namespace comphelper // then the proxy itself if ( xFactory.is() ) { - { // i36686 OJ: achieve the desctruction of the tempoary -> otherwise it leads to _rRefCount -= 2 + { // i36686 OJ: achieve the destruction of the tempoary -> otherwise it leads to _rRefCount -= 2 m_xProxyAggregate = xFactory->createProxy( _rxComponent ); } if ( m_xProxyAggregate.is() ) diff --git a/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx index 023bef0ebf7b..e7a16ea8ed6d 100644 --- a/comphelper/source/misc/scopeguard.cxx +++ b/comphelper/source/misc/scopeguard.cxx @@ -44,11 +44,11 @@ ScopeGuard::~ScopeGuard() OSL_ENSURE( false, rtl::OUStringToOString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "UNO exception occured: ") ) + + "UNO exception occurred: ") ) + exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } catch (...) { - OSL_ENSURE( false, "unknown exception occured!" ); + OSL_ENSURE( false, "unknown exception occurred!" ); } } else diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index 51bcea4fc753..4280b011a38c 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.cxx @@ -130,7 +130,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS (!lP.Value.hasValue()) ) throw css::beans::IllegalTypeException( - ::rtl::OUString::createFromAscii("PropertyValue struct contains no usefull informations."), + ::rtl::OUString::createFromAscii("PropertyValue struct contains no useful informations."), css::uno::Reference< css::uno::XInterface >()); (*this)[lP.Name] = lP.Value; continue; @@ -144,7 +144,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS (!lN.Value.hasValue()) ) throw css::beans::IllegalTypeException( - ::rtl::OUString::createFromAscii("NamedValue struct contains no usefull informations."), + ::rtl::OUString::createFromAscii("NamedValue struct contains no useful informations."), css::uno::Reference< css::uno::XInterface >()); (*this)[lN.Name] = lN.Value; continue; |