[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dtrans/source framework/inc shell/source sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Jan 26 23:08:09 UTC 2019
dtrans/source/cnttype/wbench/testcnttype.cxx | 2 +-
dtrans/source/win32/workbench/test_wincb.cxx | 2 +-
framework/inc/services/desktop.hxx | 2 +-
shell/source/win32/workbench/TestSmplMail.cxx | 2 +-
shell/source/win32/workbench/TestSysShExec.cxx | 2 +-
sw/source/ui/dbui/maildispatcher.cxx | 12 ++++++------
sw/source/ui/uno/unoatxt.cxx | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 8f821fbe178a5df4e6aaabc0097871484869b93c
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Sat Jan 26 21:06:36 2019 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Sat Jan 26 21:06:36 2019 +0000
Fixed typos (shuting -> shutting)
diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/dtrans/source/cnttype/wbench/testcnttype.cxx
index e305c435769f..b33c9e5449eb 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/dtrans/source/cnttype/wbench/testcnttype.cxx
@@ -115,7 +115,7 @@ void ShutdownServiceMgr( Reference< XMultiServiceFactory >& SrvMgr )
Reference< XComponent > xComponent( SrvMgr, UNO_QUERY );
if ( !xComponent.is() )
- OSL_ENSURE(sal_False, "Error shuting down");
+ OSL_ENSURE(sal_False, "Error shutting down");
// Dispose and clear factory
xComponent->dispose();
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index 0dcb2d512a8b..89a0173cd23d 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.cxx
@@ -329,7 +329,7 @@ int SAL_CALL main( int nArgc, char* Argv[] )
Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
if ( !xComponent.is() )
- OSL_ENSURE(sal_False, "Error shuting down");
+ OSL_ENSURE(sal_False, "Error shutting down");
// Dispose and clear factory
xComponent->dispose();
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 9ee7d5df88c9..6a94347fa3b9 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -485,7 +485,7 @@ class Desktop : // interfaces
css::uno::Reference< css::frame::XTerminateListener > m_xSWThreadManager;
//---------------------------------------------------------------------
- /** special terminate listener shuting down the SfxApplication.
+ /** special terminate listener shutting down the SfxApplication.
* Because these desktop instance closes documents and informs listener
* only ... it does not really shutdown the whole application.
*
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index ed8f571d5462..b3512a415fdf 100644
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -170,7 +170,7 @@ int SAL_CALL main(int , char*, char* )
// Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Error shuting down");
+ OSL_ENSURE(sal_False, "Error shutting down");
}
// Dispose and clear factory
diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index cb34d9d588c2..c38bf9a19707 100644
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -146,7 +146,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
// Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
- OSL_ENSURE(sal_False, "Error shuting down");
+ OSL_ENSURE(sal_False, "Error shutting down");
}
// Dispose and clear factory
diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/ui/dbui/maildispatcher.cxx
index 7a7f23a81f50..cc3d682aaa7c 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/ui/dbui/maildispatcher.cxx
@@ -126,7 +126,7 @@ void MailDispatcher::enqueueMailMessage(uno::Reference<mail::XMailMessage> messa
::osl::MutexGuard thread_status_guard(thread_status_mutex_);
::osl::MutexGuard message_container_guard(message_container_mutex_);
- OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
+ OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shutting down already");
messages_.push_back(message);
if (run_)
@@ -151,7 +151,7 @@ void MailDispatcher::start()
::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_);
- OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
+ OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shutting down already");
if (!shutdown_requested_)
{
@@ -170,7 +170,7 @@ void MailDispatcher::stop()
::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_);
- OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
+ OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shutting down already");
if (!shutdown_requested_)
{
@@ -187,7 +187,7 @@ void MailDispatcher::shutdown()
{
::osl::MutexGuard thread_status_guard(thread_status_mutex_);
- OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
+ OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shutting down already");
shutdown_requested_ = true;
wakening_call_.set();
@@ -200,7 +200,7 @@ bool MailDispatcher::isStarted() const
void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> listener)
{
- OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
+ OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shutting down already");
::osl::MutexGuard guard(listener_container_mutex_);
listeners_.push_back(listener);
@@ -208,7 +208,7 @@ void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> liste
void MailDispatcher::removeListener(::rtl::Reference<IMailDispatcherListener> listener)
{
- OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
+ OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shutting down already");
::osl::MutexGuard guard(listener_container_mutex_);
listeners_.remove(listener);
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index ba2dbe947d85..128e1ff12d96 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -933,7 +933,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint )
{
if ( SFX_HINT_DEINITIALIZING == static_cast< const SfxSimpleHint& >( _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 );
More information about the Libreoffice-commits
mailing list