diff options
Diffstat (limited to 'sw/source')
135 files changed, 462 insertions, 450 deletions
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index fe54ec1cd747..30adb4744335 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -133,7 +133,7 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons if (aValidateIt != mChildren.end()) { - OSL_ENSURE((*aValidateIt)->mpParent == this, "wrong parent"); + OSL_ENSURE((*aValidateIt)->mpParent == this, "wrong parent"); tSwNumberTreeChildren::const_iterator aIt = mItLastValid; @@ -406,7 +406,7 @@ void SwNumberTreeNode::MoveChildren(SwNumberTreeNode * pDest) mItLastValid = mChildren.end(); } - OSL_ENSURE(mChildren.empty(), "MoveChildren failed!"); + OSL_ENSURE(mChildren.empty(), "MoveChildren failed!"); #ifdef DBG_UTIL IsSane(false); diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index a00a8d04d465..ac2bb5a8c83c 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -2908,7 +2908,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde if (nRet == -1) throw lang::IndexOutOfBoundsException(); - return nRet; + return nRet; } // #i71360#, #i108125# - adjustments for change tracking text markup diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 03fc575e9064..d1cfb08c29c6 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -752,7 +752,7 @@ uno::Any SwAccessibleTable::queryInterface( const uno::Type& rType ) if ( rType == cppu::UnoType<XAccessibleTable>::get() ) { uno::Reference<XAccessibleTable> xThis( this ); - aRet <<= xThis; + aRet <<= xThis; } else if ( rType == cppu::UnoType<XAccessibleSelection>::get() ) { diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 6abbbb51faea..705c49accd79 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -241,10 +241,10 @@ SwCacheObj *SwCache::Get( const void *pOwner, const sal_uInt16 nIndex, } #ifdef DBG_UTIL - if ( pRet ) - ++m_nGetSuccess; - else - ++m_nGetFail; + if ( pRet ) + ++m_nGetSuccess; + else + ++m_nGetFail; #endif return pRet; diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 01d046185e61..f99e4a7c2978 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1913,11 +1913,11 @@ bool SwContentAtPos::IsInRTLText()const SwTextFrame* pTmpFrame = aIter.First(); while( pTmpFrame ) { - if ( !pTmpFrame->IsFollow()) - { - bRet = pTmpFrame->IsRightToLeft(); - break; - } + if ( !pTmpFrame->IsFollow()) + { + bRet = pTmpFrame->IsRightToLeft(); + break; + } pTmpFrame = aIter.Next(); } } diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index bb6b5d34fa38..c115c9b359b9 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -571,12 +571,12 @@ bool SwAttrCheckArr::SetAttrBwd( const SwTextAttr& rAttr ) { *pCmp = *pArrPtr; nFound++; + } + pArrPtr->nWhich = 0; + if( !--nStackCnt ) + break; } - pArrPtr->nWhich = 0; - if( !--nStackCnt ) - break; } - } bool bContinue = false; if( SfxItemState::DONTCARE == eState ) diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 669a2d4f7f00..cd58106998bc 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -1844,7 +1844,7 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, // Move cursor to non-covered cell: const SwTableNode* pTableNd = pTableBoxStartNode->FindTableNode(); pTableBox = & pTableBox->FindStartOfRowSpan( pTableNd->GetTable() ); - SwNodeIndex& rPtIdx = GetPoint()->nNode; + SwNodeIndex& rPtIdx = GetPoint()->nNode; SwNodeIndex aNewIdx( *pTableBox->GetSttNd() ); rPtIdx = aNewIdx; diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index e0f913357f4b..9f411c82424a 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -72,7 +72,7 @@ void DocumentDeviceManager::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDe { if ( bDeleteOld ) mpPrt.disposeAndClear(); - mpPrt = pP; + mpPrt = pP; // our printer should always use TWIP. Don't rely on this being set in SwViewShell::InitPrt, there // are situations where this isn't called. #i108712# diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index be8979dc7107..25894d35ff02 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -487,33 +487,33 @@ Hash::Hash( sal_uLong nSize ) : nCount(1) { -static const sal_uLong primes[] = -{ - 509, - 1021, - 2039, - 4093, - 8191, - 16381, - 32749, - 65521, - 131071, - 262139, - 524287, - 1048573, - 2097143, - 4194301, - 8388593, - 16777213, - 33554393, - 67108859, /* Preposterously large . . . */ - 134217689, - 268435399, - 536870909, - 1073741789, - 2147483647, - 0 -}; + static const sal_uLong primes[] = + { + 509, + 1021, + 2039, + 4093, + 8191, + 16381, + 32749, + 65521, + 131071, + 262139, + 524287, + 1048573, + 2097143, + 4194301, + 8388593, + 16777213, + 33554393, + 67108859, /* Preposterously large . . . */ + 134217689, + 268435399, + 536870909, + 1073741789, + 2147483647, + 0 + }; int i; pDataArr.reset( new HashData[ nSize ] ); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index a0af3db35e37..396fbc042f40 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -268,7 +268,7 @@ SwFlyFrameFormat* SwDoc::MakeFlySection_( const SwPosition& rAnchPos, if( pNoTextNode ) { // Set size - Size aSize( pNoTextNode->GetTwipSize() ); + Size aSize( pNoTextNode->GetTwipSize() ); if( MINFLY > aSize.Width() ) aSize.setWidth( DEF_FLY_WIDTH ); aFormatSize.SetWidth( aSize.Width() ); @@ -346,7 +346,7 @@ SwFlyFrameFormat* SwDoc::MakeFlySection( RndStdIds eAnchorType, pNewTextNd->SetAttr(*pItem); } - pFormat = MakeFlySection_( *pAnchorPos, *pNewTextNd, + pFormat = MakeFlySection_( *pAnchorPos, *pNewTextNd, eAnchorType, pFlySet, pFrameFormat ); } return pFormat; @@ -1091,7 +1091,7 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable pNewSet->Put( pOldFormat->GetAnchor() ); // The new one should be variable in its height! - Size aSz( rSdrObj.GetCurrentBoundRect().GetSize() ); + Size aSz( rSdrObj.GetCurrentBoundRect().GetSize() ); SwFormatFrameSize aFrameSize( ATT_MIN_SIZE, aSz.Width(), aSz.Height() ); pNewSet->Put( aFrameSize ); diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index d17b8202d699..e3c9a6b5b116 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -426,8 +426,8 @@ SwDoc::~SwDoc() // Release the BaseLinks { - ::sfx2::SvLinkSources aTemp(getIDocumentLinksAdministration().GetLinkManager().GetServers()); - for( const auto& rpLinkSrc : aTemp ) + ::sfx2::SvLinkSources aTemp(getIDocumentLinksAdministration().GetLinkManager().GetServers()); + for( const auto& rpLinkSrc : aTemp ) rpLinkSrc->Closed(); if( !getIDocumentLinksAdministration().GetLinkManager().GetLinks().empty() ) @@ -1147,12 +1147,12 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu aIndexBefore--; #ifdef DBG_UTIL - SAL_INFO( "sw.docappend", "CopyRange In: " << CNTNT_DOC( this ) ); + SAL_INFO( "sw.docappend", "CopyRange In: " << CNTNT_DOC( this ) ); #endif rSource.getIDocumentContentOperations().CopyRange( aCpyPam, rInsPos, /*bCopyAll=*/true, /*bCheckPos=*/true ); // Note: aCpyPam is invalid now #ifdef DBG_UTIL - SAL_INFO( "sw.docappend", "CopyRange Out: " << CNTNT_DOC( this ) ); + SAL_INFO( "sw.docappend", "CopyRange Out: " << CNTNT_DOC( this ) ); #endif ++aIndexBefore; @@ -1204,16 +1204,16 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu } #ifdef DBG_UTIL - SAL_INFO( "sw.docappend", "Idx Del " << CNTNT_IDX( aDelIdx ) ); - SAL_INFO( "sw.docappend", "Idx Fix " << CNTNT_IDX( aFixupIdx ) ); + SAL_INFO( "sw.docappend", "Idx Del " << CNTNT_IDX( aDelIdx ) ); + SAL_INFO( "sw.docappend", "Idx Fix " << CNTNT_IDX( aFixupIdx ) ); #endif // just update the original instead of overwriting SwFormatPageDesc *aDesc = static_cast< SwFormatPageDesc* >( pNewItem.get() ); #ifdef DBG_UTIL -if ( aDesc->GetPageDesc() ) - SAL_INFO( "sw.docappend", "PD Update " << aDesc->GetPageDesc()->GetName() ); -else - SAL_INFO( "sw.docappend", "PD New" ); + if ( aDesc->GetPageDesc() ) + SAL_INFO( "sw.docappend", "PD Update " << aDesc->GetPageDesc()->GetName() ); + else + SAL_INFO( "sw.docappend", "PD New" ); #endif if ( nStartPageNumber ) aDesc->SetNumOffset( nStartPageNumber ); @@ -1225,7 +1225,7 @@ else pFormat->SetFormatAttr( *aDesc ); #ifdef DBG_UTIL - SAL_INFO( "sw.docappend", "Idx " << CNTNT_IDX( aDelIdx ) ); + SAL_INFO( "sw.docappend", "Idx " << CNTNT_IDX( aDelIdx ) ); #endif iDelNodes++; } @@ -1241,7 +1241,7 @@ else pTargetShell->SttEndDoc( false ); aDelIdx -= iDelNodes - 1; #ifdef DBG_UTIL - SAL_INFO( "sw.docappend", "iDelNodes: " << iDelNodes + SAL_INFO( "sw.docappend", "iDelNodes: " << iDelNodes << " Idx: " << aDelIdx.GetNode().GetIndex() << " EOE: " << GetNodes().GetEndOfExtras().GetIndex() ); #endif diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 2f2d879cbec8..f248472ecce2 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -509,7 +509,7 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, SwOutlineNodes::difference_type pNd = aSttRg.GetNode().EndOfSectionNode(); if( pNd->GetIndex() >= aEndRg.GetIndex() ) break; - --aSttRg; + --aSttRg; } ++aSttRg; diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 6cd984599a04..7db3cadc81d5 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -181,7 +181,7 @@ bool SwDoc::SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry ) { // Point must be the startposition, Mark is optional the end position SwPosition* pPos = rPam.GetPoint(); - const SwTextNode* pTNd = pPos->nNode.GetNode().GetTextNode(); + const SwTextNode* pTNd = pPos->nNode.GetNode().GetTextNode(); OUString const& rText = pTNd->GetText(); sal_Int32 nStart = pPos->nContent.GetIndex(); sal_Int32 nEnd = rText.getLength(); diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 7d53274c94cf..e418d4ccbfb1 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -353,7 +353,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, if( !GetFootnoteIdxs().empty() && pAttr ) { sal_uInt16 nVal = pAttr->Get( RES_FTN_AT_TXTEND ).GetValue(); - if( ( FTNEND_ATTXTEND_OWNNUMSEQ == nVal || + if( ( FTNEND_ATTXTEND_OWNNUMSEQ == nVal || FTNEND_ATTXTEND_OWNNUMANDFMT == nVal ) || ( FTNEND_ATTXTEND_OWNNUMSEQ == ( nVal = pAttr->Get( RES_END_AT_TXTEND ).GetValue() ) || FTNEND_ATTXTEND_OWNNUMANDFMT == nVal )) diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 2a0f97fe71a2..81994cd4bae0 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2862,7 +2862,7 @@ void SwDoc::SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rO std::make_unique<SwUndoAttrTable>( *rTab.GetTableNode(), true )); } rTab.SetTabCols( rNew, rOld, pStart, bCurRowOnly ); - ::ClearFEShellTabCols(*this, nullptr); + ::ClearFEShellTabCols(*this, nullptr); SwClearFntCacheTextGlyphs(); getIDocumentState().SetModified(); } diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index 1a37235190a9..6d2d83902c85 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -278,16 +278,16 @@ bool SwEditShell::Copy( SwEditShell* pDestShell ) pDestShell->GetCursor()->DeleteMark(); } #if OSL_DEBUG_LEVEL > 0 -// check if the indices are registered in the correct nodes -{ - for(SwPaM& rCmp : pDestShell->GetCursor()->GetRingContainer()) + // check if the indices are registered in the correct nodes { - OSL_ENSURE( rCmp.GetPoint()->nContent.GetIdxReg() - == rCmp.GetContentNode(), "Point in wrong Node" ); - OSL_ENSURE( rCmp.GetMark()->nContent.GetIdxReg() - == rCmp.GetContentNode(false), "Mark in wrong Node" ); + for(SwPaM& rCmp : pDestShell->GetCursor()->GetRingContainer()) + { + OSL_ENSURE( rCmp.GetPoint()->nContent.GetIdxReg() + == rCmp.GetContentNode(), "Point in wrong Node" ); + OSL_ENSURE( rCmp.GetMark()->nContent.GetIdxReg() + == rCmp.GetContentNode(false), "Mark in wrong Node" ); + } } -} #endif // close Undo container here diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 7dd875749d8f..2d4389b34722 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -815,7 +815,7 @@ void SwEditShell::SetNumberingRestart() if (nListLevel >= MAXLEVEL) nListLevel = MAXLEVEL - 1; - bIsNodeNum = pTextNd->GetNum()->GetNumber() == + bIsNodeNum = pTextNd->GetNum()->GetNumber() == pNumRule->Get( static_cast<sal_uInt16>(nListLevel) ).GetStart(); } if (bIsNodeNum) diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 030fc4223edf..d976285292ae 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -451,7 +451,7 @@ uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) return aHyphRet; const bool bAuto = IsAuto(); - uno::Reference< XHyphenatedWord > xHyphWord; + uno::Reference< XHyphenatedWord > xHyphWord; bool bGoOn = false; do { SwPaM *pCursor; @@ -884,13 +884,13 @@ void SwEditShell::HandleCorrectionError(const OUString& aText, SwPosition aPos, uno::Reference< XSpellAlternatives > SwEditShell::GetCorrection( const Point* pPt, SwRect& rSelectRect ) { - uno::Reference< XSpellAlternatives > xSpellAlt; + uno::Reference< XSpellAlternatives > xSpellAlt; if( IsTableMode() ) return nullptr; SwPaM* pCursor = GetCursor(); SwPosition aPos( *pCursor->GetPoint() ); - Point aPt( *pPt ); + Point aPt( *pPt ); SwCursorMoveState eTmpState( MV_SETONLYTEXT ); SwTextNode *pNode = nullptr; SwWrongList *pWrong = nullptr; diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx index 8ec298bcba51..9e6a1a731260 100644 --- a/sw/source/core/edit/edsect.cxx +++ b/sw/source/core/edit/edsect.cxx @@ -409,7 +409,7 @@ void SwEditShell::DoSpecialInsert() SwPosition aInsertPos( aInsertIndex ); // insert a new text node, and set the cursor - GetDoc()->getIDocumentContentOperations().AppendTextNode( aInsertPos ); + GetDoc()->getIDocumentContentOperations().AppendTextNode( aInsertPos ); *pCursorPos = aInsertPos; // call AttrChangeNotify for the UI diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 1b2504f15660..cb93ce2a9f43 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -494,7 +494,7 @@ OUString SwAuthorityField::ConditionalExpandAuthIdentifier( { sal_IntPtr & rnTempSequencePos(pLayout && pLayout->IsHideRedlines() ? m_nTempSequencePosRLHidden : m_nTempSequencePos); - if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFieldsLocked()) + if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFieldsLocked()) rnTempSequencePos = pAuthType->GetSequencePos(m_xAuthEntry.get(), pLayout); if (0 <= rnTempSequencePos) sRet += OUString::number(rnTempSequencePos); @@ -520,7 +520,7 @@ OUString SwAuthorityField::ExpandCitation(ToxAuthorityField eField, { sal_IntPtr & rnTempSequencePos(pLayout && pLayout->IsHideRedlines() ? m_nTempSequencePosRLHidden : m_nTempSequencePos); - if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFieldsLocked()) + if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFieldsLocked()) rnTempSequencePos = pAuthType->GetSequencePos(m_xAuthEntry.get(), pLayout); if (0 <= rnTempSequencePos) sRet += OUString::number(rnTempSequencePos); diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 1578d471d322..0cd8e57e9f5a 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -247,7 +247,7 @@ bool SwPageNumberField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const break; case FIELD_PROP_SUBTYPE: { - text::PageNumberType eType; + text::PageNumberType eType; eType = text::PageNumberType_CURRENT; if(m_nSubType == PG_PREV) eType = text::PageNumberType_PREV; @@ -914,7 +914,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, uno::Reference < script::XTypeConverter > xConverter( script::Converter::create(comphelper::getProcessComponentContext()) ); uno::Any aNew; - aNew = xConverter->convertToSimpleType( aAny, uno::TypeClass_STRING ); + aNew = xConverter->convertToSimpleType( aAny, uno::TypeClass_STRING ); aNew >>= sVal; } catch (uno::Exception&) {} diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index d3787483c85b..87cd67994835 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -1176,7 +1176,7 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const case FIELD_PROP_SUBTYPE: { sal_Int16 nRet = 0; - nRet = lcl_SubTypeToAPI(GetSubType() & 0xff); + nRet = lcl_SubTypeToAPI(GetSubType() & 0xff); rAny <<= nRet; } break; diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 222feb56728e..d2137e355557 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -663,10 +663,10 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr ) lcl_formatReferenceLanguage(rText, false, GetLanguage(), m_sSetReferenceLanguage); } }; - // sw_redlinehide: currently only one of these layouts will exist, - // so the getLayoutFrame will use the same frame in both cases - func(m_sText, pLayout); - func(m_sTextRLHidden, pLayoutRLHidden); + // sw_redlinehide: currently only one of these layouts will exist, + // so the getLayoutFrame will use the same frame in both cases + func(m_sText, pLayout); + func(m_sTextRLHidden, pLayoutRLHidden); } break; @@ -689,8 +689,8 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr ) lcl_formatReferenceLanguage(rText, false, GetLanguage(), m_sSetReferenceLanguage); } }; - func(m_sText, pLayout); - func(m_sTextRLHidden, pLayoutRLHidden); + func(m_sText, pLayout); + func(m_sTextRLHidden, pLayoutRLHidden); } break; diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index b50b93f27a25..b08cbf4fb2fd 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -470,7 +470,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, // If there are table formulas in the area, then display the table first // so that the table formula can calculate a new value first // (individual boxes in the area are retrieved via the layout) - SwFieldType* pTableFieldTyp = pDestShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::Table ); + SwFieldType* pTableFieldTyp = pDestShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::Table ); if( IsFrameSelected() ) { diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 8729c84d8646..ec7f590123aa 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -406,8 +406,8 @@ void SwFEShell::SetFlyPos( const Point& rAbsPos ) } else { - const SwFrame *pAnch = pFly->GetAnchorFrame(); - Point aOrient( pAnch->getFrameArea().Pos() ); + const SwFrame *pAnch = pFly->GetAnchorFrame(); + Point aOrient( pAnch->getFrameArea().Pos() ); if ( pFly->IsFlyInContentFrame() ) aOrient.setX(rAbsPos.getX()); @@ -892,12 +892,14 @@ SwFlyFrameFormat* SwFEShell::InsertObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat* pFormat = nullptr; SET_CURR_SHELL( this ); StartAllAction(); + { for(SwPaM& rPaM : GetCursor()->GetRingContainer()) { pFormat = GetDoc()->getIDocumentContentOperations().InsertEmbObject( rPaM, xObj, pFlyAttrSet ); OSL_ENSURE(pFormat, "IDocumentContentOperations::InsertEmbObject failed."); } + } EndAllAction(); if( pFormat ) @@ -1301,7 +1303,7 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference < // SwWrtShell::CalcAndSetScale() if ( rRect.SSize() != pFly->getFramePrintArea().SSize() && !bSizeProt ) { - Size aSz( rRect.SSize() ); + Size aSz( rRect.SSize() ); //JP 28.02.2001: Task 74707 - ask for fly in fly with automatic size diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 126c95074b9e..368aab4f67f5 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2696,7 +2696,8 @@ void SwFEShell::SetObjAttr( const SfxItemSet& rSet ) SET_CURR_SHELL( this ); if ( !rSet.Count() ) - { OSL_ENSURE( false, "SetObjAttr, empty set." ); + { + OSL_ENSURE( false, "SetObjAttr, empty set." ); return; } diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index a2ac38c150a6..2368fdbbea51 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -51,14 +51,14 @@ static bool lcl_IsHoriOnEvenPages(MirrorGraph nEnum, bool bToggle) { bool bEnum = nEnum == MirrorGraph::Vertical || nEnum == MirrorGraph::Both; - return bEnum != bToggle; + return bEnum != bToggle; } static bool lcl_IsHoriOnOddPages(MirrorGraph nEnum) { bool bEnum = nEnum == MirrorGraph::Vertical || nEnum == MirrorGraph::Both; - return bEnum; + return bEnum; } bool SwMirrorGrf::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 8e087c038b28..c944fb2178a1 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -157,7 +157,7 @@ static void lcl_DelHFFormat( SwClient *pToRemove, SwFrameFormat *pFormat ) if( pShell ) { pShell->ParkCursor( aIdx ); - aIdx = nEnd-1; + aIdx = nEnd-1; } } ++aIdx; @@ -2375,7 +2375,7 @@ bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case MID_GRID_STANDARD_MODE: { bool bStandard = *o3tl::doAccess<bool>(rVal); - SetSquaredMode( !bStandard ); + SetSquaredMode( !bStandard ); break; } default: diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 2f6c2b495dc5..3ed0dede61f5 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -341,11 +341,11 @@ const SwLayoutFrame *SwFrame::ImplGetNextLayoutLeaf( bool bFwd ) const } } - // If I could not go down or forward, I'll have to go up - bGoingUp = !bGoingFwdOrBwd && !bGoingDown; + // If I could not go down or forward, I'll have to go up + bGoingUp = !bGoingFwdOrBwd && !bGoingDown; - pFrame = p; - p = lcl_GetLower( pFrame, true ); + pFrame = p; + p = lcl_GetLower( pFrame, true ); } while( ( p && !p->IsFlowFrame() ) || pFrame == this || diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 0042265acc2b..39d369d1b38b 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -739,7 +739,7 @@ SwTabFrame* SwTabFrame::FindMaster( bool bFirstMaster ) const return pTab; } - pTab = aIter.Next(); + pTab = aIter.Next(); } OSL_FAIL( "Follow is lost in Space." ); diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 2bbbab22b2a5..7f5ac35034ef 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -572,7 +572,8 @@ void SwFootnoteFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) // If the predecessor is the master and/or the successor is the Follow, // then take their content and destroy them. if ( GetPrev() && GetPrev() == GetMaster() ) - { OSL_ENSURE( SwFlowFrame::CastFlowFrame( GetPrev()->GetLower() ), + { + OSL_ENSURE( SwFlowFrame::CastFlowFrame( GetPrev()->GetLower() ), "Footnote without content?" ); SwFlowFrame::CastFlowFrame( GetPrev()->GetLower())-> MoveSubTree( this, GetLower() ); @@ -581,7 +582,8 @@ void SwFootnoteFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) SwFrame::DestroyFrame(pDel); } if ( GetNext() && GetNext() == GetFollow() ) - { OSL_ENSURE( SwFlowFrame::CastFlowFrame( GetNext()->GetLower() ), + { + OSL_ENSURE( SwFlowFrame::CastFlowFrame( GetNext()->GetLower() ), "Footnote without content?" ); SwFlowFrame::CastFlowFrame( GetNext()->GetLower() )->MoveSubTree( this ); SwFrame *pDel = GetNext(); @@ -1130,8 +1132,8 @@ void SwFootnoteBossFrame::ResetFootnote( const SwFootnoteFrame *pCheck ) SwFrame* pFrame = aIter.First(); while( pFrame ) { - if( pFrame->getRootFrame() == pCheck->getRootFrame() ) - { + if( pFrame->getRootFrame() == pCheck->getRootFrame() ) + { SwFrame *pTmp = pFrame->GetUpper(); while ( pTmp && !pTmp->IsFootnoteFrame() ) pTmp = pTmp->GetUpper(); @@ -1255,7 +1257,8 @@ void SwFootnoteBossFrame::InsertFootnote( SwFootnoteFrame* pNew ) // index is after the index of the newly inserted, to place the new one correctly pSibling = static_cast<SwFootnoteFrame*>(pParent->Lower()); if ( !pSibling ) - { OSL_ENSURE( false, "Could not find space for footnote."); + { + OSL_ENSURE( false, "Could not find space for footnote."); return; } nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() ); @@ -1832,7 +1835,8 @@ void SwFootnoteBossFrame::CollectFootnotes_( const SwContentFrame* _pRef, } while( !pNxtFootnote && pBoss ); } else if( !pNxtFootnote->GetAttr()->GetFootnote().IsEndNote() ) - { OSL_ENSURE( !pNxtFootnote->GetMaster(), "_CollectFootnote: Master expected" ); + { + OSL_ENSURE( !pNxtFootnote->GetMaster(), "_CollectFootnote: Master expected" ); while ( pNxtFootnote->GetMaster() ) pNxtFootnote = pNxtFootnote->GetMaster(); } @@ -2045,7 +2049,8 @@ void SwFootnoteBossFrame::MoveFootnotes_( SwFootnoteFrames &rFootnoteArr, bool b } } else - { OSL_ENSURE( !pFootnote->GetMaster() && !pFootnote->GetFollow(), + { + OSL_ENSURE( !pFootnote->GetMaster() && !pFootnote->GetFollow(), "DelFootnote and Master/Follow?" ); SwFrame::DestroyFrame(pFootnote); // #i21478# diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 4d0c56241183..7c44bc31b57d 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -269,7 +269,7 @@ void SwHeadFootFrame::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) static_cast<SwTextFrame*>(pFrame)->IsJoinLocked(), "<SwHeadFootFrame::FormatSize(..)> - text frame invalid and not locked." ); - if ( pFrame->IsTextFrame() && pFrame->isFrameAreaDefinitionValid() ) + if ( pFrame->IsTextFrame() && pFrame->isFrameAreaDefinitionValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrame( *pFrame, *(pFrame->FindPageFrame()) ) ) diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 27acb33779cb..dbb5757bbd1b 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -91,7 +91,8 @@ void SwEndnoter::CollectEndnote( SwFootnoteFrame* pFootnote ) } while ( pCnt ); } else - { OSL_ENSURE( pNxt->Lower() && pNxt->Lower()->IsSctFrame(), + { + OSL_ENSURE( pNxt->Lower() && pNxt->Lower()->IsSctFrame(), "Endnote without content?" ); pNxt->Cut(); SwFrame::DestroyFrame(pNxt); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 213ce01e7797..b3fc9e8843b3 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3340,9 +3340,10 @@ void SwLayoutFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect cons if ( pFrame->IsRetouche() ) { if ( pFrame->IsRetoucheFrame() && bWin && !pFrame->GetNext() ) - { if ( !pPage ) + { + if ( !pPage ) pPage = FindPageFrame(); - pFrame->Retouch( pPage, rRect ); + pFrame->Retouch( pPage, rRect ); } pFrame->ResetRetouche(); } @@ -6281,7 +6282,7 @@ void SwFrame::PaintSwFrameBackground( const SwRect &rRect, const SwPageFrame *pP // background transparency have to be considered // Set missing 5th parameter to the default value GRFNUM_NO // - see declaration in /core/inc/frmtool.hxx. - ::DrawGraphic( + ::DrawGraphic( pItem, pOut, aOrigBackRect, @@ -7387,7 +7388,7 @@ Graphic SwFlyFrameFormat::MakeGraphic( ImageMap* pMap ) ::SetOutDevAndWin( pSh, pOld, pWin, nZoom ); // #i92711# end Pre/PostPaint encapsulation when pOut is back and content is painted - pSh->DLPostPaint2(true); + pSh->DLPostPaint2(true); aMet.Stop(); aMet.Move( -pFly->getFrameArea().Left(), -pFly->getFrameArea().Top() ); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 6cd503bce7e7..39bf62082c18 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -962,7 +962,7 @@ static SwFootnoteFrame* lcl_FindEndnote( SwSectionFrame* &rpSect, bool &rbEmpty, SwSectionFrame* pSect = rbEmpty ? rpSect->GetFollow() : rpSect; while( pSect ) { - OSL_ENSURE( (pSect->Lower() && pSect->Lower()->IsColumnFrame()) || pSect->GetUpper()->IsFootnoteFrame(), + OSL_ENSURE( (pSect->Lower() && pSect->Lower()->IsColumnFrame()) || pSect->GetUpper()->IsFootnoteFrame(), "InsertEndnotes: Where's my column?" ); // i73332: Columned section in endnote diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 3d0a64b4c92d..b662513534e3 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -3785,7 +3785,7 @@ long CalcHeightWithFlys( const SwFrame *pFrame ) if ( pMaster ) { - pObjs = static_cast<const SwTextFrame*>(pTmp)->FindMaster()->GetDrawObjs(); + pObjs = static_cast<const SwTextFrame*>(pTmp)->FindMaster()->GetDrawObjs(); bIsFollow = true; } } diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index fc7efacafae9..bc1951343c73 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -782,7 +782,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart, nX = nPrtLeft; else { - const long nPrtRight = bRTL ? + const long nPrtRight = bRTL ? aRectFnSet.GetPrtLeft(*pTable) : aRectFnSet.GetPrtRight(*pTable); if ( bRTL != (nX > nPrtRight) ) @@ -866,7 +866,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart, //The flow leads from one table to the next. The X-value //needs to be corrected by the amount of the offset of //the tables - if ( pTable && + if ( pTable && !pTab->GetUpper()->IsInTab() && !pTable->GetUpper()->IsInTab() ) nX += pTab->getFrameArea().Left() - pTable->getFrameArea().Left(); @@ -2581,8 +2581,8 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor) else { SwNodeIndex idx( nodes.GetEndOfContent()); - if( SwContentNode* last = SwNodes::GoPrevious( &idx )) - inSelection = *pEndPos == SwPosition( *last, last->Len()); + if( SwContentNode* last = SwNodes::GoPrevious( &idx )) + inSelection = *pEndPos == SwPosition( *last, last->Len()); } } if( inSelection ) diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx index 389a2154cd24..ccc7f6744776 100644 --- a/sw/source/core/layout/virtoutp.cxx +++ b/sw/source/core/layout/virtoutp.cxx @@ -120,11 +120,11 @@ void SwLayVout::Enter( SwViewShell *pShell, SwRect &rRect, bool bOn ) Flush(); #ifdef DBG_UTIL - if( pShell->GetViewOptions()->IsTest3() ) - { - ++nCount; - return; - } + if( pShell->GetViewOptions()->IsTest3() ) + { + ++nCount; + return; + } #endif bOn = bOn && !nCount && rRect.HasArea() && pShell->GetWin(); diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index 07f6d7c496d7..6e1e2256d45e 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -265,7 +265,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition() rAnchorFrame.SwitchHorizontalToVertical( aAnchorPos ); // #i44347# - keep last object rectangle at anchored object - OSL_ENSURE( dynamic_cast<const SwAnchoredDrawObject*>( &GetAnchoredObj() ) != nullptr, + OSL_ENSURE( dynamic_cast<const SwAnchoredDrawObject*>( &GetAnchoredObj() ) != nullptr, "<SwAsCharAnchoredObjectPosition::CalcPosition()> - wrong type of anchored object." ); SwAnchoredDrawObject& rAnchoredDrawObj = static_cast<SwAnchoredDrawObject&>( GetAnchoredObj() ); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index ee11c90fc626..a41bcc7497b5 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -870,8 +870,8 @@ void SwOLEObj::SetNode( SwOLENode* pNode ) if (!p->GetEmbeddedObjectContainer().InsertEmbeddedObject( m_xOLERef.GetObject(), aObjName ) ) { OSL_FAIL( "InsertObject failed" ); - if ( xChild.is() ) - xChild->setParent( nullptr ); + if ( xChild.is() ) + xChild->setParent( nullptr ); } else m_xOLERef.AssignToContainer( &p->GetEmbeddedObjectContainer(), aObjName ); @@ -971,11 +971,11 @@ bool SwOLEObj::UnloadObject( uno::Reference< embed::XEmbeddedObject > const & xO return false; bool bRet = true; - sal_Int32 nState = xObj.is() ? xObj->getCurrentState() : embed::EmbedStates::LOADED; - bool bIsActive = ( nState != embed::EmbedStates::LOADED && nState != embed::EmbedStates::RUNNING ); + sal_Int32 nState = xObj.is() ? xObj->getCurrentState() : embed::EmbedStates::LOADED; + bool bIsActive = ( nState != embed::EmbedStates::LOADED && nState != embed::EmbedStates::RUNNING ); sal_Int64 nMiscStatus = xObj->getStatus( nAspect ); - if( nState != embed::EmbedStates::LOADED && !pDoc->IsInDtor() && !bIsActive && + if( nState != embed::EmbedStates::LOADED && !pDoc->IsInDtor() && !bIsActive && embed::EmbedMisc::MS_EMBED_ALWAYSRUN != ( nMiscStatus & embed::EmbedMisc::MS_EMBED_ALWAYSRUN ) && embed::EmbedMisc::EMBED_ACTIVATEIMMEDIATELY != ( nMiscStatus & embed::EmbedMisc::EMBED_ACTIVATEIMMEDIATELY ) ) { diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index 8a26d2f0780c..a95b5100ec93 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -118,7 +118,7 @@ bool SwFormatDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case MID_DROPCAP_DISTANCE : rVal <<= static_cast<sal_Int16>(convertTwipToMm100(m_nDistance)); break; case MID_DROPCAP_FORMAT: { - style::DropCapFormat aDrop; + style::DropCapFormat aDrop; aDrop.Lines = m_nLines ; aDrop.Count = m_nChars ; aDrop.Distance = convertTwipToMm100(m_nDistance); diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index 91a9e385063e..1f59982bb6f2 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -359,10 +359,10 @@ ErrCode SwXMLTextBlocks::PutBlockText( const OUString& rShort, uno::Reference < beans::XPropertySet > xSet( xDocStream, uno::UNO_QUERY ); xSet->setPropertyValue("MediaType", Any(OUString( "text/xml" )) ); uno::Reference < io::XOutputStream > xOut = xDocStream->getOutputStream(); - uno::Reference<io::XActiveDataSource> xSrc(xWriter, uno::UNO_QUERY); - xSrc->setOutputStream(xOut); + uno::Reference<io::XActiveDataSource> xSrc(xWriter, uno::UNO_QUERY); + xSrc->setOutputStream(xOut); - uno::Reference<xml::sax::XDocumentHandler> xHandler(xWriter, + uno::Reference<xml::sax::XDocumentHandler> xHandler(xWriter, uno::UNO_QUERY); rtl::Reference<SwXMLTextBlockExport> xExp( new SwXMLTextBlockExport( xContext, *this, GetXMLToken ( XML_UNFORMATTED_TEXT ), xHandler) ); diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index d04f2b053205..e093c6c5badc 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -350,7 +350,7 @@ void SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString* l ) { // Set the new entry in the list before we do that! aNew = GetAppCharClass().uppercase( aNew ); - nErr = pImp->Rename( n, aNew, aLong ); + nErr = pImp->Rename( n, aNew, aLong ); if( !nErr ) { bool bOnlyText = pImp->m_aNames[ n ]->bIsOnlyText; diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 290c69867b47..94cdbf02368c 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1848,7 +1848,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() if( pFirst->GetTextField() && pFirst->IsFieldInDoc() ) { const SwTextNode* pTNd = pFirst->GetTextField()->GetpTextNode(); - OSL_ENSURE( nullptr != pTNd, "Enhanced pdf export - text node is missing" ); + OSL_ENSURE( nullptr != pTNd, "Enhanced pdf export - text node is missing" ); // 1. Check if the whole paragraph is hidden // 2. Move to the field diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index ecae4e4a8385..9130208cc7c2 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -165,11 +165,11 @@ const SfxPoolItem* GetItem( const SwTextAttr& rAttr, sal_uInt16 nWhich ) const SfxItemSet* pSet = CharFormat::GetItemSet( rAttr.GetAttr() ); if ( !pSet ) return nullptr; - bool bInParent = RES_TXTATR_AUTOFMT != rAttr.Which(); - const SfxPoolItem* pItem; - bool bRet = SfxItemState::SET == pSet->GetItemState( nWhich, bInParent, &pItem ); + bool bInParent = RES_TXTATR_AUTOFMT != rAttr.Which(); + const SfxPoolItem* pItem; + bool bRet = SfxItemState::SET == pSet->GetItemState( nWhich, bInParent, &pItem ); - return bRet ? pItem : nullptr; + return bRet ? pItem : nullptr; } return ( nWhich == rAttr.Which() ) ? &rAttr.GetAttr() : nullptr; diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 3217fa2fab8e..da5ce0f8e036 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -934,7 +934,7 @@ bool SwTextFrame::CalcPreps() const SwCharRange aFollowRg(GetFollow()->GetOfst(), TextFrameIndex(1)); pPara->GetReformat() += aFollowRg; // We should continue! - bRet = false; + bRet = false; } } } diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index aeac33ab9da0..ccfe63c147ca 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -83,8 +83,10 @@ public: SwFont* GetFont() const { return m_pFnt.get(); } void IncLineNr() { ++m_nLineNr; } bool HasNumber() { return !( m_nLineNr % m_rLineInf.GetCountBy() ); } - bool HasDivider() { if( !m_nDivider ) return false; - return !(m_nLineNr % m_rLineInf.GetDividerCountBy()); } + bool HasDivider() { + if( !m_nDivider ) return false; + return !(m_nLineNr % m_rLineInf.GetDividerCountBy()); + } void PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed ); void PaintRedline( SwTwips nY, long nMax ); diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index 880773f4e69b..14517379fc9a 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -227,8 +227,8 @@ static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, SwTextSizeInfo& rInf, SwT nSpaceAdd = nGluePortionWidth / sal_Int32(nGluePortion); bAddSpaceChanged = true; - } - if( nKashidasDropped ) + } + if( nKashidasDropped ) rSI.MarkKashidasInvalid( nKashidasDropped, nIdx, nNext - nIdx ); } if ( bAddSpaceChanged ) @@ -642,9 +642,9 @@ void SwTextAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent ) } nLen = nLen + pPos->GetLen(); pPos = pPos->GetNextPortion(); - } + } - if( ! bTabCompat && ! bMultiTab && SvxAdjust::Right == GetAdjust() ) + if( ! bTabCompat && ! bMultiTab && SvxAdjust::Right == GetAdjust() ) // portions are moved to the right if possible pLeft->AdjustRight( pCurrent ); } diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index be10f475fe06..1512d2991a32 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1126,19 +1126,19 @@ SwLinePortion *SwTextFormatter::WhichFirstPortion(SwTextFormatInfo &rInf) } } - // 10. Decimal tab portion at the beginning of each line in table cells - if ( !pPor && !m_pCurr->GetNextPortion() && + // 10. Decimal tab portion at the beginning of each line in table cells + if ( !pPor && !m_pCurr->GetNextPortion() && GetTextFrame()->IsInTab() && GetTextFrame()->GetDoc().getIDocumentSettingAccess().get(DocumentSettingId::TAB_COMPAT)) - { - pPor = NewTabPortion( rInf, true ); - } + { + pPor = NewTabPortion( rInf, true ); + } - // 11. suffix of meta-field - if (!pPor) - { - pPor = TryNewNoLengthPortion(rInf); - } + // 11. suffix of meta-field + if (!pPor) + { + pPor = TryNewNoLengthPortion(rInf); + } return pPor; } diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index dcbea78f30e2..7f863a0bbfb0 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -169,8 +169,8 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, { if( pPorIter->InTabGrp() ) { - const SwTabPortion* pTabPor = static_cast<SwTabPortion*>(pPorIter); - const SwTwips nTabPos = nTmpLeft + pTabPor->GetTabPos(); + const SwTabPortion* pTabPor = static_cast<SwTabPortion*>(pPorIter); + const SwTwips nTabPos = nTmpLeft + pTabPor->GetTabPos(); if( nMaxRight < nTabPos ) { nMaxRight = rPaint.Right(); diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 26ecefa20d5b..011490cc3568 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -1270,7 +1270,7 @@ void SwScriptInfo::InitScriptInfo(const SwTextNode& rNode, if ( !isTransparentChar ( cCh) ) cPrevCh = cCh; - ++nIdx; + ++nIdx; } // end of current word if ( -1 != nKashidaPos ) diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx index 4dc4b671e966..e34ff7333d40 100644 --- a/sw/source/core/text/porlin.cxx +++ b/sw/source/core/text/porlin.cxx @@ -156,7 +156,8 @@ void SwLinePortion::Truncate_() { SwLinePortion *pPos = mpNextPortion; do - { OSL_ENSURE( pPos != this, "SwLinePortion::Truncate: loop" ); + { + OSL_ENSURE( pPos != this, "SwLinePortion::Truncate: loop" ); SwLinePortion *pLast = pPos; pPos = pPos->GetNextPortion(); pLast->SetNextPortion( nullptr ); diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index af73cf028aad..f456084f673c 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -2164,7 +2164,7 @@ bool SwTextFormatter::BuildMultiPortion( SwTextFormatInfo &rInf, m_pCurr = pOldCurr; m_nStart = nOldStart; - SetPropFont( 0 ); + SetPropFont( 0 ); rMulti.SetLen( rMulti.GetRoot().GetLen() + ( rMulti.GetRoot().GetNext() ? rMulti.GetRoot().GetNext()->GetLen() : TextFrameIndex(0) ) ); diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 1f70727abd51..8ea644532112 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -123,7 +123,7 @@ SwKernPortion::SwKernPortion( SwLinePortion &rPortion, short nKrn, SetWhichPor( PortionType::Kern ); if( nKern > 0 ) Width( nKern ); - rPortion.Insert( this ); + rPortion.Insert( this ); } SwKernPortion::SwKernPortion( const SwLinePortion& rPortion ) : diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index e40d66855612..a6535c853e59 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -409,7 +409,7 @@ bool SwTextFly::IsAnyFrame() const bool SwTextFly::IsAnyObj( const SwRect &rRect ) const { - OSL_ENSURE( bOn, "SwTextFly::IsAnyObj: Who's knocking?" ); + OSL_ENSURE( bOn, "SwTextFly::IsAnyObj: Who's knocking?" ); SwRect aRect( rRect ); if ( aRect.IsEmpty() ) diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index c9bc349b06d0..e9e7046e66fd 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -629,8 +629,8 @@ void SwTextFrame::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDea if( !pSrcFrame ) { SwFootnoteFrame *pNew = new SwFootnoteFrame(pDoc->GetDfltFrameFormat(),this,this,pFootnote); - SwNodeIndex aIdx( *pFootnote->GetStartNode(), 1 ); - ::InsertCnt_( pNew, pDoc, aIdx.GetIndex() ); + SwNodeIndex aIdx( *pFootnote->GetStartNode(), 1 ); + ::InsertCnt_( pNew, pDoc, aIdx.GetIndex() ); pDoc->getIDocumentLayoutAccess().GetLayouter()->CollectEndnote( pNew ); } else if( pSrcFrame != this ) diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index 07349b199dab..38f095cd1996 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -122,7 +122,7 @@ SwGrammarMarkUp* SwGrammarContact::getGrammarCheck( SwTextNode& rTextNode, bool mpProxyList->SetInvalid( 0, COMPLETE_STRING ); } } - mbFinished = false; + mbFinished = false; } pRet = mpProxyList.get(); } diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 3550c1d1ddea..73f6fb4b78ca 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -541,7 +541,7 @@ SwFormatMeta::SwFormatMeta( std::shared_ptr< ::sw::Meta > const & i_pMeta, , m_pMeta( i_pMeta ) , m_pTextAttr( nullptr ) { - OSL_ENSURE((RES_TXTATR_META == i_nWhich) || (RES_TXTATR_METAFIELD == i_nWhich), + OSL_ENSURE((RES_TXTATR_META == i_nWhich) || (RES_TXTATR_METAFIELD == i_nWhich), "ERROR: SwFormatMeta: invalid which id!"); OSL_ENSURE(m_pMeta, "SwFormatMeta: no Meta ?"); // DO NOT call m_pMeta->SetFormatMeta(this) here; only from SetTextAttr! diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 953d47106094..8cdcf5478392 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -628,8 +628,10 @@ void SwFntObj::GuessLeading( const SwViewShell& pWin->SetMapMode( aOldMap ); } else -#endif m_nGuessedLeading = 0; +#else + m_nGuessedLeading = 0; +#endif } // Set the font at the given output device; for screens it may be diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 115171009dea..785aac960606 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -2717,7 +2717,7 @@ void SwTextNode::EraseText(const SwIndex &rIdx, const sal_Int32 nCount, continue; } - assert(!( (nHintStart < nEndIdx) && (*pHtEndIdx > nEndIdx) + assert(!( (nHintStart < nEndIdx) && (*pHtEndIdx > nEndIdx) && pHt->HasDummyChar() ) // next line: deleting exactly dummy char: DeleteAttributes || ((nHintStart == nStartIdx) && (nHintStart + 1 == nEndIdx))); @@ -3714,7 +3714,7 @@ void SwTextNode::ReplaceText( const SwIndex& rStart, const sal_Int32 nDelLen, SwTextAttr *const pHint = GetTextAttrForCharAt( nPos ); if (pHint) { - assert(!( pHint->GetEnd() && pHint->HasDummyChar() + assert(!( pHint->GetEnd() && pHint->HasDummyChar() && (pHint->GetStart() < nEndPos) && (*pHint->GetEnd() > nEndPos) )); // "deleting left-overlapped attribute with CH_TXTATR" diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 2fe6bf53c462..a30ee18233b3 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -545,7 +545,7 @@ SwpHints::TryInsertNesting( SwTextNode & rNode, SwTextAttrNesting & rNewHint ) } else { - assert((nOtherStart < nNewStart) || (nNewEnd < nOtherEnd)); + assert((nOtherStart < nNewStart) || (nNewEnd < nOtherEnd)); // scenario: there is a RUBY, and contained within that a META; // now a RUBY is inserted within the META => the existing RUBY is split: // here it is not possible to simply insert the left/right fragment @@ -930,7 +930,7 @@ void SwpHints::BuildPortions( SwTextNode& rNode, SwTextAttr& rNewHint, { Insert( pNewAttr ); // if ( bDestroyHint ) - NoteInHistory( pNewAttr, true ); + NoteInHistory( pNewAttr, true ); } if ( !bNoLengthAttribute ) @@ -1455,7 +1455,7 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, const SetAttrMode nMode ) } break; - case RES_TXTATR_FIELD: + case RES_TXTATR_FIELD: { // trigger notification for relevant fields, like HiddenParaFields if (FieldCanHideParaWeight( diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx index 0ae45509fed4..c19b6cf0242d 100644 --- a/sw/source/core/undo/unovwr.cxx +++ b/sw/source/core/undo/unovwr.cxx @@ -215,7 +215,7 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext) OUString aTmpStr(aDelStr[n]); OUString const ins( pTextNd->InsertText(aTmpStr, rIdx) ); assert(ins.getLength() == 1); // cannot fail - (void) ins; + (void) ins; rIdx -= 2; pTextNd->EraseText( rIdx, 1 ); rIdx += 2; diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index 626088d63ca9..1b5dc8e359cf 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -87,8 +87,8 @@ SwUndoInsSection::SwUndoInsSection( rDoc.getIDocumentRedlineAccess().GetRedlineAuthor() )); SetRedlineFlags( rDoc.getIDocumentRedlineAccess().GetRedlineFlags() ); } - m_pRedlineSaveData.reset( new SwRedlineSaveDatas ); - if( !FillSaveData( rPam, *m_pRedlineSaveData, false )) + m_pRedlineSaveData.reset( new SwRedlineSaveDatas ); + if( !FillSaveData( rPam, *m_pRedlineSaveData, false )) m_pRedlineSaveData.reset( nullptr ); if( !rPam.HasMark() ) diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index c96c5918ef33..2335150d7eac 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -1936,7 +1936,7 @@ void SwUndoTableMerge::UndoImpl(::sw::UndoRedoContext & rContext) SwTableBox *pBox, *pCpyBox = pTableNd->GetTable().GetTabSortBoxes()[0]; SwTableBoxes& rLnBoxes = pCpyBox->GetUpper()->GetTabBoxes(); -CHECKTABLE(pTableNd->GetTable()) + CHECKTABLE(pTableNd->GetTable()) SwSelBoxes aSelBoxes; SwTextFormatColl* pColl = rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ); @@ -1953,7 +1953,7 @@ CHECKTABLE(pTableNd->GetTable()) aSelBoxes.insert( pBox ); } -CHECKTABLE(pTableNd->GetTable()) + CHECKTABLE(pTableNd->GetTable()) SwChartDataProvider *pPCD = rDoc.getIDocumentChartDataProviderAccess().GetChartDataProvider(); // 2. deleted the inserted boxes @@ -2035,7 +2035,7 @@ CHECKTABLE(pTableNd->GetTable()) rDoc.getIDocumentContentOperations().DeleteSection( rDoc.GetNodes()[ nIdx ] ); } } -CHECKTABLE(pTableNd->GetTable()) + CHECKTABLE(pTableNd->GetTable()) pSaveTable->CreateNew( pTableNd->GetTable(), true, false ); @@ -2054,7 +2054,7 @@ CHECKTABLE(pTableNd->GetTable()) pPam->SetMark(); pPam->DeleteMark(); -CHECKTABLE(pTableNd->GetTable()) + CHECKTABLE(pTableNd->GetTable()) ClearFEShellTabCols(rDoc, nullptr); } diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 7a4432c285ff..cca92c4c458e 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -578,14 +578,14 @@ SwXServiceProvider::MakeInstance(SwServiceType nObjectType, SwDoc & rDoc) case SwServiceType::VbaProjectNameProvider : #if HAVE_FEATURE_SCRIPTING { - uno::Reference< container::XNameContainer > xProjProv = rDoc.GetVBATemplateToProjectCache(); - if (!xProjProv.is() && rDoc.GetDocShell() + uno::Reference< container::XNameContainer > xProjProv = rDoc.GetVBATemplateToProjectCache(); + if (!xProjProv.is() && rDoc.GetDocShell() && ooo::vba::isAlienWordDoc(*rDoc.GetDocShell())) - { - xProjProv = new SwVbaProjectNameProvider; - rDoc.SetVBATemplateToProjectCache(xProjProv); - } - xRet = xProjProv; + { + xProjProv = new SwVbaProjectNameProvider; + rDoc.SetVBATemplateToProjectCache(xProjProv); + } + xRet = xProjProv; } #endif break; diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index bfe1e1d86f64..1e9f868f1fb1 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1106,7 +1106,7 @@ bool DocInsertStringSplitCR( { bool bOK = true; - const SwInsertFlags nInsertFlags = + const SwInsertFlags nInsertFlags = bForceExpandHints ? ( SwInsertFlags::FORCEHINTEXPAND | SwInsertFlags::EMPTYEXPAND) : SwInsertFlags::EMPTYEXPAND; diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 03c556a5422c..f5100e240f50 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -2224,10 +2224,10 @@ awt::Point SAL_CALL SwXShape::getPosition() // #i53320# - relative position of group member and // top group object is always given in horizontal left-to-right layout. awt::Point aOffset( 0, 0 ); - { - aOffset.X = ( aMemberObjRect.Left() - aGroupObjRect.Left() ); - aOffset.Y = ( aMemberObjRect.Top() - aGroupObjRect.Top() ); - } + { + aOffset.X = ( aMemberObjRect.Left() - aGroupObjRect.Left() ); + aOffset.Y = ( aMemberObjRect.Top() - aGroupObjRect.Top() ); + } aOffset.X = convertTwipToMm100(aOffset.X); aOffset.Y = convertTwipToMm100(aOffset.Y); aPos.X += aOffset.X; diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 064da6df7ebc..17421871019a 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -1893,7 +1893,7 @@ void SAL_CALL SwXTextField::attach( m_pImpl->m_pProps->sPar2, nType, m_pImpl->m_pProps->nFormat)); - static_cast<SwTableField*>(xField.get())->ChgExpStr(m_pImpl->m_pProps->sPar1); + static_cast<SwTableField*>(xField.get())->ChgExpStr(m_pImpl->m_pProps->sPar1); } break; default: OSL_FAIL("What kind of type is that?"); @@ -2226,7 +2226,7 @@ SwXTextField::setPropertyValue( case FIELD_PROP_USHORT1: case FIELD_PROP_USHORT2: { - sal_Int16 nVal = 0; + sal_Int16 nVal = 0; rValue >>= nVal; if( FIELD_PROP_USHORT1 == pEntry->nWID) m_pImpl->m_pProps->nUSHORT1 = nVal; diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 02845dc8dd1c..b05453370191 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1006,13 +1006,13 @@ bool SwFrameProperties_Impl::AnyToItemSet(SwDoc *pDoc, SfxItemSet& rSet, SfxItem { rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet( *pStyle ) ); const ::SfxItemSet *pItemSet = &xStyle->GetItemSet(); - bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound ); + bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound ); lcl_FillCol ( rSet, *pItemSet, pColumns ); } else { const ::SfxItemSet *pItemSet = &pDoc->getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME )->GetAttrSet(); - bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound ); + bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound ); lcl_FillCol ( rSet, *pItemSet, pColumns ); } const ::uno::Any* pEdit; @@ -1994,7 +1994,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) if(FN_UNO_ANCHOR_TYPES == pEntry->nWID) { uno::Sequence<text::TextContentAnchorType> aTypes(5); - text::TextContentAnchorType* pArray = aTypes.getArray(); + text::TextContentAnchorType* pArray = aTypes.getArray(); pArray[0] = text::TextContentAnchorType_AT_PARAGRAPH; pArray[1] = text::TextContentAnchorType_AS_CHARACTER; pArray[2] = text::TextContentAnchorType_AT_PAGE; @@ -2077,7 +2077,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) { OUString sFltName; SwDoc::GetGrfNms( *static_cast<SwFlyFrameFormat*>(pFormat), nullptr, &sFltName ); - aAny <<= sFltName; + aAny <<= sFltName; } else if( FN_UNO_GRAPHIC_URL == pEntry->nWID ) { diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index fca31f8ce66c..703be071d4b7 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -1191,7 +1191,7 @@ static void lcl_ExportAnnotationStarts( SwXTextPortion* pPortion = new SwXTextPortion( pUnoCursor, xParent, PORTION_ANNOTATION ); - pPortion->SetTextField( pPtr->mxAnnotationField ); + pPortion->SetTextField( pPtr->mxAnnotationField ); rPortions.emplace_back(pPortion); aIter = rAnnotationStartArr.erase(aIter); diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 942829b0944d..216bfd1f2916 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1422,7 +1422,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFormat //BulletFont if(pFont) { - awt::FontDescriptor aDesc; + awt::FontDescriptor aDesc; SvxUnoFontDescriptor::ConvertFromFont( *pFont, aDesc ); aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_BULLET_FONT, aDesc)); } @@ -2369,7 +2369,7 @@ void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw uno::RuntimeException(); m_bIsAutomaticWidth = true; m_aTextColumns.realloc(nColumns); - TextColumn* pCols = m_aTextColumns.getArray(); + TextColumn* pCols = m_aTextColumns.getArray(); m_nReference = USHRT_MAX; sal_Int32 nWidth = m_nReference / nColumns; sal_Int32 nDiff = m_nReference - nWidth * nColumns; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index cea9fcff9b7e..dd409f7529ca 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1371,7 +1371,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno: { sal_Int32 nHeight = 0; aValue >>= nHeight; - Size aSz(aFrameSize.GetSize()); + Size aSz(aFrameSize.GetSize()); aSz.setHeight( convertMm100ToTwip(nHeight) ); aFrameSize.SetSize(aSz); } diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index bb6d8f770ee1..38bb11c72da6 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -304,7 +304,7 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum, return false; bool bWinSizeValid = _rPxWinSize.Width() != 0 && _rPxWinSize.Height() != 0; - OSL_ENSURE( bWinSizeValid, "no window size - no prepare of preview paint"); + OSL_ENSURE( bWinSizeValid, "no window size - no prepare of preview paint"); if ( !bWinSizeValid ) return false; diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 7379d879b6c2..7e0022f53c2b 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -69,7 +69,7 @@ void SwViewShellImp::Init( const SwViewOption *pNewOpt ) const Size aFSize ( rSz.Width() ? rSz.Width() /std::max(short(1),pNewOpt->GetDivisionX()):0, rSz.Height()? rSz.Height()/std::max(short(1),pNewOpt->GetDivisionY()):0); - m_pDrawView->SetGridFine( aFSize ); + m_pDrawView->SetGridFine( aFSize ); Fraction aSnGrWdtX(rSz.Width(), pNewOpt->GetDivisionX() + 1); Fraction aSnGrWdtY(rSz.Height(), pNewOpt->GetDivisionY() + 1); m_pDrawView->SetSnapGridWidth( aSnGrWdtX, aSnGrWdtY ); diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 96fd2a7308fe..bab2ea90b4f3 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -2247,8 +2247,8 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) Fraction aSnGrWdtY(rSz.Height(), rOpt.GetDivisionY() + 1); pDView->SetSnapGridWidth( aSnGrWdtX, aSnGrWdtY ); - // set handle size to 9 pixels, always - pDView->SetMarkHdlSizePixel(9); + // set handle size to 9 pixels, always + pDView->SetMarkHdlSizePixel(9); } bool bOnlineSpellChgd = mpOpt->IsOnlineSpell() != rOpt.IsOnlineSpell(); diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 5b386da0da16..5f967ea514fd 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -49,7 +49,7 @@ void SwViewShell::Init( const SwViewOption *pNewOpt ) // We play it safe: Remove old font information whenever the printer // resolution or the zoom factor changes. For that, Init() and Reformat() // are the most secure places. - pFntCache->Flush( ); + pFntCache->Flush( ); // ViewOptions are created dynamically diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 4db87558ecb9..0e7b6622a260 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -540,7 +540,7 @@ rtl_TextEncoding CharSetFromName(const OUString& rChrSetStr) OSL_ENSURE(nRet != pStart->eCode, "TXT: That was an unknown language!"); - return nRet; + return nRet; } /* diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index bfd9d621a8e2..927efad68b98 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -750,7 +750,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, { if (rEntry.MakeRegion(pDoc, aRegion, true)) { - pDoc->getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::On + pDoc->getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::On | RedlineFlags::ShowInsert | RedlineFlags::ShowDelete ); SwFltRedline& rFltRedline = *static_cast<SwFltRedline*>(rEntry.pAttr.get()); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 331f0014c718..a2ba5a80c425 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -280,9 +280,9 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, "p." sCSS2_P_CLASS_leaders "{max-width:" + OString::number(DOT_LEADERS_MAX_WIDTH) + "cm;padding:0;overflow-x:hidden;line-height:120%}" "p." sCSS2_P_CLASS_leaders ":after{float:left;width:0;white-space:nowrap;content:\""); - for (int i = 0; i < 100; i++ ) - sOut.append(". "); - sOut.append( + for (int i = 0; i < 100; i++ ) + sOut.append(". "); + sOut.append( "\"}p." sCSS2_P_CLASS_leaders " span:first-child{padding-right:0.33em;background:white}" "p." sCSS2_P_CLASS_leaders " span+span{float:right;padding-left:0.33em;" "background:white;position:relative;z-index:1}"); @@ -529,7 +529,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc ) { // The document is one-sided; no matter what page, we do not create a 2-sided doc. // The attribute is exported relative to the HTML page template. - OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, m_xTemplate.get(), + OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, m_xTemplate.get(), RES_POOLPAGE_HTML, true, false ); nFirstRefPoolId = pFollow->GetPoolFormatId(); } @@ -539,9 +539,9 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc ) RES_POOLPAGE_LEFT == pFollow->GetPoolFormatId()) ) { // the document is double-sided - OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, m_xTemplate.get(), + OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, m_xTemplate.get(), RES_POOLPAGE_HTML, true ); - OutCSS1_SwPageDesc( *this, *pFollow, pStylePoolAccess, m_xTemplate.get(), + OutCSS1_SwPageDesc( *this, *pFollow, pStylePoolAccess, m_xTemplate.get(), RES_POOLPAGE_HTML, true ); nFirstRefPoolId = RES_POOLPAGE_RIGHT; m_bCSS1IgnoreFirstPageDesc = false; @@ -1459,7 +1459,7 @@ static void OutCSS1DropCapRule( SwCSS1OutMode aMode( rHTMLWrt, rHTMLWrt.m_nCSS1Script|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP, &rSelector ); - OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop ); + OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop ); } } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index e9153a61b691..50a7562cb858 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -796,7 +796,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat, rInfo.bOutDiv = true; rHWrt.IncIndentLevel(); rHWrt.m_bLFPossible = true; - rHWrt.OutNewLine(); + rHWrt.OutNewLine(); } // for BLOCKQUOTE, ADDRESS and DD we output another paragrah token, if diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 1c885c108132..c08bd868b084 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -182,7 +182,7 @@ static void SetCharFormatAttrs( SwCharFormat *pCharFormat, SfxItemSet& rItemSet const SfxPoolItem *pItem; static const sal_uInt16 aWhichIds[3] = { RES_CHRATR_FONTSIZE,RES_CHRATR_CJK_FONTSIZE, RES_CHRATR_CTL_FONTSIZE }; - for(sal_uInt16 i : aWhichIds) + for(sal_uInt16 i : aWhichIds) { if( SfxItemState::SET == rItemSet.GetItemState( i, false, &pItem ) && @@ -313,7 +313,7 @@ static void SetTextCollAttrs( SwTextFormatColl *pColl, SfxItemSet& rItemSet, static const sal_uInt16 aWhichIds[3] = { RES_CHRATR_FONTSIZE,RES_CHRATR_CJK_FONTSIZE, RES_CHRATR_CTL_FONTSIZE }; - for(sal_uInt16 i : aWhichIds) + for(sal_uInt16 i : aWhichIds) { if( SfxItemState::SET == rItemSet.GetItemState( i, false, &pItem ) && @@ -964,8 +964,8 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, } break; - default: - ; + default: + ; } if( nPoolCollId ) diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index c4bd7f94afaf..afee3575fb06 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -495,7 +495,7 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height ) uno::Reference< beans::XPropertySet > xPropSet( xShape, UNO_QUERY ); uno::Reference< XUnoTunnel> xTunnel( xPropSet, UNO_QUERY ); - SwXShape *pSwShape = xTunnel.is() ? + SwXShape *pSwShape = xTunnel.is() ? reinterpret_cast< SwXShape * >( sal::static_int_cast< sal_IntPtr>( xTunnel->getSomething(SwXShape::getUnoTunnelId()) )) : nullptr; @@ -1687,7 +1687,7 @@ void SwHTMLParser::InsertInput() case HTMLInputType::Submit: case HTMLInputType::Reset: { - FormButtonType eButtonType; + FormButtonType eButtonType; switch( eType ) { case HTMLInputType::Button: diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 7eb09296a6dd..605ba1dfea2b 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -499,7 +499,7 @@ IMAGE_SETEVENT: { GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); aGraphic = rFilter.ImportUnloadedGraphic(*pStream); - sGrfNm.clear(); + sGrfNm.clear(); if (!sGrfNm.isEmpty()) { diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 2b04ee9d5e58..4e071fdd744d 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -818,7 +818,7 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells ) OSL_ENSURE(nCells < m_aCells.size(), "number of cells too large"); #if OSL_DEBUG_LEVEL > 0 - sal_uInt16 const nEnd = m_aCells.size(); + sal_uInt16 const nEnd = m_aCells.size(); #endif // The colspan of empty cells at the end has to be fixed to the new // number of cells. diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index aa453421f05b..9f3a9d335b11 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -725,23 +725,23 @@ void SwHTMLParser::Continue( HtmlTokenId nToken ) #if OSL_DEBUG_LEVEL > 0 // !!! shouldn't be possible, or ?? -OSL_ENSURE( m_pSttNdIdx->GetIndex()+1 != m_pPam->GetBound().nNode.GetIndex(), - "Pam.Bound1 is still in the node" ); -OSL_ENSURE( m_pSttNdIdx->GetIndex()+1 != m_pPam->GetBound( false ).nNode.GetIndex(), - "Pam.Bound2 is still in the node" ); + OSL_ENSURE( m_pSttNdIdx->GetIndex()+1 != m_pPam->GetBound().nNode.GetIndex(), + "Pam.Bound1 is still in the node" ); + OSL_ENSURE( m_pSttNdIdx->GetIndex()+1 != m_pPam->GetBound( false ).nNode.GetIndex(), + "Pam.Bound2 is still in the node" ); -if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound().nNode.GetIndex() ) -{ - const sal_Int32 nCntPos = m_pPam->GetBound().nContent.GetIndex(); - m_pPam->GetBound().nContent.Assign( pTextNode, - pTextNode->GetText().getLength() + nCntPos ); -} -if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false ).nNode.GetIndex() ) -{ - const sal_Int32 nCntPos = m_pPam->GetBound( false ).nContent.GetIndex(); - m_pPam->GetBound( false ).nContent.Assign( pTextNode, - pTextNode->GetText().getLength() + nCntPos ); -} + if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound().nNode.GetIndex() ) + { + const sal_Int32 nCntPos = m_pPam->GetBound().nContent.GetIndex(); + m_pPam->GetBound().nContent.Assign( pTextNode, + pTextNode->GetText().getLength() + nCntPos ); + } + if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false ).nNode.GetIndex() ) + { + const sal_Int32 nCntPos = m_pPam->GetBound( false ).nContent.GetIndex(); + m_pPam->GetBound( false ).nContent.Assign( pTextNode, + pTextNode->GetText().getLength() + nCntPos ); + } #endif // Keep character attribute! SwTextNode* pDelNd = aNxtIdx.GetNode().GetTextNode(); @@ -2215,7 +2215,7 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum ) bool bScript = false; sal_uInt16 nScriptItem; bool bInsert = true; - lcl_swhtml_getItemInfo( *pAttr, bScript, + lcl_swhtml_getItemInfo( *pAttr, bScript, nScriptItem ); // set previous part if( bScript ) @@ -4730,9 +4730,7 @@ void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext ) // if applicable correct the paragraph indent const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace(); - bool bSetLRSpace; - - bSetLRSpace = nLeftMargin != rLRItem.GetTextLeft() || + bool bSetLRSpace = nLeftMargin != rLRItem.GetTextLeft() || nFirstLineIndent != rLRItem.GetTextFirstLineOfst() || nRightMargin != rLRItem.GetRight(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 46dc2ebfb07c..2b5bc45528b8 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -236,17 +236,17 @@ public: const OUString& rHint, bool bChecked ) { - writeCommonStart( rName, rEntryMacro, rExitMacro, rHelp, rHint ); - // Checkbox specific bits - m_pSerializer->startElementNS( XML_w, XML_checkBox, FSEND ); - // currently hardcoding autosize - // #TODO check if this defaulted - m_pSerializer->startElementNS( XML_w, XML_sizeAuto, FSEND ); - m_pSerializer->endElementNS( XML_w, XML_sizeAuto ); - if ( bChecked ) + writeCommonStart( rName, rEntryMacro, rExitMacro, rHelp, rHint ); + // Checkbox specific bits + m_pSerializer->startElementNS( XML_w, XML_checkBox, FSEND ); + // currently hardcoding autosize + // #TODO check if this defaulted + m_pSerializer->startElementNS( XML_w, XML_sizeAuto, FSEND ); + m_pSerializer->endElementNS( XML_w, XML_sizeAuto ); + if ( bChecked ) m_pSerializer->singleElementNS( XML_w, XML_checked, FSEND ); m_pSerializer->endElementNS( XML_w, XML_checkBox ); - writeFinish(); + writeFinish(); } void WriteFormText( const OUString& rName, const OUString& rEntryMacro, @@ -281,7 +281,7 @@ public: FSEND ); m_pSerializer->endElementNS( XML_w, XML_textInput ); - writeFinish(); + writeFinish(); } }; @@ -6930,7 +6930,7 @@ void DocxAttributeOutput::CharEscapement( const SvxEscapementItem& rEscapement ) if( ( 100 != nProp || sIss.match( "baseline" ) ) && !m_rExport.m_bFontSizeWritten ) { OString sSize = OString::number( ( nHeight * nProp + 500 ) / 1000 ); - m_pSerializer->singleElementNS( XML_w, XML_sz, + m_pSerializer->singleElementNS( XML_w, XML_sz, FSNS( XML_w, XML_val ), sSize.getStr( ), FSEND ); } } diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index fb7eb937a91f..fc69bb8ed574 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -861,8 +861,8 @@ namespace sw } // Force to NatNum when finding one of 'oOA' - bool bForceNatNum = replaceUnquoted( rParams, "o", "m"); - bForceNatNum |= replaceUnquoted( rParams, "O", "M"); + bool bForceNatNum = replaceUnquoted( rParams, "o", "m") + || replaceUnquoted( rParams, "O", "M"); if (LANGUAGE_FRENCH != nDocLang) { // Handle the 'A' case here diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 4bbd6e3f1bd0..b737fa123792 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -245,10 +245,10 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo else if( eProtocol != INetProtocol::NotValid ) { tmpStrm.WriteBytes(aGuidUrlMoniker, sizeof(aGuidUrlMoniker)); - SwWW8Writer::WriteLong(tmpStrm, 2*(rUrl.getLength()+1)); + SwWW8Writer::WriteLong(tmpStrm, 2*(rUrl.getLength()+1)); SwWW8Writer::WriteString16(tmpStrm, rUrl, true); - nFlags |= WW8_HLINK_BODY | WW8_HLINK_ABS; + nFlags |= WW8_HLINK_BODY | WW8_HLINK_ABS; } else if (rUrl[0] == '#' ) { @@ -265,7 +265,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo if (!tmpTextMark.isEmpty()) { SwWW8Writer::WriteLong(tmpStrm, tmpTextMark.getLength()+1); - SwWW8Writer::WriteString16(tmpStrm, tmpTextMark, true); + SwWW8Writer::WriteString16(tmpStrm, tmpTextMark, true); nFlags |= WW8_HLINK_MARK; } @@ -2330,7 +2330,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) CloseContainer(); // ESCHER_SpContainer } - CloseContainer(); // ESCHER_DgContainer + CloseContainer(); // ESCHER_DgContainer } } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 183b251c27d4..3906acfaf20c 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2384,7 +2384,7 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t } } - m_rWW8Export.InsInt16( nTableOffset ); + m_rWW8Export.InsInt16( nTableOffset ); ww8::GridColsPtr pGridCols = GetGridCols( pTableTextNodeInfoInner ); for ( const auto nCol : *pGridCols ) @@ -4001,7 +4001,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | /16 0,0,0,0, // / /4 }; - sal_uInt32 slen = sizeof(sal_uInt32) + sal_uInt32 slen = sizeof(sal_uInt32) + sizeof(aFieldData) + sizeof( aFieldHeader.version ) + sizeof( aFieldHeader.bits ) + sizeof( aFieldHeader.cch ) + sizeof( aFieldHeader.hps ) + 2*ffname.getLength() + 4 diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 4732ef28c74d..f5591d64d1e4 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2743,8 +2743,8 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp) WW8PLCFxSave1 aSave; m_xPlcxMan->GetPap()->Save( aSave ); - // Numbering for cell borders causes a crash -> no Anls in Tables - if (m_bAnl) + // Numbering for cell borders causes a crash -> no Anls in Tables + if (m_bAnl) StopAllAnl(); if(m_nInTable < nCellLevel) @@ -3957,7 +3957,7 @@ void SwWW8ImplReader::ReadAttrs(WW8_CP& rTextPos, WW8_CP& rNext, long nTextEnd, * is false. * Due to this we need to set the template here as a kind of special treatment. */ - if (!m_bCpxStyle && m_nCurrentColl < m_vColl.size()) + if (!m_bCpxStyle && m_nCurrentColl < m_vColl.size()) SetTextFormatCollAndListLevel(*m_pPaM, m_vColl[m_nCurrentColl]); rbStartLine = false; } diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index ef2bc17f0986..953056a5a8f4 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -3510,7 +3510,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, OUString& rStr } // use the result - OSL_ENSURE(!sURL.isEmpty() || !sMark.isEmpty(), "WW8: Empty URL"); + OSL_ENSURE(!sURL.isEmpty() || !sMark.isEmpty(), "WW8: Empty URL"); if( !sMark.isEmpty() ) sURL = sURL + "#" + sMark; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index a03bdc17e12e..4902f5de2155 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -777,7 +777,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher() wwSprmParser::wwSprmParser(const WW8Fib& rFib) : meVersion(rFib.GetFIBVersion()) { - OSL_ENSURE((meVersion >= ww::eWW1 && meVersion <= ww::eWW8), + OSL_ENSURE((meVersion >= ww::eWW1 && meVersion <= ww::eWW8), "Impossible value for version"); mnDelta = (ww::IsSevenMinus(meVersion)) ? 0 : 1; @@ -6112,12 +6112,12 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset): } else if (IsEightPlus(eVer)) { - m_fMac = aVer8Bits1 & 0x01 ; - m_fEmptySpecial = ( aVer8Bits1 & 0x02 ) >> 1; - m_fLoadOverridePage = ( aVer8Bits1 & 0x04 ) >> 2; - m_fFuturesavedUndo = ( aVer8Bits1 & 0x08 ) >> 3; - m_fWord97Saved = ( aVer8Bits1 & 0x10 ) >> 4; - m_fWord2000Saved = ( aVer8Bits1 & 0x20 ) >> 5; + m_fMac = aVer8Bits1 & 0x01 ; + m_fEmptySpecial = ( aVer8Bits1 & 0x02 ) >> 1; + m_fLoadOverridePage = ( aVer8Bits1 & 0x04 ) >> 2; + m_fFuturesavedUndo = ( aVer8Bits1 & 0x08 ) >> 3; + m_fWord97Saved = ( aVer8Bits1 & 0x10 ) >> 4; + m_fWord2000Saved = ( aVer8Bits1 & 0x20 ) >> 5; /* especially for WW8: @@ -7969,24 +7969,24 @@ void WW8Dop::SetCompatibilityOptions2(sal_uInt32 a32Bit) fCompatibilityOptions_Unknown2_2 = ( a32Bit & 0x00000002 ) >> 1 ; fDontUseHTMLAutoSpacing = ( a32Bit & 0x00000004 ) >> 2 ; fCompatibilityOptions_Unknown2_4 = ( a32Bit & 0x00000008 ) >> 3 ; - fCompatibilityOptions_Unknown2_5 = ( a32Bit & 0x00000010 ) >> 4 ; - fCompatibilityOptions_Unknown2_6 = ( a32Bit & 0x00000020 ) >> 5 ; - fCompatibilityOptions_Unknown2_7 = ( a32Bit & 0x00000040 ) >> 6 ; - fCompatibilityOptions_Unknown2_8 = ( a32Bit & 0x00000080 ) >> 7 ; - fCompatibilityOptions_Unknown2_9 = ( a32Bit & 0x00000100 ) >> 8 ; - fCompatibilityOptions_Unknown2_10 = ( a32Bit & 0x00000200 ) >> 9 ; - fCompatibilityOptions_Unknown2_11 = ( a32Bit & 0x00000400 ) >> 10 ; - fCompatibilityOptions_Unknown2_12 = ( a32Bit & 0x00000800 ) >> 11 ; + fCompatibilityOptions_Unknown2_5 = ( a32Bit & 0x00000010 ) >> 4 ; + fCompatibilityOptions_Unknown2_6 = ( a32Bit & 0x00000020 ) >> 5 ; + fCompatibilityOptions_Unknown2_7 = ( a32Bit & 0x00000040 ) >> 6 ; + fCompatibilityOptions_Unknown2_8 = ( a32Bit & 0x00000080 ) >> 7 ; + fCompatibilityOptions_Unknown2_9 = ( a32Bit & 0x00000100 ) >> 8 ; + fCompatibilityOptions_Unknown2_10 = ( a32Bit & 0x00000200 ) >> 9 ; + fCompatibilityOptions_Unknown2_11 = ( a32Bit & 0x00000400 ) >> 10 ; + fCompatibilityOptions_Unknown2_12 = ( a32Bit & 0x00000800 ) >> 11 ; fCompatibilityOptions_Unknown2_13 = ( a32Bit & 0x00001000 ) >> 12 ; fCompatibilityOptions_Unknown2_14 = ( a32Bit & 0x00002000 ) >> 13 ; fCompatibilityOptions_Unknown2_15 = ( a32Bit & 0x00004000 ) >> 14 ; fCompatibilityOptions_Unknown2_16 = ( a32Bit & 0x00008000 ) >> 15 ; - fCompatibilityOptions_Unknown2_17 = ( a32Bit & 0x00010000 ) >> 16 ; - fCompatibilityOptions_Unknown2_18 = ( a32Bit & 0x00020000 ) >> 17 ; - fCompatibilityOptions_Unknown2_19 = ( a32Bit & 0x00040000 ) >> 18 ; - fCompatibilityOptions_Unknown2_20 = ( a32Bit & 0x00080000 ) >> 19 ; + fCompatibilityOptions_Unknown2_17 = ( a32Bit & 0x00010000 ) >> 16 ; + fCompatibilityOptions_Unknown2_18 = ( a32Bit & 0x00020000 ) >> 17 ; + fCompatibilityOptions_Unknown2_19 = ( a32Bit & 0x00040000 ) >> 18 ; + fCompatibilityOptions_Unknown2_20 = ( a32Bit & 0x00080000 ) >> 19 ; fCompatibilityOptions_Unknown2_21 = ( a32Bit & 0x00100000 ) >> 20 ; - fCompatibilityOptions_Unknown2_22 = ( a32Bit & 0x00200000 ) >> 21 ; + fCompatibilityOptions_Unknown2_22 = ( a32Bit & 0x00200000 ) >> 21 ; fCompatibilityOptions_Unknown2_23 = ( a32Bit & 0x00400000 ) >> 22 ; fCompatibilityOptions_Unknown2_24 = ( a32Bit & 0x00800800 ) >> 23 ; fCompatibilityOptions_Unknown2_25 = ( a32Bit & 0x01000800 ) >> 24 ; @@ -7996,7 +7996,7 @@ void WW8Dop::SetCompatibilityOptions2(sal_uInt32 a32Bit) fCompatibilityOptions_Unknown2_29 = ( a32Bit & 0x10000800 ) >> 28 ; fCompatibilityOptions_Unknown2_30 = ( a32Bit & 0x20000800 ) >> 29 ; fCompatibilityOptions_Unknown2_31 = ( a32Bit & 0x40000800 ) >> 30 ; - fCompatibilityOptions_Unknown2_32 = ( a32Bit & 0x80000000 ) >> 31 ; + fCompatibilityOptions_Unknown2_32 = ( a32Bit & 0x80000000 ) >> 31 ; } sal_uInt32 WW8Dop::GetCompatibilityOptions2() const diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index ff3c874f7b75..e096e7bcccc5 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -573,7 +573,7 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference< SwCTB* pCustTB = rWrapper.GetCustomizationData( pMenu->Name() ); if ( pCustTB ) { - uno::Reference< container::XIndexContainer > xMenuDesc = document::IndexedPropertyValues::create( comphelper::getProcessComponentContext() ); + uno::Reference< container::XIndexContainer > xMenuDesc = document::IndexedPropertyValues::create( comphelper::getProcessComponentContext() ); if ( !pCustTB->ImportMenuTB( rWrapper,xMenuDesc, helper ) ) return false; if ( !bIsMenuBar ) diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 3e408bed91bb..f6b0032dea00 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -319,7 +319,7 @@ XMLShapeExport* SwXMLExport::CreateShapeExport() Reference < XDrawPageSupplier > xDPS( GetModel(), UNO_QUERY ); if( xDPS.is() ) { - Reference < XShapes > xShapes( xDPS->getDrawPage(), UNO_QUERY ); + Reference < XShapes > xShapes( xDPS->getDrawPage(), UNO_QUERY ); pShapeExport->seekShapes( xShapes ); } @@ -353,7 +353,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) pDoc->GetDocShell()->GetVisArea( ASPECT_CONTENT ); bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MapUnit::MapTwip; - OSL_ENSURE( bTwip, "Map unit for visible area is not in TWIPS!" ); + OSL_ENSURE( bTwip, "Map unit for visible area is not in TWIPS!" ); pValue[1].Name = "ViewAreaTop"; pValue[1].Value <<= bTwip ? convertTwipToMm100 ( rRect.Top() ) : rRect.Top(); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index e76ae1a787fe..695c741f2fcf 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -506,7 +506,7 @@ void SwXMLImport::startDocument() Reference< XPropertySet > xImportInfo( getImportInfo() ); Reference< XPropertySetInfo > xPropertySetInfo; - if( xImportInfo.is() ) + if( xImportInfo.is() ) xPropertySetInfo = xImportInfo->getPropertySetInfo(); if( xPropertySetInfo.is() ) { diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 01d742dc1489..d7bbc44d2d20 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -557,7 +557,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( // We'll need a (valid) URL. If we don't have do not insert the link and return early. // Copy URL into URL object on the way. - INetURLObject aURLObj; + INetURLObject aURLObj; bool bValidURL = !rHRef.isEmpty() && aURLObj.SetURL( URIHelper::SmartRel2Abs( INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) ); @@ -694,7 +694,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( // We'll need a (valid) URL, or we need a MIME type. If we don't have // either, do not insert plugin and return early. Copy URL into URL object // on the way. - INetURLObject aURLObj; + INetURLObject aURLObj; bool bValidURL = !rHRef.isEmpty() && aURLObj.SetURL( URIHelper::SmartRel2Abs( INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) ); diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 97c0acbe8396..4f879a580f62 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -217,9 +217,8 @@ SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent, AddTabPage("columns", SwColumnPage::Create, SwColumnPage::GetRanges ); AddTabPage("macros", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), nullptr); - - break; } + break; default: OSL_ENSURE(false, "wrong family"); } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 49993753e587..ba85d16fcb5f 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -131,13 +131,13 @@ SwCaptionDialog::SwCaptionDialog(weld::Window *pParent, SwView &rV) //#i61007# order of captions ApplyCaptionOrder(); SwWrtShell &rSh = rView.GetWrtShell(); - uno::Reference< frame::XModel > xModel = rView.GetDocShell()->GetBaseModel(); + uno::Reference< frame::XModel > xModel = rView.GetDocShell()->GetBaseModel(); SelectionType eType = rSh.GetSelectionType(); if ( eType & SelectionType::Ole ) { eType = SelectionType::Graphic; - uno::Reference< text::XTextEmbeddedObjectsSupplier > xObjs(xModel, uno::UNO_QUERY); + uno::Reference< text::XTextEmbeddedObjectsSupplier > xObjs(xModel, uno::UNO_QUERY); xNameAccess = xObjs->getEmbeddedObjects(); } @@ -179,7 +179,7 @@ SwCaptionDialog::SwCaptionDialog(weld::Window *pParent, SwView &rV) //if not OLE if(!xNameAccess.is()) { - uno::Reference< text::XTextGraphicObjectsSupplier > xGraphics(xModel, uno::UNO_QUERY); + uno::Reference< text::XTextGraphicObjectsSupplier > xGraphics(xModel, uno::UNO_QUERY); xNameAccess = xGraphics->getGraphicObjects(); } @@ -195,7 +195,7 @@ SwCaptionDialog::SwCaptionDialog(weld::Window *pParent, SwView &rV) { nPoolId = RES_POOLCOLL_LABEL_FRAME; sString = rView.GetOldFrameCat(); - uno::Reference< text::XTextFramesSupplier > xFrames(xModel, uno::UNO_QUERY); + uno::Reference< text::XTextFramesSupplier > xFrames(xModel, uno::UNO_QUERY); xNameAccess = xFrames->getTextFrames(); } else if( eType == SelectionType::Text ) diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 17a5d1a9cb1f..d569144abec0 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -98,16 +98,16 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame&, void { try { - uno::Reference< frame::XModel > & xModel = m_pExampleFrame->GetModel(); + uno::Reference< frame::XModel > & xModel = m_pExampleFrame->GetModel(); uno::Reference< lang::XUnoTunnel > xDocTunnel(xModel, uno::UNO_QUERY); SwXTextDocument* pDoc = reinterpret_cast<SwXTextDocument*>(xDocTunnel->getSomething(SwXTextDocument::getUnoTunnelId())); if( pDoc ) pDoc->GetDocShell()->LoadStyles_( *m_rWrtShell.GetView().GetDocShell(), true ); - uno::Reference< text::XTextSectionsSupplier > xSectionSupplier( + uno::Reference< text::XTextSectionsSupplier > xSectionSupplier( xModel, uno::UNO_QUERY); - uno::Reference< container::XNameAccess > xSections = + uno::Reference< container::XNameAccess > xSections = xSectionSupplier->getTextSections(); for(int i = 0; i < 7; ++i ) @@ -115,9 +115,9 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame&, void OUString sTmp = "IndexSection_" + OUString::number(i); uno::Any aSection = xSections->getByName( sTmp ); aSection >>= m_vTypeData[i].m_pxIndexSections->xContainerSection; - } - uno::Reference< text::XDocumentIndexesSupplier > xIdxSupp(xModel, uno::UNO_QUERY); - uno::Reference< container::XIndexAccess > xIdxs = xIdxSupp->getDocumentIndexes(); + } + uno::Reference< text::XDocumentIndexesSupplier > xIdxSupp(xModel, uno::UNO_QUERY); + uno::Reference< container::XIndexAccess > xIdxs = xIdxSupp->getDocumentIndexes(); int n = xIdxs->getCount(); while(n) { @@ -154,13 +154,13 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( "com.sun.star.text.Bibliography" }; - OSL_ENSURE(m_vTypeData[nTOXIndex].m_pxIndexSections && + OSL_ENSURE(m_vTypeData[nTOXIndex].m_pxIndexSections && m_vTypeData[nTOXIndex].m_pxIndexSections->xContainerSection.is(), "Section not created"); - uno::Reference< frame::XModel > & xModel = m_pExampleFrame->GetModel(); - bool bInitialCreate = true; - if(!m_vTypeData[nTOXIndex].m_pxIndexSections->xDocumentIndex.is()) - { + uno::Reference< frame::XModel > & xModel = m_pExampleFrame->GetModel(); + bool bInitialCreate = true; + if(!m_vTypeData[nTOXIndex].m_pxIndexSections->xDocumentIndex.is()) + { bInitialCreate = true; if(!m_vTypeData[nTOXIndex].m_pxIndexSections->xContainerSection.is()) throw uno::RuntimeException(); @@ -176,22 +176,22 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( uno::Reference< text::XTextContent > xContent(m_vTypeData[nTOXIndex].m_pxIndexSections->xDocumentIndex, uno::UNO_QUERY); uno::Reference< text::XTextRange > xRg(xCursor, uno::UNO_QUERY); xCursor->getText()->insertTextContent(xRg, xContent, false); - } - for(sal_uInt16 i = 0 ; i <= TOX_AUTHORITIES; i++) - { + } + for(sal_uInt16 i = 0 ; i <= TOX_AUTHORITIES; i++) + { uno::Reference< beans::XPropertySet > xSectPr(m_vTypeData[i].m_pxIndexSections->xContainerSection, uno::UNO_QUERY); if(xSectPr.is()) { xSectPr->setPropertyValue(UNO_NAME_IS_VISIBLE, makeAny(i == nTOXIndex)); } - } - // set properties - uno::Reference< beans::XPropertySet > xIdxProps(m_vTypeData[nTOXIndex].m_pxIndexSections->xDocumentIndex, uno::UNO_QUERY); - uno::Reference< beans::XPropertySetInfo > xInfo = xIdxProps->getPropertySetInfo(); - SwTOXDescription& rDesc = GetTOXDescription(m_eCurrentTOXType); - SwTOIOptions nIdxOptions = rDesc.GetIndexOptions(); - if(bInitialCreate || !nPage || nPage == TOX_PAGE_SELECT) - { + } + // set properties + uno::Reference< beans::XPropertySet > xIdxProps(m_vTypeData[nTOXIndex].m_pxIndexSections->xDocumentIndex, uno::UNO_QUERY); + uno::Reference< beans::XPropertySetInfo > xInfo = xIdxProps->getPropertySetInfo(); + SwTOXDescription& rDesc = GetTOXDescription(m_eCurrentTOXType); + SwTOIOptions nIdxOptions = rDesc.GetIndexOptions(); + if(bInitialCreate || !nPage || nPage == TOX_PAGE_SELECT) + { //title if(rDesc.GetTitle()) lcl_SetProp(xInfo, xIdxProps, UNO_NAME_TITLE, *rDesc.GetTitle()); @@ -264,10 +264,10 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_CALC, bool(SwTOOElements::Calc &nOLEOptions )); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_DRAW, bool(SwTOOElements::DrawImpress&nOLEOptions)); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS, bool(SwTOOElements::Other & nOLEOptions)); - } - const SwForm* pForm = GetForm(m_eCurrentTOXType); - if(bInitialCreate || !nPage || nPage == TOX_PAGE_ENTRY) - { + } + const SwForm* pForm = GetForm(m_eCurrentTOXType); + if(bInitialCreate || !nPage || nPage == TOX_PAGE_ENTRY) + { lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_IS_COMMA_SEPARATED, pForm->IsCommaSeparated()); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_USE_ALPHABETICAL_SEPARATORS, bool(nIdxOptions&SwTOIOptions::AlphaDelimiter)); const bool bUseCurrent = nCurrentLevel < pForm->GetFormMax(); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 27c210083eaf..a29266b9de16 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -868,13 +868,13 @@ void SwGlTreeListBox::RequestHelp( const HelpEvent& rHEvt ) if(pItem) { aPos = GetEntryPosition( pEntry ); - Size aSize(pItem->GetSize( this, pEntry )); + Size aSize(pItem->GetSize( this, pEntry )); aPos.setX( GetTabPos( pEntry, pTab ) ); if((aPos.X() + aSize.Width()) > GetSizePixel().Width()) aSize.setWidth( GetSizePixel().Width() - aPos.X() ); aPos = OutputToScreenPixel(aPos); - tools::Rectangle aItemRect( aPos, aSize ); + tools::Rectangle aItemRect( aPos, aSize ); OUString sMsg; if(!GetParent(pEntry)) { diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index 1fd1b3253b90..0cae7ab84946 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -465,7 +465,7 @@ SwVbaDocument::getControlShape( const OUString& sName ) uno::Reference< drawing::XControlShape > xControlShape( aUnoObj, uno::UNO_QUERY ); if( xControlShape.is() ) { - uno::Reference< container::XNamed > xNamed( xControlShape->getControl(), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNamed > xNamed( xControlShape->getControl(), uno::UNO_QUERY_THROW ); if( sName == xNamed->getName() ) { return aUnoObj; @@ -527,7 +527,7 @@ SwVbaDocument::getFormControls() { uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< form::XFormsSupplier > xFormSupplier( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XIndexAccess > xIndexAccess( xFormSupplier->getForms(), uno::UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xIndexAccess( xFormSupplier->getForms(), uno::UNO_QUERY_THROW ); // get the www-standard container ( maybe we should access the // 'www-standard' by name rather than index, this seems an // implementation detail diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index a4748c8ce218..cac6821353e2 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -144,7 +144,7 @@ SwVbaFont::setColorIndex( const uno::Any& _colorindex ) uno::Any SAL_CALL SwVbaFont::getColorIndex() { - sal_Int32 nColor = 0; + sal_Int32 nColor = 0; XLRGBToOORGB( getColor() ) >>= nColor; sal_Int32 nElems = mxPalette->getCount(); diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index a85f0c767cff..d6b89abf4448 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -61,7 +61,7 @@ SwVbaGlobals::getApplication() if ( !mxApplication.is() ) mxApplication.set( new SwVbaApplication( mxContext) ); - return mxApplication; + return mxApplication; } uno::Reference<word::XSystem > SAL_CALL diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 36a9d777e0d0..f02549e38c6f 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -77,23 +77,23 @@ std::unique_ptr<SfxItemSet> SwModule::CreateItemSet( sal_uInt16 nId ) bool bTextDialog = (nId == SID_SW_EDITOPTIONS); // the options for the Web- and Textdialog are put together here - SwViewOption aViewOpt = *GetUsrPref(!bTextDialog); - SwMasterUsrPref* pPref = bTextDialog ? m_pUsrPref.get() : m_pWebUsrPref.get(); - // no MakeUsrPref, because only options from textdoks can be used here - SwView* pAppView = GetView(); - if(pAppView && pAppView->GetViewFrame() != SfxViewFrame::Current()) - pAppView = nullptr; - if(pAppView) + SwViewOption aViewOpt = *GetUsrPref(!bTextDialog); + SwMasterUsrPref* pPref = bTextDialog ? m_pUsrPref.get() : m_pWebUsrPref.get(); + // no MakeUsrPref, because only options from textdoks can be used here + SwView* pAppView = GetView(); + if(pAppView && pAppView->GetViewFrame() != SfxViewFrame::Current()) + pAppView = nullptr; + if(pAppView) + { + bool bWebView = dynamic_cast<SwWebView*>( pAppView ) != nullptr; + // if Text then no WebView and vice versa + if (bWebView != bTextDialog) { - bool bWebView = dynamic_cast<SwWebView*>( pAppView ) != nullptr; - // if Text then no WebView and vice versa - if (bWebView != bTextDialog) - { - aViewOpt = *pAppView->GetWrtShell().GetViewOptions(); - } - else - pAppView = nullptr; // with View, there's nothing to win here + aViewOpt = *pAppView->GetWrtShell().GetViewOptions(); } + else + pAppView = nullptr; // with View, there's nothing to win here + } // Options/Edit auto pRet = std::make_unique<SfxItemSet>( @@ -191,7 +191,7 @@ std::unique_ptr<SfxItemSet> SwModule::CreateItemSet( sal_uInt16 nId ) { const SvxTabStopItem& rDefTabs = pAppView->GetWrtShell().GetDefault(RES_PARATR_TABSTOP); - pRet->Put( SfxUInt16Item( SID_ATTR_DEFTABSTOP, static_cast<sal_uInt16>(::GetTabDist(rDefTabs)))); + pRet->Put( SfxUInt16Item( SID_ATTR_DEFTABSTOP, static_cast<sal_uInt16>(::GetTabDist(rDefTabs)))); } else pRet->Put(SfxUInt16Item( SID_ATTR_DEFTABSTOP, static_cast<sal_uInt16>(convertMm100ToTwip(pPref->GetDefTabInMm100())))); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 0d30c019c1d0..5f4f72a7da8c 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -1408,8 +1408,8 @@ void SwDocShell::SetModified( bool bSet ) SfxObjectShell::SetModified( bSet ); if( IsEnableSetModified()) { - if (!m_xDoc->getIDocumentState().IsInCallModified()) - { + if (!m_xDoc->getIDocumentState().IsInCallModified()) + { EnableSetModified( false ); if( bSet ) { @@ -1424,7 +1424,7 @@ void SwDocShell::SetModified( bool bSet ) m_xDoc->getIDocumentState().ResetModified(); EnableSetModified(); - } + } UpdateChildWindows(); Broadcast(SfxHint(SfxHintId::DocChanged)); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 5f680efb389e..d181b485602f 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -206,7 +206,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) // #107782# OJ use korean language if latin was used if ( i == 0 ) { - LanguageType eUiLanguage = Application::GetSettings().GetUILanguageTag().getLanguageType(); + LanguageType eUiLanguage = Application::GetSettings().GetUILanguageTag().getLanguageType(); if (MsLangId::isKorean(eUiLanguage)) eLanguage = eUiLanguage; } diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 089b4aa99c20..e57b4e50e0d7 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -733,8 +733,8 @@ void SwDocShell::Edit( { SwCharFormat* pCFormat = m_pWrtShell->GetCurCharFormat(); pDStyle->GetCharFormat()->SetDerivedFrom( pCFormat ); - if( pCFormat ) - pDStyle->PresetParent( pCFormat->GetName() ); + if( pCFormat ) + pDStyle->PresetParent( pCFormat->GetName() ); } } break; diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 024ad5f370b0..4bfa5bc72333 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -135,7 +135,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b { if( pOut && bIsScript ) { - Color aOldLineColor( pOut->GetLineColor() ); + Color aOldLineColor( pOut->GetLineColor() ); pOut->SetLineColor( COL_GRAY ); // to make it look nice, we subtract two pixels everywhere sal_uInt16 nPix = s_nPixelTwips * 2; @@ -145,7 +145,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b const Point aBotRight( rRect.Right() - nPix, rRect.Bottom() - nPix ); const SwRect aRect( aTopLeft, aBotRight ); DrawRect( pOut, aRect, s_aScriptIndicatorColor ); - pOut->SetLineColor( aOldLineColor ); + pOut->SetLineColor( aOldLineColor ); } } diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 0c99d8424688..247192893a2f 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -480,7 +480,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo } if( m_pWrtShell->IsFrameSelected() ) { - SfxItemSet aSet( m_pWrtShell->GetAttrPool(), svl::Items<RES_URL, RES_URL>{} ); + SfxItemSet aSet( m_pWrtShell->GetAttrPool(), svl::Items<RES_URL, RES_URL>{} ); m_pWrtShell->GetFlyFrameAttr( aSet ); const SwFormatURL& rURL = aSet.Get( RES_URL ); if( rURL.GetMap() ) @@ -614,7 +614,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo bOK = SetObject( &m_aDocShellRef, SWTRANSFER_OBJECTTYPE_SWOLE, rFlavor ); break; - default: break; + default: break; } } return bOK; @@ -1959,7 +1959,7 @@ bool SwTransferable::PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, uno::Reference< embed::XStorage > xTmpStor; uno::Reference < embed::XEmbeddedObject > xObj; OUString aName; - comphelper::EmbeddedObjectContainer aCnt; + comphelper::EmbeddedObjectContainer aCnt; if ( xStrm.is() ) { diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index 7c693ebe5e48..ac843adaf2e7 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -256,7 +256,7 @@ void AnchorOverlayObject::implEnsureGeometry() maLine.append(GetSixthPosition()); } - if(!maLineTop.count()) + if(!maLineTop.count()) { maLineTop.append(GetSixthPosition()); maLineTop.append(GetSeventhPosition()); @@ -321,7 +321,7 @@ void AnchorOverlayObject::SetSixthPosition(const basegfx::B2DPoint& rNew) if(rNew != maSixthPosition) { maSixthPosition = rNew; - implResetGeometry(); + implResetGeometry(); objectChange(); } } @@ -331,7 +331,7 @@ void AnchorOverlayObject::SetSeventhPosition(const basegfx::B2DPoint& rNew) if(rNew != maSeventhPosition) { maSeventhPosition = rNew; - implResetGeometry(); + implResetGeometry(); objectChange(); } } diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index ce9a65ad8eda..be3ae822967d 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -2260,7 +2260,7 @@ sal_uInt16 SwPostItMgr::SearchReplace(const SwFormatField &pField, const i18nuti void SwPostItMgr::AssureStdModeAtShell() { // deselect any drawing or frame and leave editing mode - SdrView* pSdrView = mpWrtShell->GetDrawView(); + SdrView* pSdrView = mpWrtShell->GetDrawView(); if ( pSdrView && pSdrView->IsTextEdit() ) { bool bLockView = mpWrtShell->IsViewLocked(); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 43f1b9ad920c..494d0ad575cb 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -5343,10 +5343,10 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) rSh.SetExtTextInputData( *pData ); } } - uno::Reference< frame::XDispatchRecorder > xRecorder = + uno::Reference< frame::XDispatchRecorder > xRecorder = m_rView.GetViewFrame()->GetBindings().GetRecorder(); - if(!xRecorder.is()) - { + if(!xRecorder.is()) + { SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get(); SvxAutoCorrect* pACorr = rACfg.GetAutoCorrect(); if( pACorr && @@ -5359,7 +5359,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) // ... request for auto completion help to be shown. ShowAutoTextCorrectQuickHelp(sWord, &rACfg, pACorr, true); } - } + } } } break; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 92faf193d56f..64c93b7f1a07 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -470,24 +470,24 @@ SwField* SwFieldMgr::GetCurField() // provide group range const SwFieldGroupRgn& SwFieldMgr::GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId) { -static SwFieldGroupRgn const aRanges[] = -{ - { /* Document */ GRP_DOC_BEGIN, GRP_DOC_END }, - { /* Functions */ GRP_FKT_BEGIN, GRP_FKT_END }, - { /* Cross-Refs */ GRP_REF_BEGIN, GRP_REF_END }, - { /* DocInfos */ GRP_REG_BEGIN, GRP_REG_END }, - { /* Database */ GRP_DB_BEGIN, GRP_DB_END }, - { /* User */ GRP_VAR_BEGIN, GRP_VAR_END } -}; -static SwFieldGroupRgn const aWebRanges[] = -{ - { /* Document */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END }, - { /* Functions */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END }, - { /* Cross-Refs */ GRP_WEB_REF_BEGIN, GRP_WEB_REF_END }, - { /* DocInfos */ GRP_WEB_REG_BEGIN, GRP_WEB_REG_END }, - { /* Database */ GRP_WEB_DB_BEGIN, GRP_WEB_DB_END }, - { /* User */ GRP_WEB_VAR_BEGIN, GRP_WEB_VAR_END } -}; + static SwFieldGroupRgn const aRanges[] = + { + { /* Document */ GRP_DOC_BEGIN, GRP_DOC_END }, + { /* Functions */ GRP_FKT_BEGIN, GRP_FKT_END }, + { /* Cross-Refs */ GRP_REF_BEGIN, GRP_REF_END }, + { /* DocInfos */ GRP_REG_BEGIN, GRP_REG_END }, + { /* Database */ GRP_DB_BEGIN, GRP_DB_END }, + { /* User */ GRP_VAR_BEGIN, GRP_VAR_END } + }; + static SwFieldGroupRgn const aWebRanges[] = + { + { /* Document */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END }, + { /* Functions */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END }, + { /* Cross-Refs */ GRP_WEB_REF_BEGIN, GRP_WEB_REF_END }, + { /* DocInfos */ GRP_WEB_REG_BEGIN, GRP_WEB_REG_END }, + { /* Database */ GRP_WEB_DB_BEGIN, GRP_WEB_DB_END }, + { /* User */ GRP_WEB_VAR_BEGIN, GRP_WEB_VAR_END } + }; if (bHtmlMode) return aWebRanges[nGrpId]; diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index 4c8ec00ad591..b343ae05c6d1 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -78,10 +78,10 @@ void SwHyphWrapper::SpellContinue() pWait.reset(new SwWait( *pView->GetDocShell(), true )); } - uno::Reference< uno::XInterface > xHyphWord = bInSelection ? + uno::Reference< uno::XInterface > xHyphWord = bInSelection ? PSH->HyphContinue( nullptr, nullptr ) : PSH->HyphContinue( &nPageCount, &nPageStart ); - SetLast( xHyphWord ); + SetLast( xHyphWord ); // for automatic separation, make actions visible only at the end if( bAutomatic ) diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx index aafc47876851..bd7b43e377e7 100644 --- a/sw/source/uibase/lingu/sdrhhcwrap.cxx +++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx @@ -68,7 +68,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, MapMode aMapMode (MapUnit::MapTwip); SetRefMapMode(aMapMode); - Size aSize( 1, 1 ); + Size aSize( 1, 1 ); SetPaperSize( aSize ); pOutlView.reset( new OutlinerView( this, &(pView->GetEditWin()) ) ); @@ -79,7 +79,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, InsertView( pOutlView.get() ); Point aPoint( 0, 0 ); - tools::Rectangle aRect( aPoint, aSize ); + tools::Rectangle aRect( aPoint, aSize ); pOutlView->SetOutputArea( aRect ); // SetText( NULL ); ClearModifyFlag(); diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index 4aa0bdeedd64..351cccb629f7 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -272,15 +272,15 @@ bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt) m_pSh->EndCreate(SdrCreateCmd::ForceEnd); if (OBJ_NONE == nDrawMode) // Text border inserted { - uno::Reference< frame::XDispatchRecorder > xRecorder = + uno::Reference< frame::XDispatchRecorder > xRecorder = m_pSh->GetView().GetViewFrame()->GetBindings().GetRecorder(); if ( xRecorder.is() ) { SfxRequest aReq(m_pSh->GetView().GetViewFrame(),FN_INSERT_FRAME); - aReq.AppendItem(SfxUInt16Item( FN_INSERT_FRAME, + aReq .AppendItem(SfxUInt16Item( FN_INSERT_FRAME, static_cast<sal_uInt16>(RndStdIds::FLY_AT_PARA) )); - aReq.AppendItem(SfxPointItem( FN_PARAM_1, m_pSh->GetAnchorObjDiff())); - aReq.AppendItem(SvxSizeItem( FN_PARAM_2, m_pSh->GetObjSize())); + aReq.AppendItem(SfxPointItem( FN_PARAM_1, m_pSh->GetAnchorObjDiff())); + aReq.AppendItem(SvxSizeItem( FN_PARAM_2, m_pSh->GetObjSize())); aReq.Done(); } bAutoCap = true; @@ -473,7 +473,7 @@ void SwDrawBase::BreakCreate() void SwDrawBase::SetDrawPointer() { SdrView *pSdrView = m_pSh->GetDrawView(); - Point aPnt(m_pWin->OutputToScreenPixel(m_pWin->GetPointerPosPixel())); + Point aPnt(m_pWin->OutputToScreenPixel(m_pWin->GetPointerPosPixel())); aPnt = m_pWin->PixelToLogic(m_pWin->ScreenToOutputPixel(aPnt)); const Pointer aPointTyp = pSdrView->GetPreferredPointer(aPnt, m_pSh->GetOut()); const Pointer aDrawPt(aPointTyp); diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 5b14408bf170..6bc570387af3 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -503,7 +503,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) } else aNewAttr.Put(*pArgs); - break; + break; } case SID_PARA_DLG: { diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx index b5de83ed9218..f0a3cc3d31b0 100644 --- a/sw/source/uibase/shells/drformsh.cxx +++ b/sw/source/uibase/shells/drformsh.cxx @@ -188,7 +188,7 @@ void SwDrawFormShell::GetState(SfxItemSet& rSet) uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); if(xInfo->hasPropertyByName( "ButtonType" )) { - form::FormButtonType eButtonType = form::FormButtonType_URL; + form::FormButtonType eButtonType = form::FormButtonType_URL; aTmp = xPropSet->getPropertyValue( "ButtonType" ); if( aTmp >>= eButtonType ) { diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 5a13c7a1f5ba..f839e71615cf 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -384,22 +384,22 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq) } break; case SID_CHARMAP: - { // Insert special character - InsertSymbol(rReq); - break; - } - case FN_INSERT_STRING: - { + { // Insert special character + InsertSymbol(rReq); + break; + } + case FN_INSERT_STRING: + { const SfxItemSet *pNewAttrs = rReq.GetArgs(); - sal_uInt16 nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); const SfxPoolItem* pItem = nullptr; - if(pNewAttrs) + if(pNewAttrs) { - pNewAttrs->GetItemState(nSlot, false, &pItem ); - pOLV->InsertText(static_cast<const SfxStringItem *>(pItem)->GetValue()); + pNewAttrs->GetItemState(nSlot, false, &pItem ); + pOLV->InsertText(static_cast<const SfxStringItem *>(pItem)->GetValue()); } - break; - } + break; + } case SID_SELECTALL: { diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx index ea73b2032ecd..95237f233af4 100644 --- a/sw/source/uibase/shells/grfshex.cxx +++ b/sw/source/uibase/shells/grfshex.cxx @@ -94,7 +94,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest const & rReq ) rSh.MakeDrawView(); Size aDocSz( rSh.GetDocSize() ); - const SwRect& rVisArea = rSh.VisArea(); + const SwRect& rVisArea = rSh.VisArea(); Point aPos( rVisArea.Center() ); Size aSize; diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx index 13e27d1a162c..c495e9b1b7aa 100644 --- a/sw/source/uibase/shells/textdrw.cxx +++ b/sw/source/uibase/shells/textdrw.cxx @@ -61,7 +61,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, if (rSh.BeginCreate(OBJ_FM_BUTTON, SdrInventor::FmForm, aStartPos)) { pSdrView->SetOrtho(false); - Size aSz(GetView().GetEditWin().PixelToLogic(Size(140, 20))); + Size aSz(GetView().GetEditWin().PixelToLogic(Size(140, 20))); Point aEndPos(aSz.Width(), aSz.Height()); rSh.MoveCreate(aStartPos + aEndPos); diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 2b9603e28fca..58e9648c9c7d 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -499,9 +499,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) { //FN_INSERT_FRAME sal_uInt16 nAnchor = static_cast<sal_uInt16>(aMgr.GetAnchor()); - rReq.AppendItem(SfxUInt16Item(nSlot, nAnchor)); - rReq.AppendItem(SfxPointItem(FN_PARAM_1, rShell.GetObjAbsPos())); - rReq.AppendItem(SvxSizeItem(FN_PARAM_2, rShell.GetObjSize())); + rReq.AppendItem(SfxUInt16Item(nSlot, nAnchor)); + rReq.AppendItem(SfxPointItem(FN_PARAM_1, rShell.GetObjAbsPos())); + rReq.AppendItem(SvxSizeItem(FN_PARAM_2, rShell.GetObjSize())); rReq.Done(); } diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 0520e65184b4..1c77242e1af8 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -63,7 +63,7 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) { SwWrtShell &rSh = GetShell(); const SfxItemSet *pArgs = rReq.GetArgs(); - int eState = STATE_TOGGLE; + int eState = STATE_TOGGLE; sal_uInt16 nWhich = rReq.GetSlot(); if(pArgs ) diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 48a668f25f0d..3a4dee55a4d5 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -141,7 +141,7 @@ PageSizeControl::PageSizeControl( sal_uInt16 nId, vcl::Window* pParent ) Swap( aPaperSize ); } - maWidthHeightField->SetValue( maWidthHeightField->Normalize( aPaperSize.Width() ), FieldUnit::TWIP ); + maWidthHeightField->SetValue( maWidthHeightField->Normalize( aPaperSize.Width() ), FieldUnit::TWIP ); aWidthStr = localeDataWrapper.getNum( maWidthHeightField->GetValue(), maWidthHeightField->GetDecimalDigits(), diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx index 8e6b1b2d5046..76cadb99a208 100644 --- a/sw/source/uibase/uiview/formatclipboard.cxx +++ b/sw/source/uibase/uiview/formatclipboard.cxx @@ -99,7 +99,7 @@ std::unique_ptr<SfxItemSet> lcl_CreateEmptyItemSet( SelectionType nSelectionType void lcl_getTableAttributes( SfxItemSet& rSet, SwWrtShell &rSh ) { SvxBrushItem aBrush( RES_BACKGROUND ); - rSh.GetBoxBackground(aBrush); + rSh.GetBoxBackground(aBrush); rSet.Put( aBrush ); if(rSh.GetRowBackground(aBrush)) { diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 466f05770c12..b94b017c2ad4 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -457,7 +457,7 @@ void SwPagePreviewWin::Command( const CommandEvent& rCEvt ) const CommandWheelData aDataNew(pData->GetDelta(),pData->GetNotchDelta(),COMMAND_WHEEL_PAGESCROLL, pData->GetMode(),pData->GetModifier(),pData->IsHorz(), pData->IsDeltaPixel()); const CommandEvent aEvent( rCEvt.GetMousePosPixel(),rCEvt.GetCommand(),rCEvt.IsMouseEvent(),&aDataNew); - bCallBase = !mrView.HandleWheelCommands( aEvent ); + bCallBase = !mrView.HandleWheelCommands( aEvent ); } else bCallBase = !mrView.HandleWheelCommands( rCEvt ); @@ -1676,12 +1676,12 @@ sal_uInt16 SwPagePreview::SetPrinter( SfxPrinter *pNew, SfxPrinterChangeFlags n SID_RULER_BORDERS, SID_RULER_PAGE_POS, 0 }; #if OSL_DEBUG_LEVEL > 0 - { - const sal_uInt16* pPtr = aInval + 1; - do { - OSL_ENSURE( *(pPtr - 1) < *pPtr, "wrong sorting!" ); - } while( *++pPtr ); - } + { + const sal_uInt16* pPtr = aInval + 1; + do { + OSL_ENSURE( *(pPtr - 1) < *pPtr, "wrong sorting!" ); + } while( *++pPtr ); + } #endif GetViewFrame()->GetBindings().Invalidate(aInval); diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx index 763d6e7965b8..59e57d9f5888 100644 --- a/sw/source/uibase/uiview/scroll.cxx +++ b/sw/source/uibase/uiview/scroll.cxx @@ -107,15 +107,15 @@ void SwScrollbar::AutoShow() { long nVis = GetVisibleSize(); long nLen = GetRange().Len(); - if( nVis >= nLen - 1) - { - if(ScrollBar::IsVisible()) - ScrollBar::Show(false); - } - else if ( !ScrollBar::IsVisible() ) - { - ScrollBar::Show(); - } + if( nVis >= nLen - 1) + { + if(ScrollBar::IsVisible()) + ScrollBar::Show(false); + } + else if ( !ScrollBar::IsVisible() ) + { + ScrollBar::Show(); + } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 15c6926f021f..af8a22b53001 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -504,7 +504,7 @@ extern "C" IMPL_LINK_NOARG(SwView, AttrChangedNotify, SwCursorShell*, void) { - if ( GetEditWin().IsChainMode() ) + if ( GetEditWin().IsChainMode() ) GetEditWin().SetChainMode( false ); //Opt: Not if PaintLocked. During unlock a notify will be once more triggered. diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 331309ef025a..a1d8b6b4b1f0 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -160,7 +160,7 @@ Point SwView::AlignToPixel(const Point &rPt) const void SwView::DocSzChgd(const Size &rSz) { -m_aDocSz = rSz; + m_aDocSz = rSz; if( !m_pWrtShell || m_aVisArea.IsEmpty() ) // no shell -> no change { diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index 70b2bd98cf56..ca2aa004a257 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -378,7 +378,7 @@ void SwView::ExecSearch(SfxRequest& rReq) } nFound = FUNC_Search( aOpts ); // create it just to overwrite it with stack cursor - m_pWrtShell->CreateCursor(); + m_pWrtShell->CreateCursor(); // i#8288 restore the original cursor position m_pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent); m_pWrtShell->EndAllAction(); diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index a5f4c242097f..77d8c51b995d 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -623,7 +623,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) SvxTabStopItem aTabStops( static_cast<const SvxTabStopItem&>(pReqArgs-> Get( nWhich ))); aTabStops.SetWhich(RES_PARATR_TABSTOP); - const SvxTabStopItem& rDefTabs = rSh.GetDefault(RES_PARATR_TABSTOP); + const SvxTabStopItem& rDefTabs = rSh.GetDefault(RES_PARATR_TABSTOP); // Default tab at pos 0 SfxItemSet aSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{} ); @@ -1474,7 +1474,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) aLR.SetWhich(nWhich); rSet.Put(aLR); } - break; + break; } case SID_ATTR_PARA_ULSPACE: diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 9dde82793d77..70c4647fd3ab 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1167,7 +1167,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption SfxViewFrame* pFrame = SfxViewFrame::LoadHiddenDocument( *pDocShell, SfxInterfaceId(7) ); SfxRequest aReq(FN_PRINT_PAGEPREVIEW, SfxCallMode::SYNCHRON, pDocShell->GetDoc()->GetAttrPool()); - aReq.AppendItem(SfxBoolItem(FN_PRINT_PAGEPREVIEW, true)); + aReq.AppendItem(SfxBoolItem(FN_PRINT_PAGEPREVIEW, true)); for ( int n = 0; n < xOptions.getLength(); ++n ) { @@ -2271,7 +2271,7 @@ void SwXTextDocument::updateLinks( ) throw DisposedException("", static_cast< XTextDocument* >(this)); SwDoc* pDoc = pDocShell->GetDoc(); - sfx2::LinkManager& rLnkMan = pDoc->getIDocumentLinksAdministration().GetLinkManager(); + sfx2::LinkManager& rLnkMan = pDoc->getIDocumentLinksAdministration().GetLinkManager(); if( !rLnkMan.GetLinks().empty() ) { UnoActionContext aAction(pDoc); diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx index 73693825f740..18c6341e20c8 100644 --- a/sw/source/uibase/utlui/condedit.cxx +++ b/sw/source/uibase/utlui/condedit.cxx @@ -58,9 +58,9 @@ sal_Int8 ConditionEdit::ExecuteDrop( const ExecuteDropEvent& rEvt ) { TransferableDataHelper aData( rEvt.maDropEvent.Transferable ); - const DataFlavorExVector& rVector = aData.GetDataFlavorExVector(); - if(OColumnTransferable::canExtractColumnDescriptor(rVector, ColumnTransferFormatFlags::COLUMN_DESCRIPTOR)) - { + const DataFlavorExVector& rVector = aData.GetDataFlavorExVector(); + if(OColumnTransferable::canExtractColumnDescriptor(rVector, ColumnTransferFormatFlags::COLUMN_DESCRIPTOR)) + { ODataAccessDescriptor aColDesc = OColumnTransferable::extractColumnDescriptor( aData); OUString sDBName; @@ -82,7 +82,7 @@ sal_Int8 ConditionEdit::ExecuteDrop( const ExecuteDropEvent& rEvt ) SetText( sDBName ); nRet = DND_ACTION_COPY; - } + } } return nRet; } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 7b630d16fe80..9d27cd0ef02f 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3642,7 +3642,7 @@ void SwContentLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::Ren void SwContentTree::DataChanged(const DataChangedEvent& rDCEvt) { - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { FindActiveTypeAndRemoveUserData(); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 8e468e8f3910..e5d049f65ce9 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -937,7 +937,7 @@ void SwGlobalTree::ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SfxStringItem aFactory(SID_NEWDOCDIRECT, SwDocShell::Factory().GetFilterContainer()->GetName()); - const SfxFrameItem* pItem = static_cast<const SfxFrameItem*>( + const SfxFrameItem* pItem = static_cast<const SfxFrameItem*>( rDispatch.ExecuteList(SID_NEWDOCDIRECT, SfxCallMode::SYNCHRON, { &aFactory })); |