[Libreoffice-commits] core.git: framework/inc framework/source reportdesign/source sot/source sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jul 31 09:31:22 UTC 2018
framework/inc/services/desktop.hxx | 4 ++--
framework/source/jobs/job.cxx | 8 ++++----
framework/source/services/desktop.cxx | 8 ++++----
framework/source/services/frame.cxx | 4 ++--
reportdesign/source/core/sdr/RptObject.cxx | 4 ++--
sot/source/sdstor/ucbstorage.cxx | 6 +++---
sw/source/filter/ww8/docxexport.cxx | 2 +-
7 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 1de9dc5ff788105a6de7988e5ed5cbad84e807b7
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Tue Jul 31 10:21:14 2018 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Jul 31 11:30:58 2018 +0200
Fix typos
Change-Id: If8897807f065a342ef0e7f923199660079a70d22
Reviewed-on: https://gerrit.libreoffice.org/58123
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Jenkins
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 09a9318a2906..04438ecc14d9 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -153,7 +153,7 @@ class Desktop : private cppu::BaseMutex,
@seealso XTerminateListener
@seealso XTerminateListener2
- @return true if all open frames could be closed and no listener throwed
+ @return true if all open frames could be closed and no listener threw
a veto exception; false otherwise.
@onerror False will be returned.
@@ -318,7 +318,7 @@ class Desktop : private cppu::BaseMutex,
* about cancel this termination request.
*
* @param [out] bVeto
- * will be true if at least one listener throwed a veto exception;
+ * will be true if at least one listener threw a veto exception;
* false otherwise.
*
* @see impl_sendCancelTerminationEvent()
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 047bb7170004..3082526bfb71 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -229,9 +229,9 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD
if (m_eRunState == E_RUNNING)
m_eRunState = E_STOPPED_OR_FINISHED;
- // If we got a close request from our frame or model ...
+ // If we got a close request from our frame or model...
// but we disagreed wit that by throwing a veto exception...
- // and got the ownership ...
+ // and got the ownership...
// we have to close the resource frame or model now -
// and to disable ourself!
if (m_bPendingCloseFrame)
@@ -686,8 +686,8 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& )
@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 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
+ It can occur only, if job was not already started if queryTermination() was called here.
+ Then we had not thrown a veto exception. But now we must agree with this situation and break
all our internal processes. It's not a good idea to mark this instance as non startable any longer
inside queryTermination() if no job was running too. Because that would disable this job and may
the office does not really shutdown, because another listener has thrown the suitable exception.
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 17856a70a81b..111a3a8f0a7e 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1748,15 +1748,15 @@ bool Desktop::impl_closeFrames(bool bAllowUI)
++nNonClosedFrames;
// 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
+ // It can happen that XController.suspend() returned true... but a registered close listener
+ // threw these veto exception. Then the controller has to be reactivated. Otherwise
// these document doesn't work any more.
if ( bSuspended && xController.is())
xController->suspend(false);
}
- // If interface XClosable interface exists and was used ...
- // it's not allowed to use XComponent->dispose() also !
+ // If interface XClosable interface exists and was used...
+ // it's not allowed to use XComponent->dispose() also!
continue;
}
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 8bbecd5c434a..a7f60298aeb9 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1635,7 +1635,7 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
@param bDeliverOwnership
If parameter is set to <FALSE/> the original caller will be the owner after thrown
veto exception and must try to close this frame at later time again. Otherwise the
- source of throwed exception is the right one. May it will be the frame himself.
+ source of thrown exception is the right one. May it will be the frame himself.
@throws CloseVetoException
if any internal things willn't be closed
@@ -3175,7 +3175,7 @@ void Frame::implts_checkSuicide()
m_bSelfClose = false;
aReadLock.clear();
/* } SAFE */
- // force close and deliver ownership to source of possible throwed veto exception
+ // force close and deliver ownership to source of possible thrown veto exception
// Attention: Because this method is not designed to throw such exception we must suppress
// it for outside code!
try
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 4ea04086ff33..bd1ee71782d1 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -813,7 +813,7 @@ void OUnoObject::CreateMediator(bool _bReverse)
{
if ( !m_xMediator.is() )
{
- // tdf#118730 Directly do thinigs formerly done in
+ // tdf#118730 Directly do things formerly done in
// OUnoObject::impl_setReportComponent_nothrow here
if(!m_xReportComponent.is())
{
@@ -824,7 +824,7 @@ void OUnoObject::CreateMediator(bool _bReverse)
impl_initializeModel_nothrow();
}
- // tdf#118730 Directly do thinigs formerly done in
+ // tdf#118730 Directly do things formerly done in
// OUnoObject::EndCreate here
if(m_xReportComponent.is())
{
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 77b88df16693..dfca9d6b9211 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2203,7 +2203,7 @@ sal_Int16 UCBStorage_Impl::Commit()
catch (const CommandAbortedException&)
{
// how to tell the content : forget all changes ?!
- // or should we assume that the content does it by itself because he throwed an exception ?!
+ // or should we assume that the content does it by itself because he threw an exception ?!
// any command wasn't executed successfully - not specified
SetError( ERRCODE_IO_GENERAL );
return COMMIT_RESULT_FAILURE;
@@ -2211,7 +2211,7 @@ sal_Int16 UCBStorage_Impl::Commit()
catch (const RuntimeException&)
{
// how to tell the content : forget all changes ?!
- // or should we assume that the content does it by itself because he throwed an exception ?!
+ // or should we assume that the content does it by itself because he threw an exception ?!
// any other error - not specified
SetError( ERRCODE_IO_GENERAL );
return COMMIT_RESULT_FAILURE;
@@ -2234,7 +2234,7 @@ sal_Int16 UCBStorage_Impl::Commit()
catch (const Exception&)
{
// how to tell the content : forget all changes ?!
- // or should we assume that the content does it by itself because he throwed an exception ?!
+ // or should we assume that the content does it by itself because he threw an exception ?!
// any other error - not specified
SetError( ERRCODE_IO_GENERAL );
return COMMIT_RESULT_FAILURE;
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 82125851f571..f27d6b369948 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1083,7 +1083,7 @@ void DocxExport::WriteSettings()
pAttributeList->add(FSNS(XML_w, nToken), rAttributeList[j].Value.get<OUString>().toUtf8());
}
- // we have document protection from from input DOCX file
+ // we have document protection from input DOCX file
sax_fastparser::XFastAttributeListRef xAttributeList(pAttributeList);
pFS->singleElementNS(XML_w, XML_documentProtection, xAttributeList);
More information about the Libreoffice-commits
mailing list