summaryrefslogtreecommitdiff
path: root/framework/source/services
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/services')
-rw-r--r--framework/source/services/autorecovery.cxx14
-rw-r--r--framework/source/services/desktop.cxx8
-rw-r--r--framework/source/services/frame.cxx26
-rw-r--r--framework/source/services/pathsettings.cxx2
-rw-r--r--framework/source/services/substitutepathvars.cxx4
5 files changed, 27 insertions, 27 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 380a0159ca0b..6248ae18225d 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -500,7 +500,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL&
::comphelper::SequenceAsHashMap lArgs(lArguments);
// check if somewhere wish to disable recovery temp. for this office session
- // This can be done immediatly ... must not been done asynchronous.
+ // This can be done immediately ... must not been done asynchronous.
if ((eNewJob & AutoRecovery::E_DISABLE_AUTORECOVERY) == AutoRecovery::E_DISABLE_AUTORECOVERY)
{
// it's important to set a flag internaly, so AutoRecovery will be supressed - even if it's requested.
@@ -2198,10 +2198,10 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl
// ii) For a CrashSave ... add it to the list of dangerous documents and
// save it after all other documents was saved successfully. That decrease
// the chance for a crash inside a crash.
- // On the other side it's not neccessary for documents, which are not modified.
+ // 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 immediatly.
+ // Because the WindowManager will kill the process if it doesnt react immediately.
// On the other side we cant risk a concurrent save request ... because we know
// that it will produce a crash.
@@ -2810,7 +2810,7 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL));
// Attention: Because "eJob" is used as a flag field the order of checking these
- // flags is importent. We must preferr job with higher priorities!
+ // flags is important. We must preferr job with higher priorities!
// E.g. EmergencySave has an higher prio then AutoSave ...
// On the other side there exist a well defined order between two different jobs.
// e.g. PrepareEmergencySave must be done before EmergencySave is started of course.
@@ -2968,7 +2968,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams)
// during normal AutoSave more then once. Because
// it postpone active documents and save it later.
// That is normaly done by recalling it from a timer.
- // Here we must do it immediatly!
+ // Here we must do it immediately!
// Of course this method returns the right state -
// because it knows, that we are running in ERMERGENCY SAVE mode .-)
@@ -3038,7 +3038,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams)
// during normal AutoSave more then once. Because
// it postpone active documents and save it later.
// That is normaly done by recalling it from a timer.
- // Here we must do it immediatly!
+ // Here we must do it immediately!
// Of course this method returns the right state -
// because it knows, that we are running in SESSION SAVE mode .-)
@@ -3532,7 +3532,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo&
}
// But inside the MediaDescriptor we must set our own create progress ...
- // in case there is not already anothe rprogress set.
+ // in case there is not already another progress set.
rArgs.createItemIfMissing(::comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), xInternalProgress);
}
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index f32d0354d396..628730fed95a 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -841,7 +841,7 @@ void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XF
// If nothing will change - do nothing!
// Otherwise set new active frame ...
// and deactivate last frame.
- // It's neccessary for our FrameActionEvent listener on a frame!
+ // It's necessary for our FrameActionEvent listener on a frame!
css::uno::Reference< css::frame::XFrame > xLastActiveChild = m_aChildTaskContainer.getActive();
if( xLastActiveChild != xFrame )
{
@@ -1036,7 +1036,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r
// force using of "if() else if() ..."
//-----------------------------------------------------------------------------------------------------
- // get threadsafe some neccessary member which are neccessary for following functionality
+ // get threadsafe some necessary member which are neccessary for following functionality
/* SAFE { */
ReadGuard aReadLock( m_aLock );
css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = m_xFactory;
@@ -1086,7 +1086,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r
// But note: Such flags are not valid for the desktop - especialy SIBLINGS or PARENT.
//-------------------------------------------------------------------------------------------------
- // get threadsafe some neccessary member which are neccessary for following functionality
+ // get threadsafe some necessary member which are neccessary for following functionality
/* SAFE { */
aReadLock.lock();
::rtl::OUString sOwnName = m_sName;
@@ -1179,7 +1179,7 @@ void SAL_CALL Desktop::dispose()
// Now - we are alone and its the first call of this method ...
// otherwise call before had thrown a DisposedException / hopefully .-)
- // But we dont use the transaction object created before ... we reset it immediatly ...
+ // But we dont use the transaction object created before ... we reset it immediately ...
// two lines of code ... for what ?
// The answer: We wished to synchronize concurrent dispose() calls -> OK
// But next line will wait for all currently running transaction (even if they
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 6f2ff40eaa74..ba54b20608f5 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -414,7 +414,7 @@ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFra
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
WriteGuard aWriteLock( m_aLock );
- // Copy neccessary member for threadsafe access!
+ // Copy necessary member for threadsafe access!
// m_aChildFrameContainer is threadsafe himself and he live if we live!!!
// ...and our transaction is non breakable too ...
css::uno::Reference< css::frame::XFrame > xActiveChild = m_aChildFrameContainer.getActive();
@@ -771,7 +771,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl
// force using of "if() else if() ..."
//-----------------------------------------------------------------------------------------------------
- // get threadsafe some neccessary member which are neccessary for following functionality
+ // get threadsafe some necessary member which are neccessary for following functionality
/* SAFE { */
ReadGuard aReadLock( m_aLock );
css::uno::Reference< css::frame::XFrame > xParent ( m_xParent, css::uno::UNO_QUERY );
@@ -863,7 +863,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl
// TASK and CREATE are handled special.
//-------------------------------------------------------------------------------------------------
- // get threadsafe some neccessary member which are neccessary for following functionality
+ // get threadsafe some necessary member which are neccessary for following functionality
/* SAFE { */
aReadLock.lock();
::rtl::OUString sOwnName = m_sName;
@@ -1058,8 +1058,8 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException )
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
WriteGuard aWriteLock( m_aLock );
- // Copy neccessary member and free the lock.
- // It's not neccessary for m_aChildFrameContainer ... because
+ // Copy necessary member and free the lock.
+ // It's not necessary for m_aChildFrameContainer ... because
// he is threadsafe himself and live if we live.
// We use a registered transaction to prevent us against
// breaks during this operation!
@@ -1099,7 +1099,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException )
// But we do nothing then! We are already activated.
xParent->activate();
}
- // Its neccessary to send event NOW - not before.
+ // Its necessary to send event NOW - not before.
// Activation goes from bottom to top!
// Thats the reason to activate parent first and send event now.
implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_ACTIVATED );
@@ -1158,7 +1158,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException )
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
WriteGuard aWriteLock( m_aLock );
- // Copy neccessary member and free the lock.
+ // Copy necessary member and free the lock.
css::uno::Reference< css::frame::XFrame > xActiveChild = m_aChildFrameContainer.getActive() ;
css::uno::Reference< css::frame::XFramesSupplier > xParent ( m_xParent, css::uno::UNO_QUERY ) ;
css::uno::Reference< css::frame::XFrame > xThis ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY );
@@ -1988,7 +1988,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
ReadGuard aReadLock( m_aLock );
- // Make snapshot of neccessary member and define default return value.
+ // Make snapshot of necessary member and define default return value.
css::uno::Reference< css::task::XStatusIndicator > xExternal(m_xIndicatorInterception.get(), css::uno::UNO_QUERY);
css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory = m_xIndicatorFactoryHelper;
@@ -2424,7 +2424,7 @@ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( cs
if( aEvent.Source == m_xContainerWindow )
{
- // NECCESSARY: Impl-method is threadsafe by himself!
+ // NECESSARY: Impl-method is threadsafe by himself!
aWriteLock.unlock();
implts_stopWindowListening();
aWriteLock.lock();
@@ -2797,7 +2797,7 @@ void Frame::implts_setIconOnWindow()
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- // Make snapshot of neccessary members and release lock.
+ // Make snapshot of necessary members and release lock.
ReadGuard aReadLock( m_aLock );
css::uno::Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow, css::uno::UNO_QUERY );
css::uno::Reference< css::frame::XController > xController ( m_xController , css::uno::UNO_QUERY );
@@ -2897,7 +2897,7 @@ void Frame::implts_startWindowListening()
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- // Make snapshot of neccessary member!
+ // Make snapshot of necessary member!
ReadGuard aReadLock( m_aLock );
css::uno::Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow ;
css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = m_xFactory ;
@@ -2937,7 +2937,7 @@ void Frame::implts_stopWindowListening()
TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- // Make snapshot of neccessary member!
+ // Make snapshot of necessary member!
ReadGuard aReadLock( m_aLock );
css::uno::Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow ;
css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = m_xFactory ;
@@ -3112,7 +3112,7 @@ void Frame::impl_checkMenuCloser()
xNewCloserFrame = this;
}
- // Look for neccessary actions ...
+ // Look for necessary actions ...
// Only if the closer state must be moved from one frame to another one
// or must be enabled/disabled at all.
/* STATIC SAFE { */
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 67012ed2b76b..a015114f96d6 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -1103,7 +1103,7 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld()
::comphelper::ConfigurationHelper::openConfig(
comphelper::getComponentContext(xSMGR),
CFG_NODE_OLD,
- ::comphelper::ConfigurationHelper::E_STANDARD), // not readonly! Somtimes we need write access there !!!
+ ::comphelper::ConfigurationHelper::E_STANDARD), // not readonly! Sometimes we need write access there !!!
css::uno::UNO_QUERY_THROW);
// SAFE ->
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 6bbdb003c06f..4896af387322 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -945,12 +945,12 @@ throw ( NoSuchElementException, RuntimeException )
// Fill return value with result
if ( bSubstitutionCompleted )
{
- // Substitution successfull!
+ // Substitution successful!
aResult = aWorkText;
}
else
{
- // Substitution not successfull!
+ // Substitution not successful!
if ( nDepth == nMaxRecursiveDepth )
{
// recursion depth reached!