diff options
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/wrtww8gr.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 1986429414b2..6ad2e8703a35 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -449,8 +449,8 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame) // Otherwise, an additional paragraph is exported for a graphic, which is // forced to be treated as inline, because it's anchored inside another frame. if ( !rFrame.IsInline() && - ( ((eAn == RndStdIds::FLY_AT_PARA)) || - (eAn == RndStdIds::FLY_AT_PAGE)) ) + ( (eAn == RndStdIds::FLY_AT_PARA) || + (eAn == RndStdIds::FLY_AT_PAGE) ) ) { WriteChar( (char)0x0d ); // close the surrounding frame with CR diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 77009b764fed..1567b40e4676 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -258,7 +258,7 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, SwDocShell* pDocShell, s { rStrm.ReadBytes(aGuid, 16); - if( (memcmp(aGuid, aGuidFileMoniker, 16) == 0) ) + if( memcmp(aGuid, aGuidFileMoniker, 16) == 0 ) { rStrm.ReadUInt16( nLevel ); xShortName.reset(new OUString(read_uInt32_lenPrefixed_uInt8s_ToOUString(rStrm, GetCharSetFromLanguage()))); @@ -278,7 +278,7 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, SwDocShell* pDocShell, s else lclGetAbsPath( *xShortName, nLevel, pDocShell); } - else if( (memcmp(aGuid, aGuidUrlMoniker, 16) == 0) ) + else if( memcmp(aGuid, aGuidUrlMoniker, 16) == 0 ) { sal_uInt32 nStrLen(0); rStrm.ReadUInt32( nStrLen ); @@ -4462,7 +4462,7 @@ void wwSectionManager::InsertSegments() (aIter->GetPageHeight() == aNext->GetPageHeight()) && (aIter->IsLandScape() == aNext->IsLandScape())); - if (((aNext != aEnd && aNext->IsContinuous() && bThisAndNextAreCompatible) || bProtected)) + if ((aNext != aEnd && aNext->IsContinuous() && bThisAndNextAreCompatible) || bProtected) { bIgnoreCols = true; if ((aIter->NoCols() > 1) || bProtected) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index ddff8244e7f7..bc244fe62acb 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -526,10 +526,8 @@ void wwSectionManager::GetPageULData(const wwSection &rSection, even pages, something we cannot do. So we will put it on top of all pages, that way the pages are at least the right size. */ - if ( - (!mrReader.m_bVer67 && mrReader.m_pWDop->iGutterPos && + if (!mrReader.m_bVer67 && mrReader.m_pWDop->iGutterPos && rSection.maSep.fRTLGutter) - ) { nWWUp += rSection.maSep.dzaGutter; } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 0341eb26eb80..6e75c781bdde 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1107,7 +1107,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) if( nSprmId ) { // move Sprm Id and Sprm Param to internal mini storage: - aShortSprm[0] = (sal_uInt8)( ( nSprmId & 0x00ff) ); + aShortSprm[0] = (sal_uInt8) ( nSprmId & 0x00ff) ; aShortSprm[1] = (sal_uInt8)( ( nSprmId & 0xff00) >> 8 ); aShortSprm[2] = (sal_uInt8)( nPrm >> 8 ); |