summaryrefslogtreecommitdiffstats
path: root/framework/source/services/desktop.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-06 14:49:15 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-10 09:57:24 +0200
commit4250b25c6ae361359300ab6ccde27230f8e01039 (patch)
tree916a8420282928a92ede0760d696997550ae0840 /framework/source/services/desktop.cxx
parentRemove useless method OCommonAccessibleText::getText (diff)
downloadcore-4250b25c6ae361359300ab6ccde27230f8e01039.tar.gz
core-4250b25c6ae361359300ab6ccde27230f8e01039.zip
teach unnecessaryparen loplugin about identifiers
Change-Id: I5710b51e53779c222cec0bf08cd34bda330fec4b Reviewed-on: https://gerrit.libreoffice.org/39737 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source/services/desktop.cxx')
-rw-r--r--framework/source/services/desktop.cxx20
1 files changed, 4 insertions, 16 deletions
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index e96224815441..090c109318d6 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -271,10 +271,7 @@ sal_Bool SAL_CALL Desktop::terminate()
bool bTerminate = false;
try
{
- if(
- ( bAskQuickStart ) &&
- ( xQuickLauncher.is() )
- )
+ if( bAskQuickStart && xQuickLauncher.is() )
{
xQuickLauncher->queryTermination( aEvent );
lCalledTerminationListener.push_back( xQuickLauncher );
@@ -334,10 +331,7 @@ sal_Bool SAL_CALL Desktop::terminate()
Scheduler::ProcessEventsToIdle();
}
- if(
- ( bAskQuickStart ) &&
- ( xQuickLauncher.is() )
- )
+ if( bAskQuickStart && xQuickLauncher.is() )
{
xQuickLauncher->notifyTermination( aEvent );
}
@@ -1724,10 +1718,7 @@ bool Desktop::impl_closeFrames(bool bAllowUI)
// Use it in case it was allowed from outside only.
bool bSuspended = false;
css::uno::Reference< css::frame::XController > xController( xFrame->getController(), css::uno::UNO_QUERY );
- if (
- ( bAllowUI ) &&
- ( xController.is() )
- )
+ if ( bAllowUI && xController.is() )
{
bSuspended = xController->suspend( true );
if ( ! bSuspended )
@@ -1760,10 +1751,7 @@ bool Desktop::impl_closeFrames(bool bAllowUI)
// 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
// these document doesn't work any more.
- if (
- (bSuspended ) &&
- (xController.is())
- )
+ if ( bSuspended && xController.is())
xController->suspend(false);
}