diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-10-11 10:11:26 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-11 11:15:41 +0100 |
commit | 7d044841e88d2413c19715a290b3d7a2ba6d099d (patch) | |
tree | 7fdd0a175fc2dcc3f79ec03d8bdcde076bed526a /framework | |
parent | add ellipsis to Floating Frame because it pops up a dialog (diff) | |
download | core-7d044841e88d2413c19715a290b3d7a2ba6d099d.tar.gz core-7d044841e88d2413c19715a290b3d7a2ba6d099d.zip |
loplugin: misleading indent
Change-Id: Ia3c27c2b2e869af09557ad50e51a65894943947a
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/loadenv/loadenv.cxx | 6 | ||||
-rw-r--r-- | framework/source/services/desktop.cxx | 18 |
2 files changed, 9 insertions, 15 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 243f8bc1007f..b5dac0f25687 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1383,8 +1383,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() css::uno::Reference< css::frame::XFrame > xResult; if (xTask.is()) xResult = xTask; - else - if (xHiddenTask.is()) + else if (xHiddenTask.is()) xResult = xHiddenTask; if (xResult.is()) @@ -1578,8 +1577,7 @@ void LoadEnv::impl_reactForLoadingState() if (pWindow && pWindow->IsSystemWindow()) ((WorkWindow*)pWindow)->Minimize(); } - else - if (!bHidden) + else if (!bHidden) { // show frame ... if it's not still visible ... // But do nothing if it's already visible! diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 8a03aa331b83..713ad4ad93e1 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1068,8 +1068,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r // I.II) "_top" // We are top by definition //----------------------------------------------------------------------------------------------------- - else - if ( sTargetFrameName==SPECIALTARGET_TOP ) + else if ( sTargetFrameName==SPECIALTARGET_TOP ) { xTarget = this; } @@ -1078,11 +1077,10 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r // I.III) "_self", "" // This mean this "frame" in every case. //----------------------------------------------------------------------------------------------------- - else - if ( - ( sTargetFrameName==SPECIALTARGET_SELF ) || - ( sTargetFrameName.isEmpty() ) - ) + else if ( + ( sTargetFrameName==SPECIALTARGET_SELF ) || + ( sTargetFrameName.isEmpty() ) + ) { xTarget = this; } @@ -1414,8 +1412,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio xFilterSelect->select(); } } - else - if( aRequest >>= aErrorCodeRequest ) + else if( aRequest >>= aErrorCodeRequest ) { sal_Bool bWarning = ((aErrorCodeRequest.ErrCode & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK); if (xApprove.is() && bWarning) @@ -1427,8 +1424,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio bAbort = sal_True; } } - else - if( xAbort.is() ) + else if( xAbort.is() ) { xAbort->select(); bAbort = sal_True; |