summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-12-04 11:20:03 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-12-05 07:49:30 +0100
commite4472d3c139294499f4c0caeebd9d4e995958eb0 (patch)
tree3e62a6530f8b758dddab18981ee38cc76ecaef9e /sw
parent126e5a4d5b1d6c7ba5b313786793a38f99488b33 (diff)
loplugin:unnecessaryparen include more assignments
Change-Id: I9fb8366634b31230b732dd38a98f800075529714 Reviewed-on: https://gerrit.libreoffice.org/64510 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/swcrsr.hxx6
-rw-r--r--sw/inc/unocrsr.hxx12
-rw-r--r--sw/source/core/attr/swatrset.cxx2
-rw-r--r--sw/source/core/bastyp/breakit.cxx6
-rw-r--r--sw/source/core/doc/docnew.cxx2
-rw-r--r--sw/source/core/docnode/nodes.cxx6
-rw-r--r--sw/source/core/docnode/threadmanager.cxx2
-rw-r--r--sw/source/core/layout/anchoredobject.cxx2
-rw-r--r--sw/source/core/layout/pagechg.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx4
-rw-r--r--sw/source/core/text/guess.cxx2
-rw-r--r--sw/source/core/text/inftxt.cxx2
-rw-r--r--sw/source/core/text/txtfly.cxx2
-rw-r--r--sw/source/core/text/wrong.cxx2
-rw-r--r--sw/source/core/unocore/unofield.cxx4
-rw-r--r--sw/source/core/unocore/unoportenum.cxx10
-rw-r--r--sw/source/filter/html/css1atr.cxx2
-rw-r--r--sw/source/filter/html/htmlsect.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/ui/config/optcomp.cxx2
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx2
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx4
-rw-r--r--sw/source/uibase/uiview/view.cxx4
-rw-r--r--sw/source/uibase/utlui/shdwcrsr.cxx2
-rw-r--r--sw/source/uibase/web/wview.cxx4
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx2
26 files changed, 46 insertions, 46 deletions
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 5c9214dc2d00..c463fdf37b33 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -184,9 +184,9 @@ public:
// Is there a selection of content in table?
// Return value indicates if cursor remains at its old position.
virtual bool IsSelOvr( SwCursorSelOverFlags eFlags =
- ( SwCursorSelOverFlags::CheckNodeSection |
- SwCursorSelOverFlags::Toggle |
- SwCursorSelOverFlags::ChangePos ));
+ SwCursorSelOverFlags::CheckNodeSection |
+ SwCursorSelOverFlags::Toggle |
+ SwCursorSelOverFlags::ChangePos );
bool IsInProtectTable( bool bMove = false,
bool bChgCursor = true );
bool IsNoContent() const;
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 038aff7110c0..bcc0a5f27ae8 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -55,9 +55,9 @@ public:
// Does a selection of content exist in table?
// Return value indicates if the cursor remains at its old position.
virtual bool IsSelOvr( SwCursorSelOverFlags eFlags =
- ( SwCursorSelOverFlags::CheckNodeSection |
- SwCursorSelOverFlags::Toggle |
- SwCursorSelOverFlags::ChangePos )) override;
+ SwCursorSelOverFlags::CheckNodeSection |
+ SwCursorSelOverFlags::Toggle |
+ SwCursorSelOverFlags::ChangePos ) override;
virtual bool IsReadOnlyAvailable() const override;
@@ -91,9 +91,9 @@ public:
// Does a selection of content exist in table?
// Return value indicates if the cursor remains at its old position.
virtual bool IsSelOvr( SwCursorSelOverFlags eFlags =
- ( SwCursorSelOverFlags::CheckNodeSection |
- SwCursorSelOverFlags::Toggle |
- SwCursorSelOverFlags::ChangePos )) override;
+ SwCursorSelOverFlags::CheckNodeSection |
+ SwCursorSelOverFlags::Toggle |
+ SwCursorSelOverFlags::ChangePos ) override;
void MakeBoxSels();
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 51166259b046..a4e19fe39776 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -80,7 +80,7 @@ void SwAttrPool::createAndAddSecondaryPools()
// #75371# change DefaultItems for the SdrEdgeObj distance items
// to TWIPS.
// 1/100th mm in twips
- const long nDefEdgeDist = ((500 * 72) / 127);
+ const long nDefEdgeDist = (500 * 72) / 127;
pSdrPool->SetPoolDefaultItem(SdrEdgeNode1HorzDistItem(nDefEdgeDist));
pSdrPool->SetPoolDefaultItem(SdrEdgeNode1VertDistItem(nDefEdgeDist));
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 3427c483a04b..fe1e9e49ca77 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -127,9 +127,9 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rText, sal_Int32 nPos
SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rText ) const
{
- const SvtScriptType coAllScripts = ( SvtScriptType::LATIN |
- SvtScriptType::ASIAN |
- SvtScriptType::COMPLEX );
+ const SvtScriptType coAllScripts = SvtScriptType::LATIN |
+ SvtScriptType::ASIAN |
+ SvtScriptType::COMPLEX;
SvtScriptType nRet = SvtScriptType::NONE;
sal_uInt16 nScript = 0;
if (!rText.isEmpty())
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index ed0f0529de6f..bc36cbc1a6ad 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -1237,7 +1237,7 @@ else
// frames, otherwise the drawing layer gets confused.
if ( pTargetShell )
pTargetShell->SttEndDoc( false );
- aDelIdx -= (iDelNodes - 1);
+ aDelIdx -= iDelNodes - 1;
#ifdef DBG_UTIL
SAL_INFO( "sw.docappend", "iDelNodes: " << iDelNodes
<< " Idx: " << aDelIdx.GetNode().GetIndex()
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 57f44eb15483..40532b94ec51 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1739,8 +1739,8 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange,
< aInsPos.GetIndex() )
{
const long nDistance =
- ( pCurrentNode->EndOfSectionIndex() -
- aRg.aStart.GetIndex() );
+ pCurrentNode->EndOfSectionIndex() -
+ aRg.aStart.GetIndex();
if (nDistance < nNodeCnt)
nNodeCnt -= nDistance;
else
@@ -2208,7 +2208,7 @@ void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong nSz, bool bDel )
#endif
for (sal_uLong nCnt = 0; nCnt < nSz; nCnt++)
{
- SwNode* pNode = ((*this)[ nDelPos + nCnt ]);
+ SwNode* pNode = (*this)[ nDelPos + nCnt ];
SwTextNode * pTextNd = pNode->GetTextNode();
if (pTextNd)
diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index 46a75c490fb7..f500f29c5260 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -123,7 +123,7 @@ void ThreadManager::RemoveThread( const oslInterlockedCount nThreadID,
if ( aIter != maStartedThreads.end() )
{
- tThreadData aTmpThreadData( (*aIter) );
+ tThreadData aTmpThreadData( *aIter );
maStartedThreads.erase( aIter );
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index dc2cd1326855..cdebc37ee10b 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -858,7 +858,7 @@ Point SwAnchoredObject::GetRelPosToPageFrame( const bool _bFollowTextFlow,
}
if ( pFrame->IsCellFrame() )
{
- aRelPos -= ( pFrame->getFrameArea().Pos() + pFrame->getFramePrintArea().Pos() );
+ aRelPos -= pFrame->getFrameArea().Pos() + pFrame->getFramePrintArea().Pos();
_obRelToTableCell = true;
}
else
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 6c8df71ff7ad..b9f88938c409 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -2000,7 +2000,7 @@ static void lcl_MoveAllLowerObjs( SwFrame* pFrame, const Point& rOffset )
continue;
const Point& aCurrAnchorPos = pAnchoredDrawObj->GetDrawObj()->GetAnchorPos();
- const Point aNewAnchorPos( ( aCurrAnchorPos + rOffset ) );
+ const Point aNewAnchorPos( aCurrAnchorPos + rOffset );
pAnchoredDrawObj->DrawObj()->SetAnchorPos( aNewAnchorPos );
pAnchoredDrawObj->SetLastObjRect( pAnchoredDrawObj->GetObjRect().SVRect() );
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index e920046b1016..57d7d95da130 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -544,7 +544,7 @@ void SwLineRects::AddLineRect( const SwRect &rRect, const Color *pCol, const Svx
for (reverse_iterator it = aLineRects.rbegin(); it != aLineRects.rend();
++it)
{
- SwLineRect &rLRect = (*it);
+ SwLineRect &rLRect = *it;
// Test for the orientation, color, table
if ( rLRect.GetTab() == pTab &&
!rLRect.IsPainted() && rLRect.GetSubColor() == nSCol &&
@@ -596,7 +596,7 @@ void SwLineRects::ConnectEdges( OutputDevice const *pOut, SwPaintProperties cons
// Collect all lines to possibly link with i1
for (iterator it2 = aLineRects.begin(); it2 != aLineRects.end(); ++it2)
{
- SwLineRect &rL2 = (*it2);
+ SwLineRect &rL2 = *it2;
if ( rL2.GetTab() != rL1.GetTab() ||
rL2.IsPainted() ||
rL2.IsLocked() ||
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 3d225c139105..e966dfa6a9d7 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -93,7 +93,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, SwTextFormatInfo &rInf,
if ( rAdjust == SvxAdjust::Right || rAdjust == SvxAdjust::Center )
{
TextFrameIndex nSpaceCnt(0);
- for (sal_Int32 i = (rInf.GetText().getLength() - 1);
+ for (sal_Int32 i = rInf.GetText().getLength() - 1;
sal_Int32(rInf.GetIdx()) <= i; --i)
{
sal_Unicode cChar = rInf.GetText()[i];
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 310b9f045595..7f56b1216d6c 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1215,7 +1215,7 @@ void SwTextPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
nIdx = GetIdx();
nLen = pPos->GetLen();
- for (TextFrameIndex i = (nIdx + nLen - TextFrameIndex(1));
+ for (TextFrameIndex i = nIdx + nLen - TextFrameIndex(1);
i >= nIdx; --i)
{
if (i < TextFrameIndex(GetText().getLength())
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 31f04c376233..ddeaa99b05db 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -286,7 +286,7 @@ const SwRect SwContourCache::ContourRect( const SwFormat* pFormat,
size_t nIdx = 0;
while( nIdx < nCount && (*pTmp)[ nIdx ] < nXPos )
++nIdx;
- bool bOdd = (nIdx % 2);
+ bool bOdd = nIdx % 2;
bool bSet = true;
if( bOdd )
--nIdx; // within interval
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 8e334a232e6c..4bf9aed7c1ad 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -689,7 +689,7 @@ bool WrongListIterator::Check(TextFrameIndex & rStart, TextFrameIndex & rLen)
}
else if (rStart < m_CurrentIndex)
{
- rLen -= (m_CurrentIndex - rStart);
+ rLen -= m_CurrentIndex - rStart;
assert(0 < sal_Int32(rLen));
rStart = m_CurrentIndex;
}
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 34d6d784baa8..a75abdc77046 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2247,7 +2247,7 @@ SwXTextField::setPropertyValue(
case FIELD_PROP_DATE_TIME :
if (!m_pImpl->m_pProps->pDateTime)
m_pImpl->m_pProps->pDateTime.reset( new util::DateTime );
- rValue >>= (*m_pImpl->m_pProps->pDateTime);
+ rValue >>= *m_pImpl->m_pProps->pDateTime;
break;
case FIELD_PROP_PROP_SEQ:
rValue >>= m_pImpl->m_pProps->aPropSeq;
@@ -2433,7 +2433,7 @@ uno::Any SAL_CALL SwXTextField::getPropertyValue(const OUString& rPropertyName)
break;
case FIELD_PROP_DATE_TIME :
if (m_pImpl->m_pProps->pDateTime)
- aRet <<= (*m_pImpl->m_pProps->pDateTime);
+ aRet <<= *m_pImpl->m_pProps->pDateTime;
break;
case FIELD_PROP_PROP_SEQ:
aRet <<= m_pImpl->m_pProps->aPropSeq;
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 1ba5b3f760a5..06e4240294cd 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -615,7 +615,7 @@ static void lcl_ExportBookmark(
{
for ( SwXBookmarkPortion_ImplList::iterator aIter = rBkmArr.begin(), aEnd = rBkmArr.end(); aIter != aEnd; )
{
- const SwXBookmarkPortion_ImplSharedPtr& pPtr = (*aIter);
+ const SwXBookmarkPortion_ImplSharedPtr& pPtr = *aIter;
if ( nIndex > pPtr->getIndex() )
{
if (bOnlyFrameStarts)
@@ -1124,7 +1124,7 @@ static void lcl_ExportRedline(
for ( SwXRedlinePortion_ImplList::iterator aIter = rRedlineArr.begin(), aEnd = rRedlineArr.end();
aIter != aEnd; )
{
- SwXRedlinePortion_ImplSharedPtr pPtr = (*aIter );
+ SwXRedlinePortion_ImplSharedPtr pPtr = *aIter;
sal_Int32 nRealIndex = pPtr->getRealIndex();
// If there are elements before nIndex, remove them
if ( nIndex > nRealIndex )
@@ -1179,7 +1179,7 @@ static void lcl_ExportAnnotationStarts(
for ( SwAnnotationStartPortion_ImplList::iterator aIter = rAnnotationStartArr.begin(), aEnd = rAnnotationStartArr.end();
aIter != aEnd; )
{
- SwAnnotationStartPortion_ImplSharedPtr pPtr = (*aIter);
+ SwAnnotationStartPortion_ImplSharedPtr pPtr = *aIter;
if ( nIndex > pPtr->getIndex() )
{
aIter = rAnnotationStartArr.erase(aIter);
@@ -1269,12 +1269,12 @@ static sal_Int32 lcl_GetNextIndex(
sal_Int32 nRet = -1;
if(!rBkmArr.empty())
{
- SwXBookmarkPortion_ImplSharedPtr pPtr = (*rBkmArr.begin());
+ SwXBookmarkPortion_ImplSharedPtr pPtr = *rBkmArr.begin();
nRet = pPtr->getIndex();
}
if(!rRedlineArr.empty())
{
- SwXRedlinePortion_ImplSharedPtr pPtr = (*rRedlineArr.begin());
+ SwXRedlinePortion_ImplSharedPtr pPtr = *rRedlineArr.begin();
sal_Int32 nTmp = pPtr->getRealIndex();
if(nRet < 0 || nTmp < nRet)
nRet = nTmp;
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 09302c33651a..e9c6af23e09a 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2037,7 +2037,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
if( nFrameOpts & HtmlFrmOpts::SWidth )
nMode |= Css1FrameSize::Width;
if( nFrameOpts & HtmlFrmOpts::SHeight )
- nMode |= (Css1FrameSize::MinHeight|Css1FrameSize::FixHeight);
+ nMode |= Css1FrameSize::MinHeight|Css1FrameSize::FixHeight;
if( nFrameOpts & HtmlFrmOpts::SPixSize )
nMode |= Css1FrameSize::Pixel;
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 786e637a1b71..f33b7d1bf75c 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -783,7 +783,7 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
->GetContentNode();
SwPosition aNewPos( SwNodeIndex( rFlyCntIdx, 1 ), SwIndex( pCNd, 0 ) );
- const HtmlContextFlags nFlags = (HtmlContextFlags::ProtectStack|HtmlContextFlags::StripPara);
+ const HtmlContextFlags nFlags = HtmlContextFlags::ProtectStack|HtmlContextFlags::StripPara;
SaveDocContext( pCntxt, nFlags, &aNewPos );
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 072c42c9478f..a15842e28ddc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8289,7 +8289,7 @@ static boost::optional<sal_Int32> lcl_getDmlAlpha(const SvxBrushItem& rBrush)
// Calculate alpha value
// Consider oox/source/drawingml/color.cxx : getTransparency() function.
- sal_Int32 nAlpha = (::oox::drawingml::MAX_PERCENT - ( ::oox::drawingml::PER_PERCENT * nTransparencyPercent ) );
+ sal_Int32 nAlpha = ::oox::drawingml::MAX_PERCENT - ( ::oox::drawingml::PER_PERCENT * nTransparencyPercent );
oRet = nAlpha;
}
return oRet;
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 07e9aa06022c..1204eacc6314 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -57,7 +57,7 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxIt
get(m_pOptionsLB, "options");
get(m_pDefaultPB, "default");
- for ( int i = (static_cast<int>(SvtCompatibilityEntry::Index::Module) + 1); i < static_cast<int>(SvtCompatibilityEntry::Index::INVALID); ++i )
+ for ( int i = static_cast<int>(SvtCompatibilityEntry::Index::Module) + 1; i < static_cast<int>(SvtCompatibilityEntry::Index::INVALID); ++i )
{
int nCoptIdx = i - 2; /* Do not consider "Name" & "Module" indexes */
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index f9997f9f9a9c..c83c469734cb 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -827,7 +827,7 @@ public:
uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties();
uno::Sequence< OUString > aNames( aProps.getLength() );
OUString* pString = aNames.getArray();
- OUString* pEnd = ( pString + aNames.getLength() );
+ OUString* pEnd = pString + aNames.getLength();
beans::Property* pProp = aProps.getArray();
for ( ; pString != pEnd; ++pString, ++pProp )
*pString = pProp->Name;
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 2355151e851c..7c25ed315d81 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -247,7 +247,7 @@ void SwPostItMgr::CheckForRemovedPostIts()
auto it = currentIt++;
if ( !(*it)->UseElement() )
{
- SwSidebarItem* p = (*it);
+ SwSidebarItem* p = *it;
currentIt = mvPostItFields.erase(std::remove(mvPostItFields.begin(), mvPostItFields.end(), *it), mvPostItFields.end());
if (GetActiveSidebarWin() == p->pPostIt)
SetActiveSidebarWin(nullptr);
@@ -303,7 +303,7 @@ void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast )
[&pBroadcast](const SwSidebarItem* pField) { return pField->GetBroadCaster() == pBroadcast; });
if (i != mvPostItFields.end())
{
- SwSidebarItem* p = (*i);
+ SwSidebarItem* p = *i;
if (GetActiveSidebarWin() == p->pPostIt)
SetActiveSidebarWin(nullptr);
// tdf#120487 remove from list before dispose, so comment window
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 2e048d72e617..153e33f6bad6 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -271,8 +271,8 @@ void SwView::SelectShell()
m_pLastTableFormat = pCurTableFormat;
//SEL_TBL and SEL_TBL_CELLS can be ORed!
- SelectionType nNewSelectionType = (m_pWrtShell->GetSelectionType()
- & ~SelectionType::TableCell);
+ SelectionType nNewSelectionType = m_pWrtShell->GetSelectionType()
+ & ~SelectionType::TableCell;
if ( m_pFormShell && m_pFormShell->IsActiveControl() )
nNewSelectionType |= SelectionType::FormControl;
diff --git a/sw/source/uibase/utlui/shdwcrsr.cxx b/sw/source/uibase/utlui/shdwcrsr.cxx
index a9238f3040b9..dcc2bbac6eee 100644
--- a/sw/source/uibase/utlui/shdwcrsr.cxx
+++ b/sw/source/uibase/utlui/shdwcrsr.cxx
@@ -48,7 +48,7 @@ void SwShadowCursor::SetPos( const Point& rPt, long nHeight, sal_uInt16 nMode )
void SwShadowCursor::DrawTri( const Point& rPt, long nHeight, bool bLeft )
{
- long nLineDiff = ( nHeight / 2 );
+ long nLineDiff = nHeight / 2;
long nLineDiffHalf = nLineDiff / 2;
// Dot above
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 7d8f7cd0eed2..c3f0c0f27ca7 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -104,8 +104,8 @@ void SwWebView::SelectShell()
}
SetLastTableFrameFormat(pCurTableFormat);
//SEL_TBL and SEL_TBL_CELLS can be ored!
- SelectionType nNewSelectionType = (GetWrtShell().GetSelectionType()
- & ~SelectionType::TableCell);
+ SelectionType nNewSelectionType = GetWrtShell().GetSelectionType()
+ & ~SelectionType::TableCell;
SelectionType _nSelectionType = GetSelectionType();
if ( nNewSelectionType == _nSelectionType )
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 233947209bbe..2d7685cfd3ae 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1409,7 +1409,7 @@ SelectionType SwWrtShell::GetSelectionType() const
nCnt |= SelectionType::Table;
if ( IsTableMode() )
- nCnt |= (SelectionType::Table | SelectionType::TableCell);
+ nCnt |= SelectionType::Table | SelectionType::TableCell;
// Do not pop up numbering toolbar, if the text node has a numbering of type SVX_NUM_NUMBER_NONE.
const SwNumRule* pNumRule = GetNumRuleAtCurrCursorPos();