summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/Accessibility/AccessibleContextBase.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx2
-rw-r--r--sc/source/ui/docshell/docsh2.cxx4
-rw-r--r--sc/source/ui/formdlg/formula.cxx2
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx4
-rw-r--r--sc/source/ui/view/cellsh.cxx2
-rw-r--r--sc/source/ui/view/output.cxx2
-rw-r--r--sc/source/ui/view/select.cxx2
-rw-r--r--sc/source/ui/view/tabview2.cxx2
9 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 14d660c7fd91..f775a1137459 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -384,7 +384,7 @@ void SAL_CALL
return;
SolarMutexGuard aGuard;
- if (!(!IsDefunc() && mnClientId))
+ if (IsDefunc() || !mnClientId)
return;
sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 737590610bf5..836e63e0c28b 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -684,7 +684,7 @@ void ScChildrenShapes::Select(sal_Int32 nIndex)
return;
uno::Reference<drawing::XShape> xShape;
- if (!(!IsSelected(nIndex, xShape) && maZOrderedShapes[nIndex]->bSelectable))
+ if (IsSelected(nIndex, xShape) || !maZOrderedShapes[nIndex]->bSelectable)
return;
uno::Reference<drawing::XShapes> xShapes(mpViewShell->getSelectedXShapes());
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index f9aca0c64d6c..1c819a021ae2 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -114,8 +114,8 @@ void ScDocShell::InitItems()
PutItem( SvxColorListItem( XColorList::GetStdColorList(), SID_COLOR_TABLE ) );
}
- if (!(!utl::ConfigManager::IsFuzzing() &&
- (!m_aDocument.GetForbiddenCharacters() || !m_aDocument.IsValidAsianCompression() || !m_aDocument.IsValidAsianKerning())))
+ if (utl::ConfigManager::IsFuzzing() ||
+ (m_aDocument.GetForbiddenCharacters() && m_aDocument.IsValidAsianCompression() && m_aDocument.IsValidAsianKerning()))
return;
// get settings from SvxAsianConfig
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index c21a8d859cbc..4c756ca3b646 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -484,7 +484,7 @@ bool ScFormulaDlg::IsDocAllowed(SfxObjectShell* pDocSh) const
{
// not allowed: different from this doc, and no name
// pDocSh is always a ScDocShell
- return !(pDocSh && &static_cast<ScDocShell*>(pDocSh)->GetDocument() != m_pDoc && !pDocSh->HasName()); // everything else is allowed
+ return !pDocSh || &static_cast<ScDocShell*>(pDocSh)->GetDocument() == m_pDoc || pDocSh->HasName(); // everything else is allowed
}
void ScFormulaDlg::SetActive()
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index b4b9e6498c21..bf47a5608406 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1680,7 +1680,7 @@ ScDocument* ScCellRangesBase::GetDocument() const
void ScCellRangesBase::InitInsertRange(ScDocShell* pDocSh, const ScRange& rR)
{
- if ( !(!pDocShell && pDocSh) )
+ if ( pDocShell || !pDocSh )
return;
pDocShell = pDocSh;
@@ -3238,7 +3238,7 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe
chart::XChartDataChangeEventListener >& aListener )
{
SolarMutexGuard aGuard;
- if ( !(pDocShell && !aRanges.empty()) )
+ if ( !pDocShell || aRanges.empty() )
return;
//! test for duplicates ?
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index ff7e37538c08..3885415df7a6 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -271,7 +271,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
//! is not called, when protected AND matrix, we will have
//! to live with this... is caught in Copy-Routine, otherwise
//! work is to be done once more
- if ( !(!bEditable && bOnlyNotBecauseOfMatrix) )
+ if ( bEditable || !bOnlyNotBecauseOfMatrix )
bNeedEdit = false; // allowed when protected/ReadOnly
bDisable = GetObjectShell()->isContentExtractionLocked();
break;
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 1a73ffb7169e..046c70e4b4b1 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -2068,7 +2068,7 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
if (bRight)
mpDev->DrawLine( Point( nMaxX, nMinY ), Point( nMaxX, nMaxY ) );
}
- if ( !(bHandle && bRight && bBottom && !comphelper::LibreOfficeKit::isActive()) )
+ if ( !bHandle || !bRight || !bBottom || comphelper::LibreOfficeKit::isActive() )
return;
mpDev->SetLineColor( rColor );
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index e1463ccebf53..3aa42c29a77f 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -166,7 +166,7 @@ void ScViewFunctionSet::BeginDrag()
ScMarkData& rMark = pViewData->GetMarkData();
rMark.MarkToSimple();
- if ( !(rMark.IsMarked() && !rMark.IsMultiMarked()) )
+ if ( !rMark.IsMarked() || rMark.IsMultiMarked() )
return;
ScDocumentUniquePtr pClipDoc(new ScDocument( SCDOCMODE_CLIP ));
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 99eb33fa9670..7442cb261acb 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -411,7 +411,7 @@ void ScTabView::DoneBlockMode( bool bContinue )
// because the other engine does not have any anchor.
// bMoveIsShift prevents the selection to be canceled.
- if (!(IsBlockMode() && !bMoveIsShift))
+ if (!IsBlockMode() || bMoveIsShift)
return;
ScMarkData& rMark = aViewData.GetMarkData();