summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/DocumentRedlineManager.cxx2
-rw-r--r--sw/source/core/doc/docfld.cxx2
-rw-r--r--sw/source/core/docnode/nodes.cxx2
-rw-r--r--sw/source/core/layout/flycnt.cxx4
-rw-r--r--sw/source/core/layout/sectfrm.cxx2
-rw-r--r--sw/source/core/layout/trvlfrm.cxx2
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx2
-rw-r--r--sw/source/core/text/porlay.cxx2
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx4
-rw-r--r--sw/source/core/unocore/unofield.cxx2
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx2
-rw-r--r--sw/source/uibase/app/swmodul1.cxx2
-rw-r--r--sw/source/uibase/frmdlg/frmmgr.cxx4
-rw-r--r--sw/source/uibase/shells/textfld.cxx2
-rw-r--r--sw/source/uibase/uno/unomod.cxx2
-rw-r--r--sw/source/uibase/utlui/content.cxx2
18 files changed, 21 insertions, 21 deletions
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index dbd288c0662b..5fc5ada08205 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -2709,7 +2709,7 @@ void DocumentRedlineManager::checkRedlining(RedlineFlags& _rReadlineMode)
SwEditShell* pEditShell = m_rDoc.GetEditShell();
vcl::Window* pParent = pEditShell ? pEditShell->GetWin() : nullptr;
if ( pParent && !mbReadlineChecked && rRedlineTable.size() > MAX_REDLINE_COUNT
- && !((_rReadlineMode & RedlineFlags::ShowDelete) == RedlineFlags::ShowDelete) )
+ && ((_rReadlineMode & RedlineFlags::ShowDelete) != RedlineFlags::ShowDelete) )
{
ScopedVclPtrInstance< MessageDialog > aQuery(pParent, "QueryShowChangesDialog", "modules/swriter/ui/queryshowchangesdialog.ui");
sal_uInt16 nResult = aQuery->Execute();
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 90c44f70ab60..d63795dfe189 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -903,7 +903,7 @@ void SwDocUpdateField::MakeFieldList_( SwDoc& rDoc, int eGetMode )
break;
case SwFieldIds::SetExp:
- if ( !(eGetMode == GETFLD_EXPAND) ||
+ if ( (eGetMode != GETFLD_EXPAND) ||
(nsSwGetSetExpType::GSE_STRING & pField->GetSubType()) )
{
sFormula = sTrue;
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index c9f3ad9c22ce..4fb732b02da1 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -956,7 +956,7 @@ void SwNodes::SectionUp(SwNodeRange *pRange)
if( pRange->aStart >= pRange->aEnd ||
pRange->aEnd >= Count() ||
!CheckNodesRange( pRange->aStart, pRange->aEnd ) ||
- !( HighestLevel( *this, *pRange ) > 1 ))
+ ( HighestLevel( *this, *pRange ) <= 1 ))
return;
// If the beginning of a range is before or at a start node position, so
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 87d3bba45400..034c3a9fc754 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -133,8 +133,8 @@ void SwFlyAtContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pN
else
pContent = pContent->GetPrevContentFrame();
} while ( pContent &&
- !( bBodyFootnote == ( pContent->IsInDocBody() ||
- pContent->IsInFootnote() ) ) );
+ ( bBodyFootnote != ( pContent->IsInDocBody() ||
+ pContent->IsInFootnote() ) ) );
if ( pContent )
aOldIdx = *pContent->GetNode();
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 3a1eafa2c746..2b6def165059 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -673,7 +673,7 @@ void SwSectionFrame::MoveContentAndDelete( SwSectionFrame* pDel, bool bSave )
{ // Here we can insert ourselves at the beginning
pUp = FirstLeaf( pNxtSct );
pPrv = nullptr;
- if( pPrvSct && !( pPrvSct->GetFormat() == pParent ) )
+ if( pPrvSct && ( pPrvSct->GetFormat() != pParent ) )
pPrvSct = nullptr; // In order that nothing is merged
}
else if( pPrvSct && pPrvSct->GetFormat() == pParent )
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index b028322d8601..1225e6f65f41 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2242,7 +2242,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor)
Sub( aRegion, aTmp );
// The next statement means neither ruby nor rotate(90):
- if( !( MultiPortionType::RUBY == pEnd2Pos->nMultiType ) )
+ if( MultiPortionType::RUBY != pEnd2Pos->nMultiType )
{
SwTwips nTmp = fnRectX.GetTop(pEnd2Pos->aLine);
if( fnRectX.GetTop(aEndRect) != nTmp )
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index bd50b93d0012..cb4f6b37711b 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -235,7 +235,7 @@ bool lcl_HasPreviousParaSameNumRule( const SwTextNode& rNode )
const SwNode* pNode = &rNode;
const SwNumRule* pNumRule = rNode.GetNumRule();
- while (! (pNode == rNodes.DocumentSectionStartNode(const_cast<SwNode*>(static_cast<SwNode const *>(&rNode))) ) )
+ while (pNode != rNodes.DocumentSectionStartNode(const_cast<SwNode*>(static_cast<SwNode const *>(&rNode))) )
{
--aIdx;
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index e115bbe2d402..86b38b6d006d 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -602,7 +602,7 @@ void SwLineLayout::MaxAscentDescent( SwTwips& _orAscent,
const bool bFlyCmp = pTmpPortion->IsFlyCntPortion() ?
static_cast<const SwFlyCntPortion*>(pTmpPortion)->IsMax() :
- !( pTmpPortion == _pDontConsiderPortion );
+ ( pTmpPortion != _pDontConsiderPortion );
if ( bFlyCmp )
{
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index e68b019b24d7..193b3a654eb7 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1802,7 +1802,7 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
SwTextAttr * const pHt = m_pSwpHints->Get(n);
const sal_Int32 nAttrStartIdx = pHt->GetStart();
- if (!( nAttrStartIdx < nEnd))
+ if ( nAttrStartIdx >= nEnd )
break;
const sal_Int32 * const pEndIdx = pHt->GetEnd();
@@ -2163,7 +2163,7 @@ void SwTextNode::CutImpl( SwTextNode * const pDest, const SwIndex & rDestStart,
{
SwTextAttr * const pHt = m_pSwpHints->Get(nAttrCnt);
const sal_Int32 nAttrStartIdx = pHt->GetStart();
- if (!( nAttrStartIdx < nEnd ))
+ if ( nAttrStartIdx >= nEnd )
break;
const sal_Int32 * const pEndIdx = pHt->GetEnd();
const sal_uInt16 nWhich = pHt->Which();
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index d5c26341af07..7f5b6e96242e 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2985,7 +2985,7 @@ uno::Any SAL_CALL SwXFieldEnumeration::nextElement()
{
SolarMutexGuard aGuard;
- if (!(m_pImpl->m_nNextIndex < (sal_Int32)m_pImpl->m_Items.size()))
+ if (m_pImpl->m_nNextIndex >= (sal_Int32)m_pImpl->m_Items.size())
throw container::NoSuchElementException(
"SwXFieldEnumeration::nextElement",
css::uno::Reference<css::uno::XInterface>());
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 86c75d4b22e0..970f53c2e7a2 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2998,7 +2998,7 @@ void AttributeOutputBase::TextField( const SwFormatField& rField )
case REF_SEQUENCEFLD:
{
// Not implemented for RTF
- if(!(GetExport().GetExportFormat() != MSWordExportBase::ExportFormat::RTF))
+ if(GetExport().GetExportFormat() == MSWordExportBase::ExportFormat::RTF)
break;
switch (pField->GetFormat())
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index d82801072abc..8dc161d582d4 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2146,7 +2146,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
// we should verify that bits.iType & nWhich concur
OSL_ENSURE( iType == nWhich, "something wrong, expect control type read from stream doesn't match nWhich passed in");
- if ( !( iType == nWhich ) )
+ if ( iType != nWhich )
return; // bail out
sal_uInt8 iRes = (bits1 & 0x7C) >> 2;
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 88b2e8f5e30e..d2ab2ce96c8d 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1433,7 +1433,7 @@ sal_Int32 SwFramePage::FillPosLB(const FrameMap* _pMap,
// i#22341 - add condition to handle map <aVCharMap>
// that is ambiguous in the alignment.
if ( _pMap[i].nAlign == _nAlign &&
- ( !(_pMap == aVCharMap) || _pMap[i].nLBRelations & nLBRelations ) )
+ ( (_pMap != aVCharMap) || _pMap[i].nLBRelations & nLBRelations ) )
{
sSelEntry = sEntry;
}
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 192511fa587b..49067db87393 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -421,7 +421,7 @@ void SwModule::SetRedlineAuthor(const OUString &rAuthor)
OUString SwModule::GetRedlineAuthor(std::size_t nPos)
{
OSL_ENSURE(nPos < m_pAuthorNames.size(), "author not found!"); //#i45342# RTF doc with no author table caused reader to crash
- while(!(nPos < m_pAuthorNames.size()))
+ while(nPos >= m_pAuthorNames.size())
{
InsertRedlineAuthor("nn");
}
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 7cd7c2702333..2bf04a3cce44 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -335,8 +335,8 @@ void SwFlyFrameAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
// aligned at character or top of line in a special case
else if ((eAnchorType == RndStdIds::FLY_AT_PARA) ||
((eAnchorType == RndStdIds::FLY_AT_CHAR) &&
- !(rVal.nVRelOrient == text::RelOrientation::CHAR) &&
- !(rVal.nVRelOrient == text::RelOrientation::TEXT_LINE) ) )
+ (rVal.nVRelOrient != text::RelOrientation::CHAR) &&
+ (rVal.nVRelOrient != text::RelOrientation::TEXT_LINE) ) )
{
if (rVal.nHPos + rVal.nWidth > aBoundRect.Right())
{
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 94ae920530cf..5e4dfeaef768 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -644,7 +644,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
bIsUrl = pIsUrl->GetValue();
SwScriptField* pField = static_cast<SwScriptField*>(aMgr.GetCurField());
- bNew = !pField || !(pField->GetTyp()->Which() == SwFieldIds::Script);
+ bNew = !pField || (pField->GetTyp()->Which() != SwFieldIds::Script);
bUpdate = pField && ( bIsUrl != (bool)pField->GetFormat() || pField->GetPar2() != aType || pField->GetPar1() != aText );
}
else
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index a41e1f40b1e2..3cd3772ea3fa 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -354,7 +354,7 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo,
sal_Int16 nTmp = 0;
rValue >>= nTmp;
SwPostItMode nVal = static_cast<SwPostItMode>(nTmp);
- if(!(nVal <= SwPostItMode::EndPage))
+ if(nVal > SwPostItMode::EndPage)
throw lang::IllegalArgumentException();
mpPrtOpt->SetPrintPostIts(nVal);
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index f7c6cc627f39..9b59a912c722 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1379,7 +1379,7 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
assert(!pChild || lcl_IsContentType(pChild) || dynamic_cast<SwOutlineContent*>(static_cast<SwTypeNumber*>(pChild->GetUserData())));
while(pChild &&
lcl_IsContent(pChild) &&
- !(static_cast<SwOutlineContent*>(pChild->GetUserData())->GetOutlineLevel() < nLevel)
+ (static_cast<SwOutlineContent*>(pChild->GetUserData())->GetOutlineLevel() >= nLevel)
)
{
pChild = Prev(pChild);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 00:30:13 +0000