diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2016-02-02 19:47:20 +0100 |
---|---|---|
committer | jan iversen <jani@documentfoundation.org> | 2016-02-05 06:48:38 +0000 |
commit | 534b2a4b58ba765dbc256d6297e33453524915e2 (patch) | |
tree | 68524baff923ce094392f49e0f263ae0d35f80e9 /framework/source | |
parent | 7f5de2436a5c51ee8dec38a9b04f4a1b3589e361 (diff) |
Fix typos
Change-Id: Ice72f8d9971e15dd6ef365e64cd567b8581a92d3
Reviewed-on: https://gerrit.libreoffice.org/21797
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'framework/source')
-rw-r--r-- | framework/source/accelerators/acceleratorcache.cxx | 2 | ||||
-rw-r--r-- | framework/source/accelerators/presethandler.cxx | 2 | ||||
-rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 2 | ||||
-rw-r--r-- | framework/source/fwe/helper/titlehelper.cxx | 6 | ||||
-rw-r--r-- | framework/source/fwi/classes/propertysethelper.cxx | 4 | ||||
-rw-r--r-- | framework/source/inc/loadenv/loadenv.hxx | 6 | ||||
-rw-r--r-- | framework/source/jobs/jobdata.cxx | 4 | ||||
-rw-r--r-- | framework/source/services/autorecovery.cxx | 30 | ||||
-rw-r--r-- | framework/source/services/frame.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/modulemanager.cxx | 4 | ||||
-rw-r--r-- | framework/source/uielement/newmenucontroller.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/recentfilesmenucontroller.cxx | 2 |
12 files changed, 33 insertions, 33 deletions
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index 03cee4d7b1d7..ca92b8f5cf37 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -42,7 +42,7 @@ AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) AcceleratorCache::~AcceleratorCache() { - // Dont save anything automatically here. + // Don't save anything automatically here. // The user has to do that explicitly! } diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index f9121479aae5..5e2397a73b5b 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -110,7 +110,7 @@ PresetHandler::~PresetHandler() m_xWorkingStorageUser.clear(); /* #i46497# - Dont call forgetCachedStorages() here for shared storages. + Don't call forgetCachedStorages() here for shared storages. Because we opened different sub storages by using openPath(). And every already open path was reused and referenced (means it's ref count was increased!) diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 0915738266d3..02f0dee1dfa8 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -103,7 +103,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: { if (nCommandGroup == css::frame::CommandGroup::VIEW) { - /* Attention: Dont add .uno:CloseFrame here. Because its not really + /* Attention: Don't add .uno:CloseFrame here. Because its not really a configurable feature ... and further it does not have a valid UIName entry inside the GenericCommands.xcu ... */ css::uno::Sequence< css::frame::DispatchInformation > lViewInfos(1); diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index c9aba3e5b2e7..178a92eba3b3 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -317,7 +317,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - // external title wont be updated internally ! + // external title won't be updated internally! // It has to be set from outside new. if (m_bExternalTitle) return; @@ -387,7 +387,7 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - // external title wont be updated internally ! + // external title won't be updated internally! // It has to be set from outside new. if (m_bExternalTitle) return; @@ -466,7 +466,7 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - // external title wont be updated internally ! + // external title won't be updated internally! // It has to be set from outside new. if (m_bExternalTitle) return; diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index 8f1e6acc2da2..8595ec32d3c5 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -79,7 +79,7 @@ void SAL_CALL PropertySetHelper::impl_disablePropertySet() bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent) { - /* Dont use the lock here! + /* Don't use the lock here! The used helper is threadsafe and it lives for the whole lifetime of our own object. */ @@ -108,7 +108,7 @@ bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEvent& a void PropertySetHelper::impl_notifyChangeListener(const css::beans::PropertyChangeEvent& aEvent) { - /* Dont use the lock here! + /* Don't use the lock here! The used helper is threadsafe and it lives for the whole lifetime of our own object. */ diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index d754e1ae85bd..082362dacce3 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -77,7 +77,7 @@ public: @descr The load environment must know, if a content is related to a target frame or not. Only "visible" - components, which fullfill the requirements of the + components, which fulfill the requirements of the model-controller-view paradigm can be loaded into a frame. Such contents are classified as E_CAN_BE_LOADED. @@ -497,7 +497,7 @@ private: If a suitable target is located it will be locked. Thats why the last rule exists! If this method returns a valid frame reference, it was locked to be useable - for this load request only. (Dont forget to reset this state later!) + for this load request only. (Don't forget to reset this state later!) Concurrent LoadEnv instances can synchronize her work be using such locks :-) HOPEFULLY @throw A LoadEnvException only in cases, where an internal error indicates, @@ -518,7 +518,7 @@ private: Showing of such frame is not needed really.. because we recycle visible frames only! b) If the document was already shown (e.g. by our progress implementation) - we do nothing here. The reason behind: The document was already shown... + we do nothing here. The reason behind: The document was already shown... and it was already make a top window... If the user activated another frame inbetween (because loading needed some time) it's not allowed to disturb the user again. Then the frame must resists in the background. diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 907681f8f47e..14f4ddc6f6e1 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -97,7 +97,7 @@ JobData::~JobData() } /** - @short initalize this instance as a job with configuration + @short initialize this instance as a job with configuration @descr They given alias can be used to address some configuration data. We read it and fill our internal structures. Of course old information will be lost doing so. @@ -164,7 +164,7 @@ void JobData::setAlias( const OUString& sAlias ) } /** - @short initalize this instance as a job without configuration + @short initialize this instance as a job without configuration @descr This job has no configuration data. We have to forget all old information and set only some of them new, so this instance can work. diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 28885f6b9b78..240493a1563c 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -108,9 +108,9 @@ namespace { @descr Because some operations are forced to be executed asynchronously (e.g. requested by our CreashSave/Recovery dialog) ... we must make sure - that these information wont be set as "normal" members of our AutoRecovery + that these information won't be set as "normal" members of our AutoRecovery instance. Otherwise they can disturb our normal AutoSave-timer handling. - e.g. it can be unclear then, which progress has to be used for storing documents ... + e.g. it can be unclear then, which progress has to be used for storing documents... */ struct DispatchParams { @@ -143,10 +143,10 @@ public: backup or cleanUp operation ... which is may be done asynchronous */ sal_Int32 m_nWorkingEntryID; - /** @short used for asyncoperations, to prevent us from dying. + /** @short used for async operations, to prevent us from dying. @descr If our dispatch() method was forced to start the - internal operation asynchronous ... we send an event + internal operation asynchronous... we send an event to start and return immediately. But we must be sure that our instance live if the event callback reach us. So we hold an uno reference to ourself. @@ -1628,8 +1628,8 @@ void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEv } /* document saved as copy => mark it as "non used by concurrent save operation". so we can try to create a backup copy if next time AutoSave is started too. - Dont remove temp. files or change the modified state of the document! - It was not really saved to the original file ... + Don't remove temp. files or change the modified state of the document! + It was not really saved to the original file... */ else if ( aEvent.EventName == EVENT_ON_SAVETODONE ) { @@ -2220,7 +2220,7 @@ void AutoRecovery::implts_stopListening() css::uno::Reference< css::document::XDocumentEventBroadcaster > xGlobalEventBroadcaster; /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); - // Attention: Dont reset our internal members here too. + // Attention: Don't reset our internal members here too. // May be we must work with our configuration, but don't wish to be informed // about changes any longer. Needed e.g. during EMERGENCY_SAVE! xCFG.set (m_xRecoveryCFG , css::uno::UNO_QUERY); @@ -2453,7 +2453,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame { // Normally nothing must be done for this "late" notification. // But may be the modified state was changed inbetween. - // Check it ... + // Check it... implts_updateModifiedState(xDocument); return; } @@ -2566,7 +2566,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); - // Attention: Dont leave SAFE section, if you work with pIt! + // Attention: Don't leave SAFE section, if you work with pIt! // Because it points directly into the m_lDocCache list ... CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -3221,7 +3221,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa AutoRecovery::TDocumentInfo& rInfo = *pIt; // Such documents are already loaded by the last loop. - // Dont check E_SUCCEDED here! Its may be the final state of an AutoSave + // Don't check E_SUCCEDED here! It may be the final state of an AutoSave // operation before!!! if ((rInfo.DocumentState & AutoRecovery::E_HANDLED) == AutoRecovery::E_HANDLED) continue; @@ -3388,7 +3388,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa implts_startModifyListeningOnDoc(rInfo); // /* SAFE */ { - // Needed for next loop. Dont unlock it again! + // Needed for next loop. Don't unlock it again! g.reset(); } @@ -3748,7 +3748,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) // flush config cached back to disc. impl_flushALLConfigChanges(); - // try to make sure next time office will be started user wont be + // try to make sure next time office will be started user won't be // notified about any other might be running office instance // remove ".lock" file from disc ! AutoRecovery::st_impl_removeLockFile(); @@ -3822,9 +3822,9 @@ void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionQuietQuit()"); - // try to make sure next time office will be started user wont be + // try to make sure next time office will be started user won't be // notified about any other might be running office instance - // remove ".lock" file from disc ! + // remove ".lock" file from disc! // it is done as a first action for session save since Gnome sessions // do not provide enough time for shutdown, and the dialog looks to be // confusing for the user @@ -3912,7 +3912,7 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams) // TODO: Check eResult and react for errors (InteractionHandler!?) // Currently we ignore it ... - // DONT UPDATE THE CACHE OR REMOVE ANY TEMP. FILES FROM DISK. + // DON'T UPDATE THE CACHE OR REMOVE ANY TEMP. FILES FROM DISK. // That has to be forced from outside explicitly. // See implts_cleanUpWorkingEntry() for further details. } diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 8ceb9572f462..8f374a4ee4c1 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2002,7 +2002,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException, std::exception impl_disablePropertySet(); // interception/dispatch chain must be destructed explicitly - // Otherwhise some dispatches and/or interception objects wont die. + // Otherwise some dispatches and/or interception objects won't die. css::uno::Reference< css::lang::XEventListener > xDispatchHelper(m_xDispatchHelper, css::uno::UNO_QUERY_THROW); xDispatchHelper->disposing(aEvent); xDispatchHelper.clear(); diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 98e441e65363..a9ffb24cba90 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -243,10 +243,10 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName , } // get access to the element - // Note: Dont use impl_getConfig() method here. Because it creates a readonly access only, further + // Note: Don't use impl_getConfig() method here. Because it creates a readonly access only, further // it cache it as a member of this module manager instance. If we change some props there ... but don't // flush changes (because an error occurred) we will read them later. If we use a different config access - // we can close it without a flush ... and our read data wont be affected .-) + // we can close it without a flush... and our read data won't be affected .-) css::uno::Reference< css::uno::XInterface > xCfg = ::comphelper::ConfigurationHelper::openConfig( m_xContext, "/org.openoffice.Setup/Office/Factories", diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 7eb93bad0b3e..d4a421382031 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -432,7 +432,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent if ( xDispatch.is() ) { - // Call dispatch asychronously as we can be destroyed while dispatch is + // Call dispatch asynchronously as we can be destroyed while dispatch is // executed. VCL is not able to survive this as it wants to call listeners // after select!!! NewDocument* pNewDocument = new NewDocument; diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index f44482a7a4fa..c7faadd89e5a 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -308,7 +308,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) if ( xDispatch.is() ) { - // Call dispatch asychronously as we can be destroyed while dispatch is + // Call dispatch asynchronously as we can be destroyed while dispatch is // executed. VCL is not able to survive this as it wants to call listeners // after select!!! LoadRecentFile* pLoadRecentFile = new LoadRecentFile; |