Kaydet (Commit) e7d7a1ed authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:simplifybool

Change-Id: If72974c49113c64b3ac6269779c5013c554ebdcc
üst b36e8678
...@@ -207,7 +207,7 @@ throw( uno::RuntimeException, std::exception ) ...@@ -207,7 +207,7 @@ throw( uno::RuntimeException, std::exception )
// we must destroy the plugin before the parent is destroyed // we must destroy the plugin before the parent is destroyed
xWindow->addEventListener( this ); xWindow->addEventListener( this );
xFrame->setComponent( xWindow, uno::Reference < frame::XController >() ); xFrame->setComponent( xWindow, uno::Reference < frame::XController >() );
return mxPlugin.is() ? sal_True : sal_False; return mxPlugin.is();
} }
return sal_False; return sal_False;
......
...@@ -1317,7 +1317,7 @@ sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException, std::except ...@@ -1317,7 +1317,7 @@ sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException, std::except
{ {
SfxModelGuard aGuard( *this ); SfxModelGuard aGuard( *this );
return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->IsModified() : sal_False; return m_pData->m_pObjectShell.Is() && m_pData->m_pObjectShell->IsModified();
} }
...@@ -1480,7 +1480,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException, std::excep ...@@ -1480,7 +1480,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException, std::excep
{ {
SfxModelGuard aGuard( *this ); SfxModelGuard aGuard( *this );
return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->HasName() : sal_False; return m_pData->m_pObjectShell.Is() && m_pData->m_pObjectShell->HasName();
} }
...@@ -1511,7 +1511,7 @@ sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException, std::except ...@@ -1511,7 +1511,7 @@ sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException, std::except
{ {
SfxModelGuard aGuard( *this ); SfxModelGuard aGuard( *this );
return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->IsReadOnly() : sal_True; return !m_pData->m_pObjectShell.Is() || m_pData->m_pObjectShell->IsReadOnly();
} }
......
...@@ -623,7 +623,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime ...@@ -623,7 +623,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime
if (bool(bSuspend) == m_pData->m_bSuspendState) if (bool(bSuspend) == m_pData->m_bSuspendState)
return sal_True; return sal_True;
if ( bSuspend == sal_True ) if ( bSuspend )
{ {
if ( !m_pData->m_pViewShell ) if ( !m_pData->m_pViewShell )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment