summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/dispatch/closedispatcher.hxx2
-rw-r--r--framework/inc/helper/persistentwindowstate.hxx4
-rw-r--r--framework/inc/jobs/jobconst.hxx2
-rw-r--r--framework/inc/jobs/jobdata.hxx2
-rw-r--r--framework/inc/jobs/jobdispatch.hxx2
-rw-r--r--framework/inc/services/autorecovery.hxx10
-rw-r--r--framework/inc/services/desktop.hxx4
-rw-r--r--framework/inc/services/logindialog.hxx4
-rw-r--r--framework/inc/services/pathsettings.hxx2
-rw-r--r--framework/inc/threadhelp/itransactionmanager.h4
-rw-r--r--framework/inc/threadhelp/readguard.hxx2
-rw-r--r--framework/inc/threadhelp/resetableguard.hxx4
-rw-r--r--framework/inc/threadhelp/transactionbase.hxx2
-rw-r--r--framework/inc/threadhelp/transactionguard.hxx6
-rw-r--r--framework/inc/threadhelp/writeguard.hxx4
-rw-r--r--framework/inc/xml/acceleratorconfigurationreader.hxx10
16 files changed, 32 insertions, 32 deletions
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index a196cf1e49f2..5e143cc4a4b4 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -53,7 +53,7 @@ namespace framework{
@descr These URLs implements a special functionality to close a document or the whole frame ...
and handle the state, it was the last frame or document. Then we create the
default backing document which can be used to open new ones using the file open dialog
- or some other menu entries. Or we terminate the whole application in case this backing mode shouldnt
+ or some other menu entries. Or we terminate the whole application in case this backing mode should not
be used.
*/
class CloseDispatcher : // baseclasses ... order is necessary for right initialization!
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 90e1169e3cd2..9e4a20741f14 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -143,7 +143,7 @@ class PersistentWindowState : // baseclasses (order necessary for right initia
@param xWindow
must point to the container window of the frame.
- We use it VCL part here - because the toolkit doesnt
+ We use it VCL part here - because the toolkit doesn't
provide the right functionality!
@return [string]
@@ -173,7 +173,7 @@ class PersistentWindowState : // baseclasses (order necessary for right initia
@param xWindow
must point to the container window of the frame.
- We use it VCL part here - because the toolkit doesnt
+ We use it VCL part here - because the toolkit doesn't
provide the right functionality!
@param sWindowState
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index f515f75913e6..ea903f1b8837 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -37,7 +37,7 @@ namespace framework{
@descr The protocol between job executor/dispatch and jobs is fix and well defined.
But why every implemented job should write such constant values directly into
- it's code. Typos can occure or code will be changed by new developers ...
+ it's code. Typos can occur or code will be changed by new developers ...
Shared set of constant values can help to improve the mentainance of this code.
*/
class FWI_DLLPUBLIC JobConst
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 2d7394da0318..21ebda963cde 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -122,7 +122,7 @@ class JobData : private ThreadHelpBase
};
/** Some jobs can be registered to "logical events", which are generated on demand if another document event
- occures. E.g. "onDocumentOpened" in case "OnNew" or "OnLoad" was notified to the JobExecutor instance.
+ occurs. E.g. "onDocumentOpened" in case "OnNew" or "OnLoad" was notified to the JobExecutor instance.
And normaly the original event is transported as parameter set to the executed job. But then such job
cant differ between e.g. "OnNew" and "onDocumentOpened".
That's why we must know, for which type of event the job was realy triggered .-)
diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx
index 90136d0af75d..82b3277123c3 100644
--- a/framework/inc/jobs/jobdispatch.hxx
+++ b/framework/inc/jobs/jobdispatch.hxx
@@ -55,7 +55,7 @@ namespace framework{
/**
@short implements a dispatch object for jobs
@descr Such dispatch object will be used by the generic dispatch mechanism if
- an URL "vnd.sun.star.job:alias=<name>" occures.
+ an URL "vnd.sun.star.job:alias=<name>" occurs.
Then an instance of this class will be created and used.
This new instance will be called within his method
dispatch() or dispatchWithNotification() for executing the
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index ddd4ee293b6e..77a99cb586a3 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -113,7 +113,7 @@ struct DispatchParams
/**
implements the functionality of AutoSave and AutoRecovery
of documents - including features of an EmergencySave in
- case a GPF occures.
+ case a GPF occurs.
*/
typedef ::cppu::WeakImplHelper5<
css::lang::XServiceInfo,
@@ -185,7 +185,7 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri
// TODO document me
enum ETimerType
{
- /** the timer shouldnt be used next time */
+ /** the timer should not be used next time */
E_DONT_START_TIMER,
/** timer (was/must be) started with normal AutoSaveTimeIntervall */
E_NORMAL_AUTOSAVE_INTERVALL,
@@ -641,7 +641,7 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri
@descr This method should be called only, if its clear that a new
document was opened/created during office runtime.
- This method checks, if its a top level document (means not an embedded one).
+ This method checks, if it's a top level document (means not an embedded one).
Only such top level documents can be recognized by this auto save mechanism.
@param xDocument
@@ -769,7 +769,7 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri
only if removing oft he old file was successfully.
If this method returns without an exception - everything
was OK. Otherwise the info struct can be analyzed to
- get more information, e.g. when the problem occures.
+ get more information, e.g. when the problem occurs.
@param sBackupPath
the base path for saving such temp files.
@@ -1017,7 +1017,7 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri
/** try to remove the specified file from disc.
Every URL supported by our UCB component can be used here.
- Further it doesnt matter if the file realy exists or not.
+ Further it doesn't matter if the file realy exists or not.
Because removing a non exsistent file will have the same
result at the end ... a non existing file .-)
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index f42b064ed45f..e26b61d61309 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -390,9 +390,9 @@ class Desktop : // base classes
*
* Iterates over all child frames and try to close them.
* Given parameter bAllowUI enable/disable showing any UI
- * (which mostly occure on calling XController->suspend()).
+ * (which mostly occur on calling XController->suspend()).
*
- * These method doesnt stop if one frame could not be closed.
+ * This method doesn't stop if one frame could not be closed.
* It will ignore such frames and try all other ones.
* But it returns false in such case - true otherwise.
*
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index c2afef58ad7b..c3b52dda640b 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -392,8 +392,8 @@ class LoginDialog : public css::lang::XTypeProvider ,
/*-****************************************************************************************************//**
@short write changed values to configuration
- @descr Normaly the dialog returns with an OK or ERROR value. If OK occure - we flush data
- auomaticly. But otherwise we do nothing. If user of this service wish to use property set
+ @descr Normaly the dialog returns with an OK or ERROR value. If OK occurs - we flush data
+ automaticly. But otherwise we do nothing. If user of this service wishes to use property set
only without any UI(!) - he must call "flush()" explicitly to write data!
@seealso -
diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index 827ce95d774d..2f5b65155470 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -40,7 +40,7 @@
#include <unotools/configitem.hxx>
#include <comphelper/sequenceasvector.hxx>
-/* enable it if you whish to migrate old user settings (using the old cfg schema) on demand ....
+/* enable it if you wish to migrate old user settings (using the old cfg schema) on demand ....
disable it in case only the new schema must be used.
*/
diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h
index 31638245093c..9f6740f104c2 100644
--- a/framework/inc/threadhelp/itransactionmanager.h
+++ b/framework/inc/threadhelp/itransactionmanager.h
@@ -28,9 +28,9 @@ namespace framework{
/*-************************************************************************************************************//**
@descr Describe different states of a feature of following implementation.
- During live time of an object different working states occure:
+ During lifetime of an object different working states occur:
initialization - working - closing - closed
- If you whish to implement thread safe classes you should use these feature to protect
+ If you wish to implement thread safe classes you should use this feature to protect
your code against calls at wrong time. e.g. you are not full initialized but somewhere
call an interface method (initialize phase means startup time from creating object till
calling specified first method e.g. XInitialization::initialze()!) then you should refuse
diff --git a/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx
index ea59f8006a9f..eaa1d5ac33b2 100644
--- a/framework/inc/threadhelp/readguard.hxx
+++ b/framework/inc/threadhelp/readguard.hxx
@@ -143,7 +143,7 @@ class ReadGuard : private INonCopyable
/*-****************************************************************************************************//**
@short disable using of these functions!
- @descr It's not allowed to use this methods. Different problem can occure otherwise.
+ @descr It's not allowed to use this methods. Different problem can occur otherwise.
Thats why we disable it by make it private.
@seealso other ctor
diff --git a/framework/inc/threadhelp/resetableguard.hxx b/framework/inc/threadhelp/resetableguard.hxx
index 9d29350b928e..e6787a723037 100644
--- a/framework/inc/threadhelp/resetableguard.hxx
+++ b/framework/inc/threadhelp/resetableguard.hxx
@@ -54,7 +54,7 @@ class ResetableGuard : private INonCopyable
/*-****************************************************************************************************//**
@short ctors
@descr Use these ctor methods to initialize the guard right.
- Given lock reference must be valid - otherwise crashes could occure!
+ Given lock reference must be valid - otherwise crashes could occur!
@seealso -
@@ -139,7 +139,7 @@ class ResetableGuard : private INonCopyable
/*-****************************************************************************************************//**
@short disable using of these functions!
- @descr It's not allowed to use this methods. Different problem can occure otherwise.
+ @descr It's not allowed to use this methods. Different problem can occur otherwise.
Thats why we disable it by make it private.
@seealso other ctor
diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx
index 741c27d61854..7a71f5bbbed8 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -26,7 +26,7 @@ namespace framework{
/*-************************************************************************************************************//**
@short make it possible to instanciate a transacion manager as first member!
- @descr If you use a transaction manager as a member of your class and whish to use it earlier then other ones
+ @descr If you use a transaction manager as a member of your class and wish to use it earlier then other ones
you should have a look on this implementation. You must use it as the first base class
of your implementation - because base classes are initialized by his order and before your
member! Thats why ist a good place to declare this member.
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 887d63865e38..8716488efe36 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -27,7 +27,7 @@ namespace framework{
/*-************************************************************************************************************//**
@short implement a guard to support non breakable transactions
- @descr If you whish to support non breakable method calls without lockingf any mutex, rw-lock or
+ @descr If you wish to support non breakable method calls without lockingf any mutex, rw-lock or
something like that - you should use this guard implementation.
Initialize it at first in your method and don't release it till end of your function!
Your "transaction" is registered in ctor and automaticly released in dtor.
@@ -52,7 +52,7 @@ class TransactionGuard : private INonCopyable
/*-****************************************************************************************************//**
@short ctors
@descr Use these ctor methods to initialize the guard right.
- Given reference must be valid - otherwise crashes could occure!
+ Given reference must be valid - otherwise crashes could occur!
@attention It's not neccessary to lock any mutex here! Because a ctor should not be called
from different threads at the same time ... this class use no refcount mechanism!
@@ -130,7 +130,7 @@ class TransactionGuard : private INonCopyable
/*-****************************************************************************************************//**
@short disable using of these functions!
- @descr It's not allowed to use this methods. Different problem can occure otherwise.
+ @descr It's not allowed to use this methods. Different problem can occur otherwise.
Thats why we disable it by make it private.
@seealso other ctor
diff --git a/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx
index 0f1ba4f4d981..8e653cbcd660 100644
--- a/framework/inc/threadhelp/writeguard.hxx
+++ b/framework/inc/threadhelp/writeguard.hxx
@@ -188,7 +188,7 @@ class WriteGuard : private INonCopyable
@param -
@return Current set lock mode.
- @onerror No error should occure.
+ @onerror No error should occur.
*//*-*****************************************************************************************************/
inline ELockMode getMode() const
{
@@ -202,7 +202,7 @@ class WriteGuard : private INonCopyable
/*-****************************************************************************************************//**
@short disable using of these functions!
- @descr It's not allowed to use this methods. Different problem can occure otherwise.
+ @descr It's not allowed to use this methods. Different problem can occur otherwise.
Thats why we disable it by make it private.
@seealso other ctor
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index 6c342ae3ea1c..e3c915f8edc8 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -88,20 +88,20 @@ class AcceleratorConfigurationReader : private ThreadHelpBase
//---------------------------------------
/** @short used to detect if an accelerator list
- occures recursive inside xml. */
+ occurs recursive inside xml. */
sal_Bool m_bInsideAcceleratorList;
//---------------------------------------
/** @short used to detect if an accelerator item
- occures recursive inside xml. */
+ occurs recursive inside xml. */
sal_Bool m_bInsideAcceleratorItem;
//---------------------------------------
/** @short is used to map key codes to its
string representation.
- @descr To perform this operatio is
- created only one times and holded
+ @descr To perform this operation is
+ created only one time and kept
alive forever ...*/
::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
@@ -109,7 +109,7 @@ class AcceleratorConfigurationReader : private ThreadHelpBase
/** @short provide information about the parsing state.
@descr We use it to find out the line and column, where
- an error occure.
+ an error occurred.
*/
css::uno::Reference< css::xml::sax::XLocator > m_xLocator;