summaryrefslogtreecommitdiffstats
path: root/framework/source/services
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-02-25 17:52:23 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-02-25 17:59:40 +0100
commit4f4e4e40f5b79a4dba46ffedd11cafa7beb08a87 (patch)
treec158b93b176b084eac024c0e3b5e94e18911f50f /framework/source/services
parentremove duplicate line (diff)
downloadcore-4f4e4e40f5b79a4dba46ffedd11cafa7beb08a87.tar.gz
core-4f4e4e40f5b79a4dba46ffedd11cafa7beb08a87.zip
loplugin: improve indentation
Change-Id: Idb847766d93dc222d6c55889616da21eeac212ee
Diffstat (limited to 'framework/source/services')
-rw-r--r--framework/source/services/autorecovery.cxx24
-rw-r--r--framework/source/services/dispatchhelper.cxx3
2 files changed, 9 insertions, 18 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 79cf9a87b71f..e1415dff7c8d 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1334,11 +1334,9 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
if (! impl_enoughDiscSpace(nMinSpaceConfigSave))
AutoRecovery::impl_showFullDiscError();
- else
- if (nRetry > RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL)
+ else if (nRetry > RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL)
nRetry = RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL;
- else
- if (nRetry <= GIVE_UP_RETRY)
+ else if (nRetry <= GIVE_UP_RETRY)
throw; // force stacktrace to know if there exist might other reasons, why an AutoSave can fail !!!
--nRetry;
@@ -1479,8 +1477,7 @@ void AutoRecovery::implts_updateTimer()
nMilliSeconds = m_nAutoSaveTimeIntervall; // [ms]
#endif
}
- else
- if (m_eTimerType == AutoRecovery::E_POLL_FOR_USER_IDLE)
+ else if (m_eTimerType == AutoRecovery::E_POLL_FOR_USER_IDLE)
{
nMilliSeconds = MIN_TIME_FOR_USER_IDLE;
#if OSL_DEBUG_LEVEL > 1
@@ -1488,8 +1485,7 @@ void AutoRecovery::implts_updateTimer()
nMilliSeconds = 300; // let us some time, to finish this method .-)
#endif
}
- else
- if (m_eTimerType == AutoRecovery::E_POLL_TILL_AUTOSAVE_IS_ALLOWED)
+ else if (m_eTimerType == AutoRecovery::E_POLL_TILL_AUTOSAVE_IS_ALLOWED)
nMilliSeconds = 300; // there is a minimum time frame, where the user can loose some key input data!
m_aTimer.SetTimeout(nMilliSeconds);
@@ -2370,11 +2366,9 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
if (! impl_enoughDiscSpace(nMinSpaceDocSave))
AutoRecovery::impl_showFullDiscError();
- else
- if (nRetry > RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL)
+ else if (nRetry > RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL)
nRetry = RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL;
- else
- if (nRetry <= GIVE_UP_RETRY)
+ else if (nRetry <= GIVE_UP_RETRY)
throw; // force stacktrace to know if there exist might other reasons, why an AutoSave can fail !!!
--nRetry;
@@ -2500,15 +2494,13 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
{
sLoadOriginalURL = rInfo.OrgURL;
}
- else
- if (!rInfo.TemplateURL.isEmpty())
+ else if (!rInfo.TemplateURL.isEmpty())
{
sLoadOriginalURL = rInfo.TemplateURL;
lDescriptor[::comphelper::MediaDescriptor::PROP_ASTEMPLATE()] <<= sal_True;
lDescriptor[::comphelper::MediaDescriptor::PROP_TEMPLATENAME()] <<= rInfo.TemplateURL;
}
- else
- if (!rInfo.FactoryURL.isEmpty())
+ else if (!rInfo.FactoryURL.isEmpty())
{
sLoadOriginalURL = rInfo.FactoryURL;
lDescriptor[::comphelper::MediaDescriptor::PROP_ASTEMPLATE()] <<= sal_True;
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index be645c7b849d..86565ee1383f 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -142,8 +142,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
xNotifyDispatch->dispatchWithNotification(aURL, aArguments, xListener);
aResult = m_aResult;
}
- else
- if (xDispatch.is())
+ else if (xDispatch.is())
{
// dispatch it without any chance to get a result
xDispatch->dispatch( aURL, aArguments );