summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/basic/sberrors.hxx2
-rw-r--r--include/comphelper/configurationhelper.hxx2
-rw-r--r--include/comphelper/numberedcollection.hxx2
-rw-r--r--include/comphelper/sequenceashashmap.hxx2
-rw-r--r--include/comphelper/sequenceasvector.hxx2
-rw-r--r--include/salhelper/linkhelper.hxx2
-rw-r--r--include/svtools/acceleratorexecute.hxx2
-rw-r--r--include/ucbhelper/interceptedinteraction.hxx4
-rw-r--r--include/ucbhelper/resultset.hxx2
-rw-r--r--include/unotools/fontoptions.hxx2
-rw-r--r--include/unotools/localisationoptions.hxx4
-rw-r--r--include/unotools/securityoptions.hxx20
-rw-r--r--include/unotools/viewoptions.hxx2
13 files changed, 24 insertions, 24 deletions
diff --git a/include/basic/sberrors.hxx b/include/basic/sberrors.hxx
index f287f3afca88..d407d858c479 100644
--- a/include/basic/sberrors.hxx
+++ b/include/basic/sberrors.hxx
@@ -189,7 +189,7 @@ typedef sal_uIntPtr SbError;
#define ERRCODE_BASIC_GETPROP_FAILED ((LAST_SBX_ERROR_ID+62UL) | ERRCODE_AREA_SBX | \
ERRCODE_CLASS_RUNTIME) // Unable to get property
-// Compiler Errors (do not occure at runtime)
+// Compiler Errors (do not occur at runtime)
// These IDs can shift at any time
#define ERRCODE_BASIC_UNEXPECTED ((LAST_SBX_ERROR_ID+63UL) | ERRCODE_AREA_SBX | \
diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx
index f9e3ac54a0fd..b6377c16e37d 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -174,7 +174,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 occurs!
*
* @throw Any exceptions the underlying configuration can throw.
* E.g. css::uno::Exception if the provided configuration
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 6a311767658d..38f0eaa633a1 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -143,7 +143,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
@note Those method cant 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/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index c649326f2fbc..935f614070ff 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -101,7 +101,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
@throw An com::sun::star::beans::IllegalTypeException
is thrown, if the given any does not contain a suitable sequence ...
- but not if its a VOID Any!
+ but not if it's a VOID Any!
*/
void operator<<(const ::com::sun::star::uno::Any& aSource);
diff --git a/include/comphelper/sequenceasvector.hxx b/include/comphelper/sequenceasvector.hxx
index c186debc8e71..6e3ad171df43 100644
--- a/include/comphelper/sequenceasvector.hxx
+++ b/include/comphelper/sequenceasvector.hxx
@@ -226,7 +226,7 @@ class SequenceAsVector : public ::std::vector< TElementType >
return value as [in/]out parameter for
direct function calls!
Of course it can be casted to non const
- ... but then its a problem of the outside
+ ... but then it's a problem of the outside
code :-)
@return A (const!) sequence, which contains all items of
diff --git a/include/salhelper/linkhelper.hxx b/include/salhelper/linkhelper.hxx
index ef185c078908..67fde02843bf 100644
--- a/include/salhelper/linkhelper.hxx
+++ b/include/salhelper/linkhelper.hxx
@@ -28,7 +28,7 @@ namespace salhelper
{
}
- /** Resolve a file url if its a symbolic link, to a maximum depth of
+ /** Resolve a file url if it's a symbolic link, to a maximum depth of
* nDepth and fill in m_aStatus with the requested ctor flags
*
* @return osl::FileBase::E_None on success
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index 2a1e359239e9..ea01da2c280c 100644
--- a/include/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
@@ -62,7 +62,7 @@ struct TMutexInit
Because exceution of an accelerator command can be dangerous
(in case it force an office shutdown for key "ALT+F4"!)
all internal dispatches are done asynchronous.
- Menas that the trigger call doesnt wait till the dispatch
+ Menas that the trigger call doesn't wait till the dispatch
is finished. You can call very often. All requests will be
queued internal and dispatched ASAP.
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index 1a5a6bb0ce01..28a2c38f3813 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -134,7 +134,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
};
//---------------------------------------
- /** @short represent the different states, which can occure
+ /** @short represent the different states, which can occur
as result of an interception.
@see impl_interceptRequest()
@@ -315,7 +315,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
searched and selected.
The method return the state of that operation.
- But it doesnt call the intercepted and here set
+ But it doesn't call the intercepted and here set
interaction handler. That has to be done in the outside method.
@param xRequest
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 531955124f2b..36f51108c131 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -554,7 +554,7 @@ public:
* Note: An exception thrown to indicate an error must always be thrown
* by the thread that created the data supplier. If the supplier collects
* data asynchronously ( i.e. in a separate thread ) and an error
- * occures, throwing of the appropriate exception must be deferred
+ * occurs, throwing of the appropriate exception must be deferred
* until validate() is called by the ResultSet implementation from
* inside the main thread.
* In case data are obtained synchronously, the ResultSetException can
diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx
index d37423138e00..1f192624ed61 100644
--- a/include/unotools/fontoptions.hxx
+++ b/include/unotools/fontoptions.hxx
@@ -85,7 +85,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Op
@param -
@return -
- @onerror No error should occurre!
+ @onerror No error should occur!
*//*-*****************************************************************************************************/
sal_Bool IsFontHistoryEnabled ( ) const ;
diff --git a/include/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx
index 931d59f1980d..96b2e97a9341 100644
--- a/include/unotools/localisationoptions.hxx
+++ b/include/unotools/localisationoptions.hxx
@@ -74,7 +74,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::de
@param "bState", new value to set it in configuration.
@return The value which represent current state of internal variable.
- @onerror No error should occurre!
+ @onerror No error should occur!
*//*-*****************************************************************************************************/
sal_Bool IsAutoMnemonic ( ) const ;
@@ -94,7 +94,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::de
@param "nScale" new value to set it in configuration.
@return The value which represent current state of internal variable.
- @onerror No error should occurre!
+ @onerror No error should occur!
*//*-*****************************************************************************************************/
sal_Int32 GetDialogScale( ) const ;
diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx
index 2156cb5ec3e5..9b8f3807ba50 100644
--- a/include/unotools/securityoptions.hxx
+++ b/include/unotools/securityoptions.hxx
@@ -66,10 +66,10 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail
enum EOption
{
E_SECUREURLS,
- E_BASICMODE, // xmlsec05 depricated
- E_EXECUTEPLUGINS, // xmlsec05 depricated
- E_WARNING, // xmlsec05 depricated
- E_CONFIRMATION, // xmlsec05 depricated
+ E_BASICMODE, // xmlsec05 deprecated
+ E_EXECUTEPLUGINS, // xmlsec05 deprecated
+ E_WARNING, // xmlsec05 deprecated
+ E_CONFIRMATION, // xmlsec05 deprecated
E_DOCWARN_SAVEORSEND,
E_DOCWARN_SIGNING,
E_DOCWARN_PRINT,
@@ -129,7 +129,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail
@param "eOption", specify, which item is queried
@return <TRUE/> if item is readonly; <FALSE/> otherwise
- @onerror No error should occurre!
+ @onerror No error should occur!
*//*-*****************************************************************************************************/
sal_Bool IsReadOnly( EOption eOption ) const ;
@@ -149,7 +149,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail
@param "seqURLList", new values to set it in configuration.
@return The values which represent current state of internal variable.
- @onerror No error should occurre!
+ @onerror No error should occur!
*//*-*****************************************************************************************************/
::com::sun::star::uno::Sequence< OUString > GetSecureURLs( ) const ;
@@ -173,7 +173,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail
@param "eMode" to set new mode ... Value must defined as an enum of type EBasicSecurityMode!
@return An enum value, which present current mode.
- @onerror No error should occurre!
+ @onerror No error should occur!
*//*-*****************************************************************************************************/
sal_Int32 GetMacroSecurityLevel ( ) const ;
@@ -188,10 +188,10 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail
@seealso -
@param "sURL" reference to URL for checking
- @param "sReferer" reference to referer which whish to run script by given URL
+ @param "sReferer" reference to referer which wish to run script by given URL
@return sal_True if URL is secure or security is obsolete(!) or sal_False otherwise.
- @onerror No error should occurre!
+ @onerror No error should occur!
*//*-*****************************************************************************************************/
sal_Bool IsSecureURL( const OUString& sURL ,
@@ -205,7 +205,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail
bool SetOption ( EOption eOption, bool bValue ) ;
bool IsOptionEnabled ( EOption eOption ) const ;
- // xmlsec05 depricated methods
+ // xmlsec05 deprecated methods
sal_Bool IsExecutePlugins() const;
void SetExecutePlugins( sal_Bool bSet );
EBasicSecurityMode GetBasicMode( ) const ;
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index 8c8986dd4b99..bcbca0909cb5 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -162,7 +162,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op
@seealso -
- @onerror No error should occure.
+ @onerror No error should occur.
*//*-*****************************************************************************************************/
sal_Bool Exists() const;