diff options
Diffstat (limited to 'framework')
48 files changed, 105 insertions, 105 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; diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java index 015fa3804961..ec80058782fa 100644 --- a/framework/qa/complex/framework/autosave/AutoSave.java +++ b/framework/qa/complex/framework/autosave/AutoSave.java @@ -331,14 +331,14 @@ public class AutoSave } else { - m_aLog.log(Protocol.TYPE_ERROR, "closeDoc() = ERROR. Doc doesnt provide needed interface!"); + m_aLog.log(Protocol.TYPE_ERROR, "closeDoc() = ERROR. Doc doesn't provide needed interface!"); } } catch(com.sun.star.util.CloseVetoException exVeto) { m_aLog.log(Protocol.TYPE_WARNING , "got CloseVetoException on calling doc.close()." ); m_aLog.log(Protocol.TYPE_WARNING_INFO, "Please check the reason for that more in detail." ); - m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Cant close while saving.\" was intended and doesnt show an error!"); + m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Cant close while saving.\" was intended and doesn't show an error!"); m_aLog.log(Protocol.TYPE_WARNING_INFO, exVeto.getMessage()); } diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index c562ea25ae3e..c7d4f3526987 100644 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -178,7 +178,7 @@ public class CheckXComponentLoader // define default loader for testing // TODO think about using of bot loader instances! m_xLoader = UnoRuntime.queryInterface(XComponentLoader.class, m_xDesktop); - assertNotNull("Desktop service doesnt support needed component loader interface.", m_xLoader); + assertNotNull("Desktop service doesn't support needed component loader interface.", m_xLoader); // get temp path for this environment final String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF()); diff --git a/framework/qa/complex/loadAllDocuments/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java index c2a297d5000a..1101ecd15bc4 100644 --- a/framework/qa/complex/loadAllDocuments/InteractionHandler.java +++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java @@ -63,7 +63,7 @@ public class InteractionHandler implements XInteractionHandler } /** - * Called to start the interaction, because the outside code whish to solve + * Called to start the interaction, because the outside code wish to solve * a detected problem or to inform the user about something. * We save the information here and can handle two well known continuations * only. diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index b00d5c31b01b..3c4d6b6e1712 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -398,7 +398,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // a) inside share layer we should not create any new structures ... We jave to use // existing ones only! - // b) inside user layer we can (SOFT mode!) but sometimes we shouldnt (HARD mode!) + // b) inside user layer we can (SOFT mode!) but sometimes we should not (HARD mode!) // create new empty structures. We should preferr using of any existing structure. sal_Int32 eShareMode = (css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE); sal_Int32 eUserMode = (css::embed::ElementModes::READWRITE ); @@ -830,7 +830,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat ) return css::uno::Reference< css::embed::XStorage >(); - // it doesnt matter, if there is a locale fallback or not + // it doesn't matter, if there is a locale fallback or not // If creation of storages is allowed, we do it anyway. // Otherwhise we have no acc config at all, which can make other trouble. OUString sLocalizedPath; diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 56bd698afd5f..efc0722d7274 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -494,7 +494,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal throw exResult; // c) try it readonly - // dont catch exception here! Outside code whish to know, if operation failed or not. + // dont catch exception here! Outside code wish to know, if operation failed or not. // Otherwhise they work on NULL references ... sal_Int32 eNewMode = (eOpenMode & ~css::embed::ElementModes::WRITE); css::uno::Reference< css::embed::XStorage > xSubStorage = xBaseStorage->openStorageElement(sSubStorage, eNewMode); @@ -534,7 +534,7 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback throw exResult; // c) try it readonly - // dont catch exception here! Outside code whish to know, if operation failed or not. + // dont catch exception here! Outside code wish to know, if operation failed or not. // Otherwhise they work on NULL references ... sal_Int32 eNewMode = (eOpenMode & ~css::embed::ElementModes::WRITE); css::uno::Reference< css::io::XStream > xSubStream = xBaseStorage->openStreamElement(sSubStream, eNewMode); diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 01d34bd52a79..8b515189414a 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -205,7 +205,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& // Do it asynchronous everytimes! // But dont forget to hold usself alive. - // We are called back from an environment, which doesnt know an uno reference. + // We are called back from an environment, which doesn't know an uno reference. // They call us back by using our c++ interface. m_xResultListener = xListener; @@ -299,7 +299,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) bCloseFrame = sal_True; // b) The help window cant disagree with any request. - // Because it doesnt implement a controller - it uses a window only. + // Because it doesn't implement a controller - it uses a window only. // Further t cant be the last open frame - if we do all other things // right inside this CloseDispatcher implementation. // => close it! @@ -308,7 +308,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) // c) If we are already in "backing mode", we have to terminate // the application, if this special frame is closed. - // It doesnt matter, how many other frames (can be the help or hidden frames only) + // It doesn't matter, how many other frames (can be the help or hidden frames only) // are open then. // => terminate the application! else if (aCheck1.m_bReferenceIsBacking) @@ -481,7 +481,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc // dont remove the component realy by e.g. calling setComponent(null, null). // It's enough to suspend the controller. - // If we close the frame later this controller doesnt show the same dialog again. + // If we close the frame later this controller doesn't show the same dialog again. return sal_True; } diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index fc16cbac3cee..d1f385b9f926 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -58,7 +58,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport for (i1=0; i1<c1; ++i1) { - // ignore controller, which doesnt implement the right interface + // ignore controller, which doesn't implement the right interface css::uno::Reference< css::frame::XDispatchInformationProvider > xProvider = lProvider[i1]; if (!xProvider.is()) continue; @@ -92,7 +92,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati { try { - // ignore controller, which doesnt implement the right interface + // ignore controller, which doesn't implement the right interface css::uno::Reference< css::frame::XDispatchInformationProvider > xProvider = lProvider[i1]; if (!xProvider.is()) continue; diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 4fddddafc043..3b2627cfb761 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -290,7 +290,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame { css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); if (xParent.is()) - xDispatcher = xParent->queryDispatch(aURL, sTargetName, 0); // its a special target - ignore search flags + xDispatcher = xParent->queryDispatch(aURL, sTargetName, 0); // it's a special target - ignore search flags } //----------------------------------------------------------------------------------------------------- diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 3094316a7c57..4fd8ffb5c23e 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -159,12 +159,12 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& So call can search for another detect service and ask him too. @attention a) We don't need any mutex here ... because we don't use any member! - b) Dont' use internal player instance "m_pPlayer" to detect given sound file! + b) Don't use internal player instance "m_pPlayer" to detect given sound file! It's not neccessary to do that ... and we can use temp. variable to do the same. This way is easy - we don't must synchronize it with currently played sounds! Another reason to do so ... We are a listener on our internal ma_Player object. If you would call "IsSoundFile()" on this instance, he would call us back and - we make some uneccssary things ... + we make some unnecessary things ... @seealso - diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 240d913a5ac4..342e923cc6f0 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -229,7 +229,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con if (sServiceName.isEmpty()) return css::uno::Reference< css::uno::XInterface >(); - // If a service doesnt support an optional job executor interface - he can't get + // If a service doesn't support an optional job executor interface - he can't get // any given parameters! // Because we can't know if we must call createInstanceWithArguments() or XJobExecutor::trigger() ... diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index 5ee04ebf3174..b9c7965059d5 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -258,7 +258,7 @@ void FrameListAnalyzer::impl_analyze() { // stop copying if index seams to be wrong. // This interface can't realy guarantee its count for multithreaded - // environments. So it can occure! + // environments. So it can occur! } // Pack both lists by using the actual step positions. diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 0f588a0421fc..f1e782dd8560 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -20,7 +20,7 @@ /*TODO - change "singleton" behaviour by using new helper ::comhelper::SingletonRef - rename method exist() to existHandlerForURL() or similar one - - may its a good idea to replace struct ProtocolHandler by css::beans::NamedValue type?! + - may it's a good idea to replace struct ProtocolHandler by css::beans::NamedValue type?! */ #include <classes/protocolhandlercache.hxx> diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index 3eb4f8bc7305..0a05c66b0011 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -254,7 +254,7 @@ void LockHelper::downgradeWriteAccess() @param - @return A reference to a static mutex/lock member. - @onerror No error should occure. + @onerror No error should occur. *//*-*************************************************************************************************************/ LockHelper& LockHelper::getGlobalLock() { @@ -292,7 +292,7 @@ LockHelper& LockHelper::getGlobalLock() @param - @return A reference to a shared mutex. - @onerror No error should occure. + @onerror No error should occur. *//*-*************************************************************************************************************/ ::osl::Mutex& LockHelper::getShareableOslMutex() { diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index 3e5c98983de2..d34e79fc492c 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -67,7 +67,7 @@ TransactionManager::~TransactionManager() You can step during this ones only from the left to the right side and start at left side again! (This is neccessary e.g. for refcounted objects!) This call will block till all current existing transactions was finished. - Follow results occure: + Following results can occur: E_INIT : All requests on this implementation are refused. It's your decision to react in a right way. @@ -157,7 +157,7 @@ void TransactionManager::setWorkingMode( EWorkingMode eMode ) @param - @return Current set mode. - @onerror No error should occure. + @onerror No error should occur. *//*-*****************************************************************************************************/ EWorkingMode TransactionManager::getWorkingMode() const { diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 739a7d9b56e3..4555dceefe82 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -380,7 +380,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() // BUT ..! // We need a Hack for our applications: They get her progress from the frame directly // on saving documents. Because there is no progress set on the MediaDescriptor. - // But that's wrong. In case the document was opened hidden, they shouldnt use any progress .-( + // But that's wrong. In case the document was opened hidden, they should not use any progress .-( // They only possible workaround: dont show the parent window here, if the document was opened hidden. sal_Bool bHiddenDoc = sal_False; if (xFrame.is()) diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 6f3e055ee6e3..24eb8633ab80 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -271,7 +271,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, configuration service. @param bWriteAccessRequested - if the outside code whish to change the container + if the outside code wish to change the container it must call this method with "sal_True". So the internal cache can be prepared for that (means copy-on-write ...). diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 7c1fb179f2b9..9fa81d21142b 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -406,7 +406,7 @@ private: so it contains the right type, a corresponding filter, may a valid frame loader etc. In case detection failed, this descriptor is corrected first, before a suitable exception will be thrown. - (Excepting a RuntimeException occure!) + (Excepting a RuntimeException occurrence!) @attention Not all types we know, are supported by filters. So it does not indicates an error, if no suitable filter(loader etcpp will be found @@ -443,7 +443,7 @@ private: supressed here. In case handle failed all new created resources will be removed before a suitable exception is thrown. - (Excepting a RuntimeException occure!) + (Excepting a RuntimeException occurrence!) @return TODO @@ -462,7 +462,7 @@ private: used to load the content into this frame. In case loading failed all new created resources will be removed before a suitable exception is thrown. - (Excepting a RuntimeException occure!) + (Excepting a RuntimeException occurrence!) @return TODO diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index ac99882cc565..02c48e438a4d 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -92,10 +92,10 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso catch(const css::lang::DisposedException&) {} // disposed is closed is ... catch(const css::uno::RuntimeException&) - { throw; } // shouldnt be suppressed! + { throw; } // should not be suppressed! catch(const css::uno::Exception&) { return sal_False; } // ??? We defined to return a boolen value instead of throwing exceptions ... - // (OK: RuntimeExceptions shouldnt be catched inside the core ..) + // (OK: RuntimeExceptions should not be catched inside the core ..) return sal_True; } diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 53c7603e0b60..18ea4ff53d7f 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -288,7 +288,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD from outside. We release our internal structures and stop avary activity. After doing so - this instance will not be useable any longer! Of course we try to handle further requests - carefully. May somehwere else hold a reference to us ... + carefully. Maybe someone else holds a reference to us ... */ void Job::die() { @@ -497,11 +497,11 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult ) //________________________________ /** @short starts listening for office shutdown and closing of our - given target frame (if its a valid reference) + given target frame (if it's a valid reference) @descr We will reghister ourself as terminate listener at the global desktop instance. That will hold us alive and additional we get the information, if the - office whish to shutdown. If then an internal job + office wish to shutdown. If then an internal job is running we will have the chance to supress that by throwing a veto exception. If our internal wrapped job finished his work, we can release this listener @@ -733,7 +733,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro @short inform us about office termination @descr Instead of the method queryTermination(), here is no chance to disagree with that. We have to accept it and cancel all current processes inside. - It can occure only, if job was not already started if queryTermination() was called here .. + It can occur only, if job was not already started if queryTermination() was called here .. Then we had not throwed a veto exception. But now we must agree with this situation and break all our internal processes. Its not a good idea to mark this instance as non startable any longer inside queryTermination() if no job was unning too. Because that would disable this job and may diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 051fd7a5d093..6c5c905e3b85 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -697,7 +697,7 @@ css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno:: //________________________________ /** @short reset all internal structures - @descr If somehwere recycle this instance, he can switch from one + @descr If someone recycles this instance, he can switch from one using mode to another one. But then we have to reset all currently used information. Otherwhise we mix it and they can make trouble. diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index 6267b6479b1e..b8f50508dbf0 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -181,7 +181,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobD ones we do it later inside our callback method. But we use the same impl method doing that to share the code. (see impl_finishJob()) - If a job is already running, (it can only occure for asynchronous jobs) + If a job is already running, (it can only occur for asynchronous jobs) don't start the same job a second time. Queue in the given dispatch parameter and return immediately. If the current running job call us back, we will start this new dispatch request. diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 8e769183cd63..d0b955cec3c5 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -198,7 +198,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent catch( const css::uno::Exception& ) {} - // Special feature: If the events "OnNew" or "OnLoad" occures - we generate our own event "onDocumentOpened". + // Special feature: If the events "OnNew" or "OnLoad" occurs - we generate our own event "onDocumentOpened". if ( (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_NEW))) || (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_LOAD))) @@ -208,7 +208,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent JobData::appendEnabledJobsForEvent(m_xContext, EVENT_ON_DOCUMENT_OPENED, lJobs); } - // Special feature: If the events "OnCreate" or "OnLoadFinished" occures - we generate our own event "onDocumentAdded". + // Special feature: If the events "OnCreate" or "OnLoadFinished" occurs - we generate our own event "onDocumentAdded". if ( (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_CREATE))) || (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_LOAD_FINISHED))) diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 5636f517e4ee..5c45ca9ab4fa 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -76,7 +76,7 @@ JobResult::JobResult() <li> "Deactivate" [boolean] <br> - The job whish to be disabled. But note: There is no way, to enable it later + The job wish to be disabled. But note: There is no way, to enable it later again by using this implementation. It can be done by using the configuration only. (Means to register this job again.) If a job knows, that there exist some status or result listener, it must use diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 4faaa15ed385..1ad507d0464c 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -286,7 +286,7 @@ sal_Bool implts_isFrameOrWindowTop( const uno::Reference< frame::XFrame >& xFram if (xFrame->isTop()) return sal_True; - uno::Reference< awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), uno::UNO_QUERY); // dont use _THROW here ... its a check only + uno::Reference< awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), uno::UNO_QUERY); // dont use _THROW here ... it's a check only if (xWindowCheck.is()) { // #i76867# top and system window is required. diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 0346412b15fc..d3b67e9818e9 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1509,12 +1509,12 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() if (!xTask.is()) return css::uno::Reference< css::frame::XFrame >(); - // not a real error - may its a view only + // not a real error - may it's a view only css::uno::Reference< css::frame::XController > xController = xTask->getController(); if (!xController.is()) return css::uno::Reference< css::frame::XFrame >(); - // not a real error - may its a db component instead of a full featured office document + // not a real error - may it's a db component instead of a full featured office document css::uno::Reference< css::frame::XModel > xModel = xController->getModel(); if (!xModel.is()) return css::uno::Reference< css::frame::XFrame >(); diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index b03c7e9a1a8e..3e40ef9edb63 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -208,7 +208,7 @@ static const sal_Int32 GIVE_UP_RETRY = 1; // in #define MIN_TIME_FOR_USER_IDLE 10000 // 10s user idle -// enable the following defines in case you whish to simulate a full disc for debug purposes .-) +// enable the following defines in case you wish to simulate a full disc for debug purposes .-) // this define throws everytime a document is stored or a configuration change // should be flushed an exception ... so the special error handler for this scenario is triggered @@ -911,7 +911,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf // <- SAFE ---------------------------------- OUString sCFG_PACKAGE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM(CFG_PACKAGE_RECOVERY)); - // throws a RuntimeException if an error occure! + // throws a RuntimeException if an error occurs! css::uno::Reference< css::container::XNameAccess > xCFG( ::comphelper::ConfigurationHelper::openConfig(xContext, sCFG_PACKAGE_RECOVERY, ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY); @@ -1681,7 +1681,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame AutoRecovery::TDocumentInfo aNew; aNew.Document = xDocument; - // TODO replace getLocation() with getURL() ... its a workaround currently only! + // TODO replace getLocation() with getURL() ... it's a workaround currently only! css::uno::Reference< css::frame::XStorable > xDoc(aNew.Document, css::uno::UNO_QUERY_THROW); aNew.OrgURL = xDoc->getLocation(); @@ -1698,7 +1698,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame implts_specifyAppModuleAndFactory(aNew); // Hack! Check for "illegal office documents" ... as e.g. the Basic IDE - // Its not realy a full featured office document. It doesnt provide an URL, any filter, a factory URL etcpp. + // Its not realy a full featured office document. It doesn't provide an URL, any filter, a factory URL etcpp. // TODO file bug to Basci IDE developers. They must remove the office document API from its service. if ( (aNew.OrgURL.isEmpty()) && @@ -1894,7 +1894,7 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr AutoRecovery::TDocumentInfo& rInfo = *pIt; rInfo.DocumentState = AutoRecovery::E_UNKNOWN; - // TODO replace getLocation() with getURL() ... its a workaround currently only! + // TODO replace getLocation() with getURL() ... it's a workaround currently only! css::uno::Reference< css::frame::XStorable > xDoc(rInfo.Document, css::uno::UNO_QUERY); rInfo.OrgURL = xDoc->getLocation(); @@ -2201,7 +2201,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl // On the other side it's not necessary for documents, which are not modified. // They can be handled normaly - means we patch the corresponding configuration entry only. // iii) For a SessionSave ... ignore it! There is no time to wait for this save operation. - // Because the WindowManager will kill the process if it doesnt react immediately. + // Because the WindowManager will kill the process if it doesn't react immediately. // On the other side we cant risk a concurrent save request ... because we know // that it will produce a crash. @@ -2292,7 +2292,7 @@ void AutoRecovery::implts_saveOneDoc(const OUString& AutoRecovery::TDocumentInfo& rInfo , const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress) { - // no document? => can occure if we loaded our configuration with files, + // no document? => can occur if we loaded our configuration with files, // which couldnt be recovered successfully. In such case we have all needed information // excepting the real document instance! @@ -2330,7 +2330,7 @@ void AutoRecovery::implts_saveOneDoc(const OUString& Reference< XDocumentRecovery > xDocRecover(rInfo.Document, css::uno::UNO_QUERY_THROW); // safe the state about "trying to save" - // ... we need it for recovery if e.g. a crash occures inside next line! + // ... we need it for recovery if e.g. a crash occurs inside next line! rInfo.DocumentState |= AutoRecovery::E_TRY_SAVE; implts_flushConfigItem(rInfo); @@ -2597,7 +2597,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa /* Normaly we listen as XModifyListener on a document to know if a document was changed since our last AutoSave. And we deregister us in case we know this state. But directly after one document as recovered ... we must start listening. - Otherwhise the first "modify" doesnt reach us. Because we ourself called setModified() + Otherwhise the first "modify" doesn't reach us. Because we ourself called setModified() on the document via API. And currently we dont listen for any events (not at the GlobalEventBroadcaster nor at any document!). */ @@ -3424,7 +3424,7 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) #ifdef SIMULATE_FULL_DISC return sal_False; #else // SIMULATE_FULL_DISC - // In case an error occures and we are not able to retrieve the needed information + // In case an error occurs and we are not able to retrieve the needed information // it's better to "disable" the feature ShowErrorOnFullDisc ! // Otherwhise we start a confusing process of error handling ... @@ -3476,7 +3476,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& // for loading documents into this frame)! // But if no frame exists ... we can try to locate it using any frame bound to the provided // document. Of course we must live without any frame in case the document does not exists at this - // point. But this state shouldnt occure. In such case xNewFrame should be valid ... hopefully .-) + // point. But this state should not occur. In such case xNewFrame should be valid ... hopefully .-) css::uno::Reference< css::frame::XFrame > xFrame = xNewFrame; if ( (!xFrame.is() ) && @@ -3515,7 +3515,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& // So we use a two step mechanism: // 1) we set the progress inside the MediaDescriptor, which will be provided to the filter // 2) and we set a special Frame property, which overwrites the normal behaviour of Frame::createStatusIndicator .-) - // But we supress 2) in case we uses an internal progress. Because then it doesnt matter + // But we supress 2) in case we uses an internal progress. Because then it doesn't matter // if our applications make it wrong. In such case the internal progress resists at the same frame // and there is no need to forward progress activities to e.g. an outside dialog .-) if ( @@ -3542,7 +3542,7 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& // for loading documents into this frame)! // But if no frame exists ... we can try to locate it using any frame bound to the provided // document. Of course we must live without any frame in case the document does not exists at this - // point. But this state shouldnt occure. In such case xNewFrame should be valid ... hopefully .-) + // point. But this state should not occur. In such case xNewFrame should be valid ... hopefully .-) css::uno::Reference< css::frame::XFrame > xFrame = xNewFrame; if ( (!xFrame.is() ) && diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index af9776ea9110..1064c2a4540a 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -983,7 +983,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // We doesn't support search for following special targets. // If we reject this requests - we mustnt check for such names // in following code again and again. If we do not so -wrong - // search results can occure! + // search results can occur! //----------------------------------------------------------------------------------------------------- if ( (sTargetFrameName==SPECIALTARGET_DEFAULT ) || // valid for dispatches - not for findFrame()! @@ -1078,7 +1078,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // a special feature: We use it to start search on our direct children only. That means we supress // search on ALL child frames. May that can be useful to get access on opened document tasks // only without filter out all non realy required sub frames ... - // Used helper method on our container doesn't create any frame - its a search only. + // Used helper method on our container doesn't create any frame - it's a search only. //------------------------------------------------------------------------------------------------- if ( ( ! xTarget.is() ) && @@ -1091,7 +1091,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS //------------------------------------------------------------------------------------------------- // II.III) CHILDREN // Search on all children for the given target name. - // An empty name value can't occure here - because it must be already handled as "_self" + // An empty name value can't occur here - because it must be already handled as "_self" // before. Used helper function of container doesn't create any frame. // It makes a deep search only. //------------------------------------------------------------------------------------------------- @@ -1195,7 +1195,7 @@ void SAL_CALL Desktop::dispose() /*-************************************************************************************************************//** @interface XComponent @short add/remove listener for dispose events - @descr Add an event listener to this object, if you whish to get information + @descr Add an event listener to this object, if you wish to get information about our dieing! You must releas ethis listener reference during your own disposing() method. @@ -1899,7 +1899,7 @@ void Desktop::impl_sendNotifyTerminationEvent() // Reactivate controller. // It can happen that XController.suspend() returned true ... but a registered close listener // throwed these veto exception. Then the controller has to be reactivated. Otherwise - // these document doesnt work any more. + // these document doesn't work any more. if ( (bSuspended ) && (xController.is()) diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 23f8cc58ff14..463c8a7eb574 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -743,7 +743,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // We doesn't support search for following special targets. // If we reject this requests - we mustnt check for such names // in following code again and again. If we do not so -wrong - // search results can occure! + // search results can occur! //----------------------------------------------------------------------------------------------------- if ( (sTargetFrameName==SPECIALTARGET_DEFAULT ) || // valid for dispatches - not for findFrame()! @@ -873,7 +873,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr //------------------------------------------------------------------------------------------------- // II.II) CHILDREN // Search on all children for the given target name. - // An empty name value can't occure here - because it must be already handled as "_self" + // An empty name value can't occur here - because it must be already handled as "_self" // before. Used helper function of container doesn't create any frame. // It makes a deep search only. //------------------------------------------------------------------------------------------------- @@ -952,7 +952,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr //------------------------------------------------------------------------------------------------- // II.III.II) PARENT // Forward search to our parent (if he exists.) - // To prevent us against recursive and superflous calls (which can occure if we allow him + // To prevent us against recursive and superflous calls (which can occur if we allow him // to search on his children too) we must change used search flags. //------------------------------------------------------------------------------------------------- if ( @@ -1005,7 +1005,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr @param - @return true, if is it a top frame ... false otherwise. - @onerror No error should occure! + @onerror No error should occur! *//*-*****************************************************************************************************/ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException ) { @@ -1221,7 +1221,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) @param - @return true if active, false otherwise. - @onerror No error should occure. + @onerror No error should occur. *//*-*****************************************************************************************************/ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException ) { @@ -2104,7 +2104,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram /*-****************************************************************************************************//** @short register/unregister interceptor for dispatch calls - @descr If you whish to handle some dispatches by himself ... you should be + @descr If you wish to handle some dispatches by himself ... you should be an interceptor for it. Please see class OInterceptionHelper for further information. @seealso class OInterceptionHelper diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 1722064f8560..15fb3c05e89f 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -923,8 +923,8 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , // At least it depends from the feature using this path, if an empty path list is allowed. // first we should try to store the changed (copied!) path ... - // In case an error occure on saving time an exception is thrown ... - // If no exception occures we can update our internal cache (means + // In case an error occurs on saving time an exception is thrown ... + // If no exception occurs we can update our internal cache (means // we can overwrite pOrgPath ! impl_storePath(aChangePath); pOrgPath->takeOver(aChangePath); diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 3050b4b65612..93520030b5e0 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -762,7 +762,7 @@ throw ( NoSuchElementException, RuntimeException ) // Use vector with strings to detect endless recursions! std::vector< OUString > aEndlessRecursiveDetector; - // Search for first occure of "$(...". + // Search for first occurrence of "$(...". sal_Int32 nDepth = 0; bool bSubstitutionCompleted = false; sal_Int32 nPosition = aWorkText.indexOf( m_aVarStart ); // = first position of "$(" in string diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index e265e2c04e8b..8e9014f07992 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -124,7 +124,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI // #i53630# // Mark all document windows as "special ones", so VCL can bind - // special features to it. Because VCL doesnt know anything about documents ... + // special features to it. Because VCL doesn't know anything about documents ... // Note: Doing so it's no longer supported, that e.g. our wizards can use findFrame(_blank) // to create it's previes frames. They must do it manually by using WindowDescriptor+Toolkit! css::uno::Reference< css::frame::XDesktop > xDesktop(xParentFrame, css::uno::UNO_QUERY); diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index b9191d286807..2040fea5e209 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -103,7 +103,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement); // Note: We handle "accel:item" before "accel:acceleratorlist" to perform this operation. - // Because an item occures very often ... a list should occure one times only! + // Because an item occurs very often ... a list should occur one times only! if (eElement == E_ELEMENT_ITEM) { if (!m_bInsideAcceleratorList) @@ -194,7 +194,7 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElemen EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement); // Note: We handle "accel:item" before "accel:acceleratorlist" to perform this operation. - // Because an item occures very often ... a list should occure one times only! + // Because an item occurs very often ... a list should occur one times only! if (eElement == E_ELEMENT_ITEM) { if (!m_bInsideAcceleratorItem) |