diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2018-11-19 00:05:21 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2018-11-19 07:12:04 +0100 |
commit | 4c4b05b762e511bc466105be252fb3cecf2307ad (patch) | |
tree | 84fafd808156708a70a9254b1c4fe42bdfbf9c79 | |
parent | d71ea82055a6a304493c7eaa90809a348e23784d (diff) |
Fix typos
Change-Id: Icf1b10c517d7c575250bc74de03162fbc13c89b1
Reviewed-on: https://gerrit.libreoffice.org/63476
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r-- | sw/source/core/bastyp/bparr.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/undo/undel.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/view/vprint.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/dbui/maildispatcher.cxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/dbui/mmconfigitem.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uno/unoatxt.cxx | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx index 8739d01c193b..8158a485a56b 100644 --- a/sw/source/core/bastyp/bparr.cxx +++ b/sw/source/core/bastyp/bparr.cxx @@ -453,7 +453,7 @@ sal_uInt16 BigPtrArray::Compress() // Is the current block now empty as a result? if( !p->nElem ) { - // than remove + // then remove delete p; p = nullptr; ++nBlkdel; diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 5b7d5366bae1..f979890d3b9b 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -511,7 +511,7 @@ bool SwUndoDelete::SaveContent( const SwPosition* pStt, const SwPosition* pEnd, : pEndTextNd->CreateUndo(); } - // if there are only two Nodes than we're done + // if there are only two Nodes then we're done if( ( pSttTextNd || pEndTextNd ) && nSttNode + 1 == nEndNode ) return false; // do not move any Node diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index b68ef540b980..9fe798916ceb 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -589,8 +589,8 @@ bool SwViewShell::PrintOrPDFExport( void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) { - // For printing a shell is needed. Either the Doc already has one, than we - // create a new view, or it has none, than we create the first view. + // For printing a shell is needed. Either the Doc already has one, then we + // create a new view, or it has none, then we create the first view. std::unique_ptr<SwViewShell> pSh; if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() ) pSh.reset(new SwViewShell( *pDoc->getIDocumentLayoutAccess().GetCurrentViewShell(), nullptr, &rRenderContext,VSHELLFLAG_SHARELAYOUT )); diff --git a/sw/source/uibase/dbui/maildispatcher.cxx b/sw/source/uibase/dbui/maildispatcher.cxx index bdb4a91b9cdf..546fd3698032 100644 --- a/sw/source/uibase/dbui/maildispatcher.cxx +++ b/sw/source/uibase/dbui/maildispatcher.cxx @@ -120,7 +120,7 @@ void MailDispatcher::enqueueMailMessage(uno::Reference<mail::XMailMessage> const ::osl::MutexGuard thread_status_guard( m_aThreadStatusMutex ); ::osl::MutexGuard message_container_guard( m_aMessageContainerMutex ); - OSL_PRECOND( !m_bShutdownRequested, "MailDispatcher thread is shuting down already" ); + OSL_PRECOND( !m_bShutdownRequested, "MailDispatcher thread is shutting down already" ); m_aXMessageList.push_back( message ); if ( m_bActive ) @@ -145,7 +145,7 @@ void MailDispatcher::start() ::osl::ClearableMutexGuard thread_status_guard( m_aThreadStatusMutex ); - OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shuting down already"); + OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shutting down already"); if ( !m_bShutdownRequested ) { @@ -165,7 +165,7 @@ void MailDispatcher::stop() ::osl::ClearableMutexGuard thread_status_guard( m_aThreadStatusMutex ); - OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shuting down already"); + OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shutting down already"); if (!m_bShutdownRequested) { @@ -183,7 +183,7 @@ void MailDispatcher::shutdown() { ::osl::MutexGuard thread_status_guard( m_aThreadStatusMutex ); - OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shuting down already"); + OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shutting down already"); m_bShutdownRequested = true; m_aWakeupCondition.set(); @@ -192,7 +192,7 @@ void MailDispatcher::shutdown() void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> const & listener) { - OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shuting down already"); + OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shutting down already"); ::osl::MutexGuard guard( m_aListenerContainerMutex ); m_aListenerVector.push_back( listener ); diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 154d6ec4d9a5..d7c4707e4c55 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -144,7 +144,7 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem std::vector< SwDocMergeInfo > m_aMergeInfos; //we do overwrite the usersettings in a special case - //than we do remind the usersettings here + //then we do remind the usersettings here bool m_bUserSettingWereOverwritten; bool m_bIsAddressBlock_LastUserSetting; bool m_bIsGreetingLineInMail_LastUserSetting; diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 13f201c69c84..5433dda095a0 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -754,7 +754,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) { if ( SfxHintId::Deinitializing == _rHint.GetId() ) { - // our document is dying (possibly because we're shuting down, and the document was notified + // our document is dying (possibly because we're shutting down, and the document was notified // earlier than we are?) // stop listening at the docu EndListening( *xDocSh ); |