diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
| commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
| tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/source/core/access | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/source/core/access')
32 files changed, 472 insertions, 472 deletions
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index b52f9a476eef..4bab7aca9f32 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -337,13 +337,13 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId() // XAccessibleValue -SwFrmFmt* SwAccessibleCell::GetTblBoxFormat() const +SwFrameFormat* SwAccessibleCell::GetTableBoxFormat() const { assert(GetFrm()); assert(GetFrm()->IsCellFrm()); const SwCellFrm* pCellFrm = static_cast<const SwCellFrm*>( GetFrm() ); - return pCellFrm->GetTabBox()->GetFrmFmt(); + return pCellFrm->GetTabBox()->GetFrameFormat(); } //Implement TableCell currentValue @@ -354,7 +354,7 @@ uno::Any SwAccessibleCell::getCurrentValue( ) CHECK_FOR_DEFUNC( XAccessibleValue ); uno::Any aAny; - aAny <<= GetTblBoxFormat()->GetTblBoxValue().GetValue(); + aAny <<= GetTableBoxFormat()->GetTableBoxValue().GetValue(); return aAny; } @@ -368,8 +368,8 @@ sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber ) bool bValid = (aNumber >>= fValue); if( bValid ) { - SwTblBoxValue aValue( fValue ); - GetTblBoxFormat()->SetFmtAttr( aValue ); + SwTableBoxValue aValue( fValue ); + GetTableBoxFormat()->SetFormatAttr( aValue ); } return bValid; } @@ -418,10 +418,10 @@ static OUString ReplaceFourChar(const OUString& oldOUString) SolarMutexGuard g; ::com::sun::star::uno::Any strRet; - SwFrmFmt *pFrmFmt = GetTblBoxFormat(); - assert(pFrmFmt); + SwFrameFormat *pFrameFormat = GetTableBoxFormat(); + assert(pFrameFormat); - const SwTblBoxFormula& tbl_formula = pFrmFmt->GetTblBoxFormula(); + const SwTableBoxFormula& tbl_formula = pFrameFormat->GetTableBoxFormula(); OUString strFormula = ReplaceFourChar(tbl_formula.GetFormula()); OUString strFor("Formula:"); diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index 1a9991ff7e1a..5049b560b5d2 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -26,7 +26,7 @@ class SwCellFrm; class SwAccessibleTable; -class SwFrmFmt; +class SwFrameFormat; class SwAccessibleCell : public SwAccessibleContext, ::com::sun::star::accessibility::XAccessibleValue, @@ -113,7 +113,7 @@ public: ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; private: - SwFrmFmt* GetTblBoxFormat() const; + SwFrameFormat* GetTableBoxFormat() const; public: virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 30b19f62f059..09e5372440cb 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -920,22 +920,22 @@ void SAL_CALL SwAccessibleContext::grabFocus() } else { - const SwCntntFrm *pCFrm = 0; - if( GetFrm()->IsCntntFrm() ) - pCFrm = static_cast< const SwCntntFrm * >( GetFrm() ); + const SwContentFrm *pCFrm = 0; + if( GetFrm()->IsContentFrm() ) + pCFrm = static_cast< const SwContentFrm * >( GetFrm() ); else if( GetFrm()->IsLayoutFrm() ) - pCFrm = static_cast< const SwLayoutFrm * >( GetFrm() )->ContainsCntnt(); + pCFrm = static_cast< const SwLayoutFrm * >( GetFrm() )->ContainsContent(); - if( pCFrm && pCFrm->IsTxtFrm() ) + if( pCFrm && pCFrm->IsTextFrm() ) { - const SwTxtFrm *pTxtFrm = static_cast< const SwTxtFrm * >( pCFrm ); - const SwTxtNode *pTxtNd = pTxtFrm->GetTxtNode(); - if( pTxtNd ) + const SwTextFrm *pTextFrm = static_cast< const SwTextFrm * >( pCFrm ); + const SwTextNode *pTextNd = pTextFrm->GetTextNode(); + if( pTextNd ) { // create pam for selection - SwIndex aIndex( const_cast< SwTxtNode * >( pTxtNd ), - pTxtFrm->GetOfst() ); - SwPosition aStartPos( *pTxtNd, aIndex ); + SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ), + pTextFrm->GetOfst() ); + SwPosition aStartPos( *pTextNd, aIndex ); SwPaM aPaM( aStartPos ); // set PaM at cursor shell @@ -1425,7 +1425,7 @@ bool SwAccessibleContext::HasAdditionalAccessibleChildren() { bool bRet( false ); - if ( GetFrm()->IsTxtFrm() ) + if ( GetFrm()->IsTextFrm() ) { SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr(); if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() ) @@ -1442,7 +1442,7 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32 { vcl::Window* pAdditionalAccessibleChild( 0 ); - if ( GetFrm()->IsTxtFrm() ) + if ( GetFrm()->IsTextFrm() ) { SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr(); if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() ) @@ -1458,7 +1458,7 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32 /** #i88070# - get all additional accessible children */ void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< vcl::Window* >* pChildren ) { - if ( GetFrm()->IsTxtFrm() ) + if ( GetFrm()->IsTextFrm() ) { SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr(); if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() ) diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 435a2474be5a..d31a6f3be31c 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -593,32 +593,32 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() sAttrName = "line-number:"; - SwCntntFrm* pCurrFrm = pCrsrShell->GetCurrFrm(); + SwContentFrm* pCurrFrm = pCrsrShell->GetCurrFrm(); SwPageFrm* pCurrPage=static_cast<SwFrm*>(pCurrFrm)->FindPageFrm(); sal_uLong nLineNum = 0; - SwTxtFrm* pTxtFrm = NULL; - SwTxtFrm* pCurrTxtFrm = NULL; - pTxtFrm = static_cast< SwTxtFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsCntnt()); + SwTextFrm* pTextFrm = NULL; + SwTextFrm* pCurrTextFrm = NULL; + pTextFrm = static_cast< SwTextFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsContent()); if (pCurrFrm->IsInFly())//such as, graphic,chart { SwFlyFrm *pFlyFrm = pCurrFrm->FindFlyFrm(); - const SwFmtAnchor& rAnchor = pFlyFrm->GetFmt()->GetAnchor(); + const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor(); RndStdIds eAnchorId = rAnchor.GetAnchorId(); if(eAnchorId == FLY_AS_CHAR) { const SwFrm *pSwFrm = pFlyFrm->GetAnchorFrm(); - if(pSwFrm->IsTxtFrm()) - pCurrTxtFrm = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pSwFrm)); + if(pSwFrm->IsTextFrm()) + pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pSwFrm)); } } else - pCurrTxtFrm = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm* >(pCurrFrm)); + pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm* >(pCurrFrm)); //check whether the text frame where the Graph/OLE/Frame anchored is in the Header/Footer - SwFrm* pFrm = pCurrTxtFrm; + SwFrm* pFrm = pCurrTextFrm; while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() ) pFrm = pFrm->GetUpper(); if ( pFrm ) - pCurrTxtFrm = NULL; + pCurrTextFrm = NULL; //check shape if(pCrsrShell->Imp()->GetDrawView()) { @@ -626,48 +626,48 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() for ( size_t i = 0; i < rMrkList.GetMarkCount(); ++i ) { SdrObject *pObj = rMrkList.GetMark(i)->GetMarkedSdrObj(); - SwFrmFmt* pFmt = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFmt(); - const SwFmtAnchor& rAnchor = pFmt->GetAnchor(); + SwFrameFormat* pFormat = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFormat(); + const SwFormatAnchor& rAnchor = pFormat->GetAnchor(); if( FLY_AS_CHAR != rAnchor.GetAnchorId() ) - pCurrTxtFrm = NULL; + pCurrTextFrm = NULL; } } //calculate line number - if (pCurrTxtFrm && pTxtFrm) + if (pCurrTextFrm && pTextFrm) { - if (!(pCurrTxtFrm->IsInTab() || pCurrTxtFrm->IsInFtn())) + if (!(pCurrTextFrm->IsInTab() || pCurrTextFrm->IsInFootnote())) { - while( pTxtFrm != pCurrTxtFrm ) + while( pTextFrm != pCurrTextFrm ) { //check header/footer - pFrm = pTxtFrm; + pFrm = pTextFrm; while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() ) pFrm = pFrm->GetUpper(); if ( pFrm ) { - pTxtFrm = static_cast< SwTxtFrm*>(pTxtFrm->GetNextCntntFrm()); + pTextFrm = static_cast< SwTextFrm*>(pTextFrm->GetNextContentFrm()); continue; } - if (!(pTxtFrm->IsInTab() || pTxtFrm->IsInFtn() || pTxtFrm->IsInFly())) - nLineNum += pTxtFrm->GetThisLines(); - pTxtFrm = static_cast< SwTxtFrm* >(pTxtFrm ->GetNextCntntFrm()); + if (!(pTextFrm->IsInTab() || pTextFrm->IsInFootnote() || pTextFrm->IsInFly())) + nLineNum += pTextFrm->GetThisLines(); + pTextFrm = static_cast< SwTextFrm* >(pTextFrm ->GetNextContentFrm()); } SwPaM* pCaret = pCrsrShell->GetCrsr(); - if (!pCurrTxtFrm->IsEmpty() && pCaret) + if (!pCurrTextFrm->IsEmpty() && pCaret) { - if (pCurrTxtFrm->IsTxtFrm()) + if (pCurrTextFrm->IsTextFrm()) { const SwPosition* pPoint = NULL; - if(pCurrTxtFrm->IsInFly()) + if(pCurrTextFrm->IsInFly()) { - SwFlyFrm *pFlyFrm = pCurrTxtFrm->FindFlyFrm(); - const SwFmtAnchor& rAnchor = pFlyFrm->GetFmt()->GetAnchor(); - pPoint= rAnchor.GetCntntAnchor(); + SwFlyFrm *pFlyFrm = pCurrTextFrm->FindFlyFrm(); + const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor(); + pPoint= rAnchor.GetContentAnchor(); } else pPoint = pCaret->GetPoint(); const sal_Int32 nActPos = pPoint->nContent.GetIndex(); - nLineNum += pCurrTxtFrm->GetLineCount( nActPos ); + nLineNum += pCurrTextFrm->GetLineCount( nActPos ); } else//graphic, form, shape, etc. { @@ -676,7 +676,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() if( pCrsrShell->GetLayout()->GetCrsrOfst( pPoint, aPt/*,* &eTmpState*/ ) ) { const sal_Int32 nActPos = pPoint->nContent.GetIndex(); - nLineNum += pCurrTxtFrm->GetLineCount( nActPos ); + nLineNum += pCurrTextFrm->GetLineCount( nActPos ); } } } @@ -722,8 +722,8 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() sAttrName = "total-columns:"; - const SwFmtCol &rFmtCol=pCurrPage->GetAttrSet()->GetCol(); - sal_uInt16 nColCount=rFmtCol.GetNumCols(); + const SwFormatCol &rFormatCol=pCurrPage->GetAttrSet()->GetCol(); + sal_uInt16 nColCount=rFormatCol.GetNumCols(); nColCount = nColCount>0?nColCount:1; sValue += sAttrName; sValue += OUString::number( nColCount ) ; @@ -772,8 +772,8 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() //section-total-columns sAttrName = "section-total-columns:"; - const SwFmtCol &rFmtSctCol=pCurrSctFrm->GetAttrSet()->GetCol(); - sal_uInt16 nSctColCount=rFmtSctCol.GetNumCols(); + const SwFormatCol &rFormatSctCol=pCurrSctFrm->GetAttrSet()->GetCol(); + sal_uInt16 nSctColCount=rFormatSctCol.GetNumCols(); nSctColCount = nSctColCount>0?nSctColCount:1; sValue += sAttrName; sValue += OUString::number( nSctColCount ) ; @@ -868,24 +868,24 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground() if ( pCrsrShell ) { SwPaM *_pStartCrsr = pCrsrShell->GetCrsr(), *__pStartCrsr = _pStartCrsr; - SwCntntNode* pPrevNode = NULL; + SwContentNode* pPrevNode = NULL; std::vector<SwFrm*> vFrmList; do { if ( _pStartCrsr && _pStartCrsr->HasMark() ) { - SwCntntNode* pCntntNode = _pStartCrsr->GetCntntNode(); - if ( pCntntNode == pPrevNode ) + SwContentNode* pContentNode = _pStartCrsr->GetContentNode(); + if ( pContentNode == pPrevNode ) { continue; } - SwFrm* pFrm = pCntntNode ? pCntntNode->getLayoutFrm( pCrsrShell->GetLayout() ) : NULL; + SwFrm* pFrm = pContentNode ? pContentNode->getLayoutFrm( pCrsrShell->GetLayout() ) : NULL; if ( pFrm ) { vFrmList.push_back( pFrm ); } - pPrevNode = pCntntNode; + pPrevNode = pContentNode; } } diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 90eabf85d952..57684d5e55d3 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -113,11 +113,11 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementation if( pFFrm ) { style = "style:"; - SwCntntFrm* pCFrm; - pCFrm = pFFrm->ContainsCntnt(); + SwContentFrm* pCFrm; + pCFrm = pFFrm->ContainsContent(); if( pCFrm ) { - SwCntntNode* pCNode = pCFrm->GetNode(); + SwContentNode* pCNode = pCFrm->GetNode(); if( pCNode ) { style += static_cast<SwOLENode*>(pCNode)->GetOLEObj().GetStyleString(); diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index 84d728dec50b..c71e3fab4690 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -45,10 +45,10 @@ const sal_Char sImplementationNameEndnote[] = "com.sun.star.comp.Writer.SwAccess SwAccessibleFootnote::SwAccessibleFootnote( SwAccessibleMap* pInitMap, bool bIsEndnote, - const SwFtnFrm *pFtnFrm ) : + const SwFootnoteFrm *pFootnoteFrm ) : SwAccessibleContext( pInitMap, bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE, - pFtnFrm ) + pFootnoteFrm ) { SolarMutexGuard aGuard; @@ -56,12 +56,12 @@ SwAccessibleFootnote::SwAccessibleFootnote( : STR_ACCESS_FOOTNOTE_NAME; OUString sArg; - const SwTxtFtn *pTxtFtn = - static_cast< const SwFtnFrm *>( GetFrm() )->GetAttr(); - if( pTxtFtn ) + const SwTextFootnote *pTextFootnote = + static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr(); + if( pTextFootnote ) { const SwDoc *pDoc = GetShell()->GetDoc(); - sArg = pTxtFtn->GetFtn().GetViewNumStr( *pDoc ); + sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc ); } SetName( GetResource( nResId, &sArg ) ); @@ -83,12 +83,12 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription() : STR_ACCESS_FOOTNOTE_DESC ; OUString sArg; - const SwTxtFtn *pTxtFtn = - static_cast< const SwFtnFrm *>( GetFrm() )->GetAttr(); - if( pTxtFtn ) + const SwTextFootnote *pTextFootnote = + static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr(); + if( pTextFootnote ) { const SwDoc *pDoc = GetMap()->GetShell()->GetDoc(); - sArg = pTxtFtn->GetFtn().GetViewNumStr( *pDoc ); + sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc ); } return GetResource( nResId, &sArg ); @@ -128,10 +128,10 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId() return css::uno::Sequence<sal_Int8>(); } -bool SwAccessibleFootnote::IsEndnote( const SwFtnFrm *pFtnFrm ) +bool SwAccessibleFootnote::IsEndnote( const SwFootnoteFrm *pFootnoteFrm ) { - const SwTxtFtn *pTxtFtn = pFtnFrm ->GetAttr(); - return pTxtFtn && pTxtFtn->GetFtn().IsEndNote() ; + const SwTextFootnote *pTextFootnote = pFootnoteFrm ->GetAttr(); + return pTextFootnote && pTextFootnote->GetFootnote().IsEndNote() ; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index b0862a25b661..d03b94f0e1ed 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -24,7 +24,7 @@ #include <acccontext.hxx> class SwAccessibleMap; -class SwFtnFrm; +class SwFootnoteFrm; class SwAccessibleFootnote : public SwAccessibleContext { @@ -34,7 +34,7 @@ protected: public: SwAccessibleFootnote( SwAccessibleMap* pInitMap, bool bIsEndnote, - const SwFtnFrm *pFtnFrm ); + const SwFootnoteFrm *pFootnoteFrm ); // XAccessibleContext @@ -64,7 +64,7 @@ public: // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static bool IsEndnote( const SwFtnFrm *pFrm ); + static bool IsEndnote( const SwFootnoteFrm *pFrm ); }; #endif diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 9a34ec721236..6582cca998b0 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -433,12 +433,12 @@ const SwFrm* SwAccessibleFrame::GetParent( const SwAccessibleChild& rFrmOrObj, OUString SwAccessibleFrame::GetFormattedPageNumber() const { sal_uInt16 nPageNum = GetFrm()->GetVirtPageNum(); - sal_uInt32 nFmt = GetFrm()->FindPageFrm()->GetPageDesc() + sal_uInt32 nFormat = GetFrm()->FindPageFrm()->GetPageDesc() ->GetNumType().GetNumberingType(); - if( SVX_NUM_NUMBER_NONE == nFmt ) - nFmt = SVX_NUM_ARABIC; + if( SVX_NUM_NUMBER_NONE == nFormat ) + nFormat = SVX_NUM_ARABIC; - OUString sRet( FormatNumber( nPageNum, nFmt ) ); + OUString sRet( FormatNumber( nPageNum, nFormat ) ); return sRet; } diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index d5bb32af6ae3..bfffd2dc871a 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -99,22 +99,22 @@ sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrm *pFlyFrm ) sal_uInt8 nType = ND_TEXTNODE; if( pFlyFrm->Lower() ) { - if( pFlyFrm->Lower()->IsNoTxtFrm() ) + if( pFlyFrm->Lower()->IsNoTextFrm() ) { - const SwCntntFrm *pCntFrm = - static_cast<const SwCntntFrm *>( pFlyFrm->Lower() ); + const SwContentFrm *pCntFrm = + static_cast<const SwContentFrm *>( pFlyFrm->Lower() ); nType = pCntFrm->GetNode()->GetNodeType(); } } else { - const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt(); - const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt(); - const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx(); + const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat(); + const SwFormatContent& rContent = pFrameFormat->GetContent(); + const SwNodeIndex *pNdIdx = rContent.GetContentIdx(); if( pNdIdx ) { - const SwCntntNode *pCNd = - (pNdIdx->GetNodes())[pNdIdx->GetIndex()+1]->GetCntntNode(); + const SwContentNode *pCNd = + (pNdIdx->GetNodes())[pNdIdx->GetIndex()+1]->GetContentNode(); if( pCNd ) nType = pCNd->GetNodeType(); } @@ -132,10 +132,10 @@ SwAccessibleFrameBase::SwAccessibleFrameBase( { SolarMutexGuard aGuard; - const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt(); - const_cast< SwFrmFmt * >( pFrmFmt )->Add( this ); + const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat(); + const_cast< SwFrameFormat * >( pFrameFormat )->Add( this ); - SetName( pFrmFmt->GetName() ); + SetName( pFrameFormat->GetName() ); bIsSelected = IsSelected(); } @@ -221,14 +221,14 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem * case RES_NAME_CHANGED: if( pFlyFrm ) { - const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt(); - assert(pFrmFmt == GetRegisteredIn() && "invalid frame"); + const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat(); + assert(pFrameFormat == GetRegisteredIn() && "invalid frame"); const OUString sOldName( GetName() ); assert( !pOld || static_cast<const SwStringMsgPoolItem *>(pOld)->GetString() == GetName()); - SetName( pFrmFmt->GetName() ); + SetName( pFrameFormat->GetName() ); assert( !pNew || static_cast<const SwStringMsgPoolItem *>(pNew)->GetString() == GetName()); @@ -250,8 +250,8 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem * case RES_FMT_CHG: if( pOld && - static_cast< const SwFmtChg * >(pNew)->pChangedFmt == GetRegisteredIn() && - static_cast< const SwFmtChg * >(pOld)->pChangedFmt->IsFmtInDTOR() ) + static_cast< const SwFormatChg * >(pNew)->pChangedFormat == GetRegisteredIn() && + static_cast< const SwFormatChg * >(pOld)->pChangedFormat->IsFormatInDTOR() ) GetRegisteredInNonConst()->Remove( this ); break; @@ -306,18 +306,18 @@ bool SwAccessibleFrameBase::GetSelectedState( ) // SELETED. SwFlyFrm* pFlyFrm = getFlyFrm(); - const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt(); - const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor(); - const SwPosition *pPos = pAnchor.GetCntntAnchor(); + const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat(); + const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor(); + const SwPosition *pPos = pAnchor.GetContentAnchor(); if( !pPos ) return false; int pIndex = pPos->nContent.GetIndex(); - if( pPos->nNode.GetNode().GetTxtNode() ) + if( pPos->nNode.GetNode().GetTextNode() ) { SwPaM* pCrsr = GetCrsr(); if( pCrsr != NULL ) { - const SwTxtNode* pNode = pPos->nNode.GetNode().GetTxtNode(); + const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode(); sal_uLong nHere = pNode->GetIndex(); // iterate over ring diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index c6c40fa28088..ce9d3d875e3e 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -156,9 +156,9 @@ bool SwAccessibleChild::IsBoundAsChar() const } else if ( mpDrawObj ) { - const SwFrmFmt* mpFrmFmt = ::FindFrmFmt( mpDrawObj ); - bRet = mpFrmFmt - && (FLY_AS_CHAR == mpFrmFmt->GetAnchor().GetAnchorId()); + const SwFrameFormat* mpFrameFormat = ::FindFrameFormat( mpDrawObj ); + bRet = mpFrameFormat + && (FLY_AS_CHAR == mpFrameFormat->GetAnchor().GetAnchorId()); } else if ( mpWindow ) { @@ -351,9 +351,9 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const OSL_ENSURE( pContact, "sdr contact is missing" ); if( pContact ) { - const SwFrmFmt *pFrmFmt = pContact->GetFmt(); - OSL_ENSURE( pFrmFmt, "frame format is missing" ); - if( pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() ) + const SwFrameFormat *pFrameFormat = pContact->GetFormat(); + OSL_ENSURE( pFrameFormat, "frame format is missing" ); + if( pFrameFormat && FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId() ) { // For FLY_AS_CHAR the parent is the anchor pParent = pContact->GetAnchorFrm(); diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx index 773e1baa4beb..05168a432a36 100644 --- a/sw/source/core/access/accfrmobjmap.cxx +++ b/sw/source/core/access/accfrmobjmap.cxx @@ -76,7 +76,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea, } } } - else if( rFrm.IsTxtFrm() ) + else if( rFrm.IsTextFrm() ) { const SwSortedObjs *pObjs = rFrm.GetDrawObjs(); if ( pObjs ) @@ -153,7 +153,7 @@ bool SwAccessibleChildMap::IsSortingRequired( const SwFrm& rFrm ) { return ( rFrm.IsPageFrm() && static_cast< const SwPageFrm& >( rFrm ).GetSortedObjs() ) || - ( rFrm.IsTxtFrm() && + ( rFrm.IsTextFrm() && rFrm.GetDrawObjs() ); } diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx index 68f9fbfd4b48..348eabc7bca1 100644 --- a/sw/source/core/access/accfrmobjslist.cxx +++ b/sw/source/core/access/accfrmobjslist.cxx @@ -46,7 +46,7 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator( aCurr = (*pObjs)[nNextObj++]->GetDrawObj(); } } - else if( rFrm.IsTxtFrm() ) + else if( rFrm.IsTextFrm() ) { const SwSortedObjs *pObjs = rFrm.GetDrawObjs(); if ( pObjs && pObjs->size() ) @@ -112,7 +112,7 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne ? (*pObjs)[nNextObj++]->GetDrawObj() : static_cast< const SdrObject *>( 0 ); } - else if( rFrm.IsTxtFrm() ) + else if( rFrm.IsTextFrm() ) { const SwSortedObjs* pObjs = rFrm.GetDrawObjs(); const size_t nObjsCount = pObjs ? pObjs->size() : 0; diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index 661ae5e1abda..ed4138e4c1d4 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -76,7 +76,7 @@ sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole() { SolarMutexGuard g; - SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() ); + SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() ); if (aURL.GetMap()) return AccessibleRole::IMAGE_MAP; diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index 09d2d69a70b2..7b9e25b94382 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -44,22 +44,22 @@ SwAccessibleHyperlink::SwAccessibleHyperlink( size_t nHPos, { } -const SwTxtAttr *SwAccessibleHyperlink::GetTxtAttr() const +const SwTextAttr *SwAccessibleHyperlink::GetTextAttr() const { - const SwTxtAttr *pTxtAttr = 0; + const SwTextAttr *pTextAttr = 0; if( xPara.is() && xPara->GetMap() ) { - const SwTxtNode *pTxtNd = xPara->GetTxtNode(); - const SwpHints *pHints = pTxtNd->GetpSwpHints(); + const SwTextNode *pTextNd = xPara->GetTextNode(); + const SwpHints *pHints = pTextNd->GetpSwpHints(); if( pHints && nHintPos < pHints->Count() ) { - const SwTxtAttr *pHt = (*pHints)[nHintPos]; + const SwTextAttr *pHt = (*pHints)[nHintPos]; if( RES_TXTATR_INETFMT == pHt->Which() ) - pTxtAttr = pHt; + pTextAttr = pHt; } } - return pTxtAttr; + return pTextAttr; } // XAccessibleAction @@ -78,24 +78,24 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex ) if(nIndex != 0) throw lang::IndexOutOfBoundsException(); - const SwTxtAttr *pTxtAttr = GetTxtAttr(); - if( pTxtAttr ) + const SwTextAttr *pTextAttr = GetTextAttr(); + if( pTextAttr ) { - const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt(); - if( !rINetFmt.GetValue().isEmpty() ) + const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat(); + if( !rINetFormat.GetValue().isEmpty() ) { SwViewShell *pVSh = xPara->GetShell(); if( pVSh ) { - LoadURL(*pVSh, rINetFmt.GetValue(), URLLOAD_NOFILTER, - rINetFmt.GetTargetFrame()); - OSL_ENSURE( pTxtAttr == rINetFmt.GetTxtINetFmt(), + LoadURL(*pVSh, rINetFormat.GetValue(), URLLOAD_NOFILTER, + rINetFormat.GetTargetFrame()); + OSL_ENSURE( pTextAttr == rINetFormat.GetTextINetFormat(), "lost my txt attr" ); - const SwTxtINetFmt* pTxtAttr2 = rINetFmt.GetTxtINetFmt(); - if( pTxtAttr2 ) + const SwTextINetFormat* pTextAttr2 = rINetFormat.GetTextINetFormat(); + if( pTextAttr2 ) { - const_cast<SwTxtINetFmt*>(pTxtAttr2)->SetVisited(true); - const_cast<SwTxtINetFmt*>(pTxtAttr2)->SetVisitedValid(true); + const_cast<SwTextINetFormat*>(pTextAttr2)->SetVisited(true); + const_cast<SwTextINetFormat*>(pTextAttr2)->SetVisitedValid(true); } bRet = true; } @@ -112,11 +112,11 @@ OUString SAL_CALL SwAccessibleHyperlink::getAccessibleActionDescription( if(nIndex != 0) throw lang::IndexOutOfBoundsException(); - const SwTxtAttr *pTxtAttr = GetTxtAttr(); - if( pTxtAttr ) + const SwTextAttr *pTextAttr = GetTextAttr(); + if( pTextAttr ) { - const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt(); - return rINetFmt.GetValue(); + const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat(); + return rINetFormat.GetValue(); } return OUString(); @@ -169,12 +169,12 @@ uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionObject( if(nIndex != 0) throw lang::IndexOutOfBoundsException(); - const SwTxtAttr *pTxtAttr = GetTxtAttr(); + const SwTextAttr *pTextAttr = GetTextAttr(); OUString retText; - if( pTxtAttr ) + if( pTextAttr ) { - const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt(); - retText = OUString( rINetFmt.GetValue() ); + const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat(); + retText = OUString( rINetFormat.GetValue() ); } uno::Any aRet; aRet <<= retText; @@ -199,12 +199,12 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( ) SolarMutexGuard aGuard; if (xPara.is()) { - const SwTxtAttr *pTxtAttr = GetTxtAttr(); + const SwTextAttr *pTextAttr = GetTextAttr(); OUString sText; - if( pTxtAttr ) + if( pTextAttr ) { - const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt(); - sText = OUString( rINetFmt.GetValue() ); + const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat(); + sText = OUString( rINetFormat.GetValue() ); OUString sToken = "#"; sal_Int32 nPos = sText.indexOf(sToken); if (nPos==0)//document link diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx index ba71c62d2f57..06570c899969 100644 --- a/sw/source/core/access/acchyperlink.hxx +++ b/sw/source/core/access/acchyperlink.hxx @@ -26,7 +26,7 @@ #include <fmtinfmt.hxx> class SwAccessibleParagraph; -class SwTxtAttr; +class SwTextAttr; class SwAccessibleHyperlink : public ::cppu::WeakImplHelper< @@ -43,7 +43,7 @@ class SwAccessibleHyperlink : SwAccessibleParagraph *p, sal_Int32 nStt, sal_Int32 nEnd ); - const SwTxtAttr *GetTxtAttr() const; + const SwTextAttr *GetTextAttr() const; void Invalidate(); public: diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx index eb081e77c9ba..e35b58718a70 100644 --- a/sw/source/core/access/acchypertextdata.hxx +++ b/sw/source/core/access/acchypertextdata.hxx @@ -23,21 +23,21 @@ #include <cppuhelper/weakref.hxx> #include <map> -class SwTxtAttr; +class SwTextAttr; namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleHyperlink; } } } } -typedef ::std::less< const SwTxtAttr * > SwTxtAttrPtrLess; +typedef ::std::less< const SwTextAttr * > SwTextAttrPtrLess; class SwAccessibleHyperTextData { public: - typedef const SwTxtAttr * key_type; + typedef const SwTextAttr * key_type; typedef ::com::sun::star::uno::WeakReference< com::sun::star::accessibility::XAccessibleHyperlink > mapped_type; typedef std::pair<const key_type,mapped_type> value_type; - typedef SwTxtAttrPtrLess key_compare; + typedef SwTextAttrPtrLess key_compare; typedef std::map<key_type,mapped_type,key_compare>::iterator iterator; private: std::map<key_type,mapped_type,key_compare> maMap; diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index b4c0782d42b8..7e47ad3c6dd5 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -556,7 +556,7 @@ void SwAccessibleEventList_Impl::MoveInvalidXAccToEnd() // There are two reason for this. First of all, a new accessible shape // for the XShape might be created soon. It's then cheaper if the XShape // still exists. The other reason are situations where an accessible shape -// is destroyed within an SwFrmFmt::Modify. In this case, destroying +// is destroyed within an SwFrameFormat::Modify. In this case, destroying // the XShape at the same time (indirectly by destroying the accessible // shape) leads to an assert, because a client of the Modify is destroyed // within a Modify call. @@ -1162,14 +1162,14 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() bool bMarked = false; SwAccessibleChild pFrm( (*aIter).first ); - const SwFrmFmt *pFrmFmt = (*aIter).first ? ::FindFrmFmt( (*aIter).first ) : nullptr; - if( !pFrmFmt ) + const SwFrameFormat *pFrameFormat = (*aIter).first ? ::FindFrameFormat( (*aIter).first ) : nullptr; + if( !pFrameFormat ) { ++aIter; continue; } - const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor(); - const SwPosition *pPos = pAnchor.GetCntntAnchor(); + const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor(); + const SwPosition *pPos = pAnchor.GetContentAnchor(); if(pAnchor.GetAnchorId() == FLY_AT_PAGE) { @@ -1186,12 +1186,12 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() ++aIter; continue; } - if( pPos->nNode.GetNode().GetTxtNode() ) + if( pPos->nNode.GetNode().GetTextNode() ) { int pIndex = pPos->nContent.GetIndex(); if( pCrsr != NULL ) { - const SwTxtNode* pNode = pPos->nNode.GetNode().GetTxtNode(); + const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode(); sal_uLong nHere = pNode->GetIndex(); for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer()) @@ -1286,10 +1286,10 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() if (bFrmChanged) { const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( pFrm ); - const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt(); - if (pFrmFmt) + const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat(); + if (pFrameFormat) { - const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor(); + const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor(); if( pAnchor.GetAnchorId() == FLY_AS_CHAR ) { uno::Reference< XAccessible > xAccParent = pAccFrame->getAccessibleParent(); @@ -1335,16 +1335,16 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() while(nStartIndex <= nEndIndex) { SwFrm *pFrm = NULL; - if(nStartIndex.GetNode().IsCntntNode()) + if(nStartIndex.GetNode().IsContentNode()) { - SwCntntNode* pCNd = static_cast<SwCntntNode*>(&(nStartIndex.GetNode())); - pFrm = SwIterator<SwFrm, SwCntntNode>(*pCNd).First(); + SwContentNode* pCNd = static_cast<SwContentNode*>(&(nStartIndex.GetNode())); + pFrm = SwIterator<SwFrm, SwContentNode>(*pCNd).First(); } else if( nStartIndex.GetNode().IsTableNode() ) { SwTableNode * pTable = static_cast<SwTableNode *>(&(nStartIndex.GetNode())); - SwTableFmt* pFmt = const_cast<SwTableFmt*>(pTable->GetTable().GetFrmFmt()); - pFrm = SwIterator<SwFrm, SwTableFmt>(*pFmt).First(); + SwTableFormat* pFormat = const_cast<SwTableFormat*>(pTable->GetTable().GetFrameFormat()); + pFrm = SwIterator<SwFrm, SwTableFormat>(*pFormat).First(); } if( pFrm && mpFrmMap) @@ -1557,10 +1557,10 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=fa if (pAccShape) { SdrObject *pObj = GetSdrObjectFromXShape(pAccShape->GetXShape()); - SwFrmFmt *pFrmFmt = pObj ? FindFrmFmt( pObj ) : NULL; - if (pFrmFmt) + SwFrameFormat *pFrameFormat = pObj ? FindFrameFormat( pObj ) : NULL; + if (pFrameFormat) { - const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor(); + const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor(); if( pAnchor.GetAnchorId() == FLY_AS_CHAR ) { uno::Reference< XAccessible > xPara = pAccShape->getAccessibleParent(); @@ -1891,7 +1891,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm, case FRM_TXT: mnPara++; pAcc = new SwAccessibleParagraph( *this, - static_cast< const SwTxtFrm& >( *pFrm ) ); + static_cast< const SwTextFrm& >( *pFrm ) ); break; case FRM_HEADER: pAcc = new SwAccessibleHeaderFooter( this, @@ -1903,13 +1903,13 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm, break; case FRM_FTN: { - const SwFtnFrm *pFtnFrm = - static_cast < const SwFtnFrm * >( pFrm ); + const SwFootnoteFrm *pFootnoteFrm = + static_cast < const SwFootnoteFrm * >( pFrm ); bool bIsEndnote = - SwAccessibleFootnote::IsEndnote( pFtnFrm ); + SwAccessibleFootnote::IsEndnote( pFootnoteFrm ); pAcc = new SwAccessibleFootnote( this, bIsEndnote, /*(bIsEndnote ? mnEndnote++ : mnFootnote++),*/ - pFtnFrm ); + pFootnoteFrm ); } break; case FRM_FLY: @@ -2318,7 +2318,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, (xParentAccImpl.is() || xShapeAccImpl.is()) ) { // Keep a reference to the XShape to avoid that it - // is deleted with a SwFrmFmt::Modify. + // is deleted with a SwFrameFormat::Modify. uno::Reference < drawing::XShape > xShape( const_cast< SdrObject * >( pObj )->getUnoShape(), uno::UNO_QUERY ); @@ -2469,7 +2469,7 @@ so the new graphic accessible 'parent is NULL, so run here: save the parent's SwFrm not the accessible object parent, */ bool bIsValidFrm = false; - bool bIsTxtParent = false; + bool bIsTextParent = false; if (aFrmOrObj.GetSwFrm()) { int nType = pFrm->GetType(); @@ -2483,12 +2483,12 @@ so run here: save the parent's SwFrm not the accessible object parent, int nType = pParent->GetType(); if (FRM_TXT == nType) { - bIsTxtParent =true; + bIsTextParent =true; } } // bool bIsVisibleChildrenOnly =aFrmOrObj.IsVisibleChildrenOnly() ; // bool bIsBoundAsChar =aFrmOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar && - if((bIsValidFrm || bIsTxtParent) ) + if((bIsValidFrm || bIsTextParent) ) { if( GetShell()->ActionPend() ) { @@ -2544,9 +2544,9 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm ) } } -void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm ) +void SwAccessibleMap::InvalidateAttr( const SwTextFrm& rTextFrm ) { - SwAccessibleChild aFrmOrObj( &rTxtFrm ); + SwAccessibleChild aFrmOrObj( &rTextFrm ); if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) { uno::Reference < XAccessible > xAcc; @@ -2922,17 +2922,17 @@ void SwAccessibleMap::InvalidateRelationSet( const SwFrm* pMaster, } // invalidation of CONTENT_FLOW_FROM/_TO relation of a paragraph -void SwAccessibleMap::InvalidateParaFlowRelation( const SwTxtFrm& _rTxtFrm, +void SwAccessibleMap::InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm, const bool _bFrom ) { - _InvalidateRelationSet( &_rTxtFrm, _bFrom ); + _InvalidateRelationSet( &_rTextFrm, _bFrom ); } // invalidation of text selection of a paragraph -void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm ) +void SwAccessibleMap::InvalidateParaTextSelection( const SwTextFrm& _rTextFrm ) { // first, see if this frame is accessible, and if so, get the respective - SwAccessibleChild aFrmOrObj( &_rTxtFrm ); + SwAccessibleChild aFrmOrObj( &_rTextFrm ); if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) { uno::Reference < XAccessible > xAcc; @@ -2960,7 +2960,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm ) SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::CARET_OR_STATES, pAccImpl, - SwAccessibleChild( &_rTxtFrm ), + SwAccessibleChild( &_rTextFrm ), AccessibleStates::TEXT_SELECTION_CHANGED ); AppendEvent( aEvent ); } @@ -3443,8 +3443,8 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas() // for a selection the cursor has to have a mark. // for safety reasons assure that point and mark are in text nodes if ( pCrsr->HasMark() && - pCrsr->GetPoint()->nNode.GetNode().IsTxtNode() && - pCrsr->GetMark()->nNode.GetNode().IsTxtNode() ) + pCrsr->GetPoint()->nNode.GetNode().IsTextNode() && + pCrsr->GetMark()->nNode.GetNode().IsTextNode() ) { SwPosition* pStartPos = pCrsr->Start(); SwPosition* pEndPos = pCrsr->End(); @@ -3452,24 +3452,24 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas() SwNodeIndex aIdx( pStartPos->nNode ); for ( ; aIdx.GetIndex() <= pEndPos->nNode.GetIndex(); ++aIdx ) { - SwTxtNode* pTxtNode( aIdx.GetNode().GetTxtNode() ); - if ( pTxtNode ) + SwTextNode* pTextNode( aIdx.GetNode().GetTextNode() ); + if ( pTextNode ) { // loop on all text frames registered at the text node. - SwIterator<SwTxtFrm,SwTxtNode> aIter( *pTxtNode ); - for( SwTxtFrm* pTxtFrm = aIter.First(); pTxtFrm; pTxtFrm = aIter.Next() ) + SwIterator<SwTextFrm,SwTextNode> aIter( *pTextNode ); + for( SwTextFrm* pTextFrm = aIter.First(); pTextFrm; pTextFrm = aIter.Next() ) { uno::WeakReference < XAccessible > xWeakAcc; SwAccessibleContextMap_Impl::iterator aMapIter = - mpFrmMap->find( pTxtFrm ); + mpFrmMap->find( pTextFrm ); if( aMapIter != mpFrmMap->end() ) { xWeakAcc = (*aMapIter).second; SwAccessibleParaSelection aDataEntry( - pTxtNode == &(pStartPos->nNode.GetNode()) + pTextNode == &(pStartPos->nNode.GetNode()) ? pStartPos->nContent.GetIndex() : 0, - pTxtNode == &(pEndPos->nNode.GetNode()) + pTextNode == &(pEndPos->nNode.GetNode()) ? pEndPos->nContent.GetIndex() : -1 ); SwAccessibleSelectedParas_Impl::value_type @@ -3552,13 +3552,13 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas() static_cast<SwAccessibleContext*>( xAcc.get() ) ); if ( xAccImpl.is() && xAccImpl->GetFrm() ) { - const SwTxtFrm* pTxtFrm( - dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) ); - OSL_ENSURE( pTxtFrm, + const SwTextFrm* pTextFrm( + dynamic_cast<const SwTextFrm*>(xAccImpl->GetFrm()) ); + OSL_ENSURE( pTextFrm, "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexpected type of frame" ); - if ( pTxtFrm ) + if ( pTextFrm ) { - InvalidateParaTextSelection( *pTxtFrm ); + InvalidateParaTextSelection( *pTextFrm ); } } } @@ -3580,13 +3580,13 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas() static_cast<SwAccessibleContext*>( xAcc.get() ) ); if ( xAccImpl.is() && xAccImpl->GetFrm() ) { - const SwTxtFrm* pTxtFrm( - dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) ); - OSL_ENSURE( pTxtFrm, + const SwTextFrm* pTextFrm( + dynamic_cast<const SwTextFrm*>(xAccImpl->GetFrm()) ); + OSL_ENSURE( pTextFrm, "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexpected type of frame" ); - if ( pTxtFrm ) + if ( pTextFrm ) { - InvalidateParaTextSelection( *pTxtFrm ); + InvalidateParaTextSelection( *pTextFrm ); } } } diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 4be902866469..cee5edbcf05b 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -41,18 +41,18 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using utl::AccessibleRelationSetHelper; -const SwNoTxtNode *SwAccessibleNoTextFrame::GetNoTxtNode() const +const SwNoTextNode *SwAccessibleNoTextFrame::GetNoTextNode() const { - const SwNoTxtNode *pNd = 0; + const SwNoTextNode *pNd = 0; const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm *>( GetFrm() ); - if( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTxtFrm() ) + if( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTextFrm() ) { - const SwCntntFrm *pCntFrm = - static_cast<const SwCntntFrm *>( pFlyFrm->Lower() ); - const SwCntntNode* pSwCntntNode = pCntFrm->GetNode(); - if(pSwCntntNode != NULL) + const SwContentFrm *pCntFrm = + static_cast<const SwContentFrm *>( pFlyFrm->Lower() ); + const SwContentNode* pSwContentNode = pCntFrm->GetNode(); + if(pSwContentNode != NULL) { - pNd = pSwCntntNode->GetNoTxtNode(); + pNd = pSwContentNode->GetNoTextNode(); } } @@ -64,11 +64,11 @@ SwAccessibleNoTextFrame::SwAccessibleNoTextFrame( sal_Int16 nInitRole, const SwFlyFrm* pFlyFrm ) : SwAccessibleFrameBase( pInitMap, nInitRole, pFlyFrm ), - aDepend( this, const_cast < SwNoTxtNode * >( GetNoTxtNode() ) ), + aDepend( this, const_cast < SwNoTextNode * >( GetNoTextNode() ) ), msTitle(), msDesc() { - const SwNoTxtNode* pNd = GetNoTxtNode(); + const SwNoTextNode* pNd = GetNoTextNode(); // #i73249# // consider new attributes Title and Description if( pNd ) @@ -102,7 +102,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem return; // probably was deleted - avoid doing anything } - const SwNoTxtNode *pNd = GetNoTxtNode(); + const SwNoTextNode *pNd = GetNoTextNode(); OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), "invalid frame" ); switch( nWhich ) { @@ -308,7 +308,7 @@ throw (uno::RuntimeException, std::exception) CHECK_FOR_DEFUNC( XAccessibleHypertext ); sal_Int32 nCount = 0; - SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() ); + SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() ); if(aURL.GetMap() || !aURL.GetURL().isEmpty()) nCount = 1; @@ -325,7 +325,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL uno::Reference< XAccessibleHyperlink > xRet; - SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() ); + SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() ); if( nLinkIndex > 0 ) throw lang::IndexOutOfBoundsException(); diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index 4776cdb1a471..196b8eaf6c30 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -30,7 +30,7 @@ namespace com { namespace star { } } class SwFlyFrm; -class SwNoTxtNode; +class SwNoTextNode; class SwAccessibleNoTextHyperlink; class SwAccessibleNoTextFrame : public SwAccessibleFrameBase, @@ -47,7 +47,7 @@ class SwAccessibleNoTextFrame : public SwAccessibleFrameBase, protected: virtual ~SwAccessibleNoTextFrame(); - const SwNoTxtNode *GetNoTxtNode() const; + const SwNoTextNode *GetNoTextNode() const; virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx index 4044c3e541a4..ba6117b33c8b 100644 --- a/sw/source/core/access/accnotexthyperlink.cxx +++ b/sw/source/core/access/accnotexthyperlink.cxx @@ -49,7 +49,7 @@ sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionCount() { SolarMutexGuard g; - SwFmtURL aURL( GetFmt()->GetURL() ); + SwFormatURL aURL( GetFormat()->GetURL() ); ImageMap* pMap = aURL.GetMap(); if( pMap != NULL ) { @@ -72,7 +72,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn throw lang::IndexOutOfBoundsException(); bool bRet = false; - SwFmtURL aURL( GetFmt()->GetURL() ); + SwFormatURL aURL( GetFormat()->GetURL() ); ImageMap* pMap = aURL.GetMap(); if( pMap != NULL ) { @@ -113,7 +113,7 @@ OUString SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionDescription( if(nIndex < 0 || nIndex >= getAccessibleActionCount()) throw lang::IndexOutOfBoundsException(); - SwFmtURL aURL( GetFmt()->GetURL() ); + SwFormatURL aURL( GetFormat()->GetURL() ); ImageMap* pMap = aURL.GetMap(); if( pMap != NULL ) { @@ -141,7 +141,7 @@ Reference< XAccessibleKeyBinding > SAL_CALL throw lang::IndexOutOfBoundsException(); bool bIsValid = false; - SwFmtURL aURL( GetFmt()->GetURL() ); + SwFormatURL aURL( GetFormat()->GetURL() ); ImageMap* pMap = aURL.GetMap(); if( pMap != NULL ) { @@ -197,7 +197,7 @@ Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionObject( if(nIndex < 0 || nIndex >= getAccessibleActionCount()) throw lang::IndexOutOfBoundsException(); - SwFmtURL aURL( GetFmt()->GetURL() ); + SwFormatURL aURL( GetFormat()->GetURL() ); OUString retText; ImageMap* pMap = aURL.GetMap(); if( pMap != NULL ) @@ -231,7 +231,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid( ) { SolarMutexGuard g; - SwFmtURL aURL( GetFmt()->GetURL() ); + SwFormatURL aURL( GetFormat()->GetURL() ); if( aURL.GetMap() || !aURL.GetURL().isEmpty() ) return sal_True; diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx index 0dae5fef8256..79a9b9817bc8 100644 --- a/sw/source/core/access/accnotexthyperlink.hxx +++ b/sw/source/core/access/accnotexthyperlink.hxx @@ -37,9 +37,9 @@ class SwAccessibleNoTextHyperlink : ::rtl::Reference< SwAccessibleNoTextFrame > xFrame; const SwFrm *mpFrm; - SwFrmFmt *GetFmt() + SwFrameFormat *GetFormat() { - return const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(mpFrm))->GetFmt(); + return const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(mpFrm))->GetFormat(); } public: diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 87580385fe97..fab40746f65c 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -119,12 +119,12 @@ namespace com { namespace sun { namespace star { const sal_Char sServiceName[] = "com.sun.star.text.AccessibleParagraphView"; const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleParagraphView"; -const SwTxtNode* SwAccessibleParagraph::GetTxtNode() const +const SwTextNode* SwAccessibleParagraph::GetTextNode() const { const SwFrm* pFrm = GetFrm(); - OSL_ENSURE( pFrm->IsTxtFrm(), "The text frame has mutated!" ); + OSL_ENSURE( pFrm->IsTextFrm(), "The text frame has mutated!" ); - const SwTxtNode* pNode = static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode(); + const SwTextNode* pNode = static_cast<const SwTextFrm*>(pFrm)->GetTextNode(); OSL_ENSURE( pNode != NULL, "A text frame without a text node." ); return pNode; @@ -150,7 +150,7 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos() if( pCaret != NULL ) { - const SwTxtNode* pNode = GetTxtNode(); + const SwTextNode* pNode = GetTextNode(); // check whether the point points into 'our' node SwPosition* pPoint = pCaret->GetPoint(); @@ -162,8 +162,8 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos() if(!GetPortionData().IsValidCorePosition( nIndex ) || ( GetPortionData().IsZeroCorePositionData() && nIndex== 0) ) { - const SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() ); - bool bFormat = (pTxtFrm && pTxtFrm->HasPara()); + const SwTextFrm *pTextFrm = PTR_CAST( SwTextFrm, GetFrm() ); + bool bFormat = (pTextFrm && pTextFrm->HasPara()); if(bFormat) { ClearPortionData(); @@ -208,7 +208,7 @@ bool SwAccessibleParagraph::GetSelection( if( pCrsr != NULL ) { // get SwPosition for my node - const SwTxtNode* pNode = GetTxtNode(); + const SwTextNode* pNode = GetTextNode(); sal_uLong nHere = pNode->GetIndex(); // iterate over ring @@ -346,8 +346,8 @@ SwPaM* SwAccessibleParagraph::GetCursor( const bool _bForSelection ) bool SwAccessibleParagraph::IsHeading() const { - const SwTxtNode *pTxtNd = GetTxtNode(); - return pTxtNd->IsOutline(); + const SwTextNode *pTextNd = GetTextNode(); + return pTextNd->IsOutline(); } void SwAccessibleParagraph::GetStates( @@ -369,9 +369,9 @@ void SwAccessibleParagraph::GetStates( // FOCUSED (simulates node index of cursor) SwPaM* pCaret = GetCursor( false ); // #i27301# - consider adjusted method signature - const SwTxtNode* pTxtNd = GetTxtNode(); - if( pCaret != 0 && pTxtNd != 0 && - pTxtNd->GetIndex() == pCaret->GetPoint()->nNode.GetIndex() && + const SwTextNode* pTextNd = GetTextNode(); + if( pCaret != 0 && pTextNd != 0 && + pTextNd->GetIndex() == pCaret->GetPoint()->nNode.GetIndex() && nOldCaretPos != -1) { vcl::Window *pWin = GetWindow(); @@ -532,9 +532,9 @@ void SwAccessibleParagraph::_InvalidateFocus() SwAccessibleParagraph::SwAccessibleParagraph( SwAccessibleMap& rInitMap, - const SwTxtFrm& rTxtFrm ) - : SwClient( const_cast<SwTxtNode*>(rTxtFrm.GetTxtNode()) ) // #i108125# - , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTxtFrm ) + const SwTextFrm& rTextFrm ) + : SwClient( const_cast<SwTextNode*>(rTextFrm.GetTextNode()) ) // #i108125# + , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTextFrm ) , sDesc() , pPortionData( NULL ) , pHyperTextData( NULL ) @@ -543,7 +543,7 @@ SwAccessibleParagraph::SwAccessibleParagraph( //Get the real heading level, Heading1 ~ Heading10 , nHeadingLevel (-1) , aSelectionHelper( *this ) - , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTxtFrm ) ) // #i108125# + , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTextFrm ) ) // #i108125# , m_bLastHasSelection(false) //To add TEXT_SELECTION_CHANGED event { SolarMutexGuard aGuard; @@ -577,13 +577,13 @@ void SwAccessibleParagraph::UpdatePortionData() { // obtain the text frame OSL_ENSURE( GetFrm() != NULL, "The text frame has vanished!" ); - OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" ); - const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() ); + OSL_ENSURE( GetFrm()->IsTextFrm(), "The text frame has mutated!" ); + const SwTextFrm* pFrm = static_cast<const SwTextFrm*>( GetFrm() ); // build new portion data delete pPortionData; pPortionData = new SwAccessiblePortionData( - pFrm->GetTxtNode(), GetMap()->GetShell()->GetViewOptions() ); + pFrm->GetTextNode(), GetMap()->GetShell()->GetViewOptions() ); pFrm->VisitPortions( *pPortionData ); OSL_ENSURE( pPortionData != NULL, "UpdatePortionData() failed" ); @@ -637,10 +637,10 @@ SwXTextPortion* SwAccessibleParagraph::CreateUnoPortion( GetPortionData().GetModelPosition( nEndIndex ); // create UNO cursor - SwTxtNode* pTxtNode = const_cast<SwTxtNode*>( GetTxtNode() ); - SwIndex aIndex( pTxtNode, nStart ); - SwPosition aStartPos( *pTxtNode, aIndex ); - SwUnoCrsr* pUnoCursor = pTxtNode->GetDoc()->CreateUnoCrsr( aStartPos ); + SwTextNode* pTextNode = const_cast<SwTextNode*>( GetTextNode() ); + SwIndex aIndex( pTextNode, nStart ); + SwPosition aStartPos( *pTextNode, aIndex ); + SwUnoCrsr* pUnoCursor = pTextNode->GetDoc()->CreateUnoCrsr( aStartPos ); pUnoCursor->SetMark(); pUnoCursor->GetMark()->nContent = nEnd; @@ -675,10 +675,10 @@ bool SwAccessibleParagraph::IsValidRange( SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase() { - const SwTxtNode* pTxtNd = GetTxtNode(); - if( pTxtNd ) + const SwTextNode* pTextNd = GetTextNode(); + if( pTextNd ) { - const SwSectionNode * pSectNd = pTxtNd->FindSectionNode(); + const SwSectionNode * pSectNd = pTextNd->FindSectionNode(); if( pSectNd ) { const SwSection * pSect = &pSectNd->GetSection(); @@ -691,7 +691,7 @@ SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase() for(size_t nIndex = 0; nIndex<nSize; nIndex++ ) { pSortBase = pTOXBaseSect->GetTOXSortTabBases()[nIndex]; - if( pSortBase->pTOXNd == pTxtNd ) + if( pSortBase->pTOXNd == pTextNd ) break; } @@ -713,7 +713,7 @@ const SwRangeRedline* SwAccessibleParagraph::GetRedlineAtIndex( sal_Int32 ) if ( pCrSr ) { SwPosition* pStart = pCrSr->Start(); - const SwTxtNode* pNode = GetTxtNode(); + const SwTextNode* pNode = GetTextNode(); if ( pNode ) { const SwDoc* pDoc = pNode->GetDoc(); @@ -757,7 +757,7 @@ bool SwAccessibleParagraph::GetWordBoundary( // get locale for this position const sal_Int32 nModelPos = GetPortionData().GetModelPosition( nPos ); lang::Locale aLocale = g_pBreakIt->GetLocale( - GetTxtNode()->GetLang( nModelPos ) ); + GetTextNode()->GetLang( nModelPos ) ); // which type of word are we interested in? // (DICTIONARY_WORD includes punctuation, ANY_WORD doesn't.) @@ -844,7 +844,7 @@ bool SwAccessibleParagraph::GetGlyphBoundary( // get locale for this position const sal_Int32 nModelPos = GetPortionData().GetModelPosition( nPos ); lang::Locale aLocale = g_pBreakIt->GetLocale( - GetTxtNode()->GetLang( nModelPos ) ); + GetTextNode()->GetLang( nModelPos ) ); // get word boundary, as the Break-Iterator sees fit. const sal_Int16 nIterMode = i18n::CharacterIteratorMode::SKIPCELL; @@ -945,14 +945,14 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale() { SolarMutexGuard aGuard; - const SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() ); - if( !pTxtFrm ) + const SwTextFrm *pTextFrm = PTR_CAST( SwTextFrm, GetFrm() ); + if( !pTextFrm ) { THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (no text frame)" ); } - const SwTxtNode *pTxtNd = pTxtFrm->GetTxtNode(); - lang::Locale aLoc( g_pBreakIt->GetLocale( pTxtNd->GetLang( 0 ) ) ); + const SwTextNode *pTextNd = pTextFrm->GetTextNode(); + lang::Locale aLoc( g_pBreakIt->GetLocale( pTextNd->GetLang( 0 ) ) ); return aLoc; } @@ -966,12 +966,12 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess utl::AccessibleRelationSetHelper* pHelper = new utl::AccessibleRelationSetHelper(); - const SwTxtFrm* pTxtFrm = dynamic_cast<const SwTxtFrm*>(GetFrm()); - OSL_ENSURE( pTxtFrm, + const SwTextFrm* pTextFrm = dynamic_cast<const SwTextFrm*>(GetFrm()); + OSL_ENSURE( pTextFrm, "<SwAccessibleParagraph::getAccessibleRelationSet()> - missing text frame"); - if ( pTxtFrm ) + if ( pTextFrm ) { - const SwCntntFrm* pPrevCntFrm( pTxtFrm->FindPrevCnt( true ) ); + const SwContentFrm* pPrevCntFrm( pTextFrm->FindPrevCnt( true ) ); if ( pPrevCntFrm ) { uno::Sequence< uno::Reference<XInterface> > aSequence(1); @@ -981,7 +981,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess pHelper->AddRelation( aAccRel ); } - const SwCntntFrm* pNextCntFrm( pTxtFrm->FindNextCnt( true ) ); + const SwContentFrm* pNextCntFrm( pTextFrm->FindNextCnt( true ) ); if ( pNextCntFrm ) { uno::Sequence< uno::Reference<XInterface> > aSequence(1); @@ -1005,18 +1005,18 @@ void SAL_CALL SwAccessibleParagraph::grabFocus() // get cursor shell SwCrsrShell *pCrsrSh = GetCrsrShell(); SwPaM *pCrsr = GetCursor( false ); // #i27301# - consider new method signature - const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() ); - const SwTxtNode* pTxtNd = pTxtFrm->GetTxtNode(); + const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() ); + const SwTextNode* pTextNd = pTextFrm->GetTextNode(); - if( pCrsrSh != 0 && pTxtNd != 0 && + if( pCrsrSh != 0 && pTextNd != 0 && ( pCrsr == 0 || - pCrsr->GetPoint()->nNode.GetIndex() != pTxtNd->GetIndex() || - !pTxtFrm->IsInside( pCrsr->GetPoint()->nContent.GetIndex()) ) ) + pCrsr->GetPoint()->nNode.GetIndex() != pTextNd->GetIndex() || + !pTextFrm->IsInside( pCrsr->GetPoint()->nContent.GetIndex()) ) ) { // create pam for selection - SwIndex aIndex( const_cast< SwTxtNode * >( pTxtNd ), - pTxtFrm->GetOfst() ); - SwPosition aStartPos( *pTxtNd, aIndex ); + SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ), + pTextFrm->GetOfst() ); + SwPosition aStartPos( *pTextNd, aIndex ); SwPaM aPaM( aStartPos ); // set PaM at cursor shell @@ -1321,7 +1321,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex ) if( pCrsrShell != NULL ) { // create pam for selection - SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() ); + SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() ); SwIndex aIndex( pNode, GetPortionData().GetModelPosition(nIndex)); SwPosition aStartPos( *pNode, aIndex ); SwPaM aPaM( aStartPos ); @@ -1373,7 +1373,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa aMoveState.bRealHeight = true; aMoveState.bRealWidth = true; SwSpecialPos aSpecialPos; - SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() ); + SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() ); /* #i12332# FillSpecialPos does not accept nIndex == GetString().getLength(). In that case nPos is set to the @@ -1381,7 +1381,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa returns the rectangle for a cursor at the end of the paragraph. */ const sal_Int32 nPos = bBehindText - ? pNode->GetTxt().getLength() + ? pNode->GetText().getLength() : GetPortionData().FillSpecialPos(nIndex, aSpecialPos, aMoveState.pSpecialPos ); // call GetCharRect @@ -1392,7 +1392,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa // already get the caret position com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs; - const sal_Int32 nStrLen = GetTxtNode()->GetTxt().getLength(); + const sal_Int32 nStrLen = GetTextNode()->GetText().getLength(); if( nStrLen > 0 ) { SwFrm* pTFrm = const_cast<SwFrm*>(GetFrm()); @@ -1432,38 +1432,38 @@ struct IndexCompare OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex) { OUString strTypeName; - SwFldMgr aMgr; - SwTxtFld* pTxtFld = NULL; - SwTxtNode* pTxtNd = const_cast<SwTxtNode*>( GetTxtNode() ); - SwIndex fldIndex( pTxtNd, nIndex ); - sal_Int32 nFldIndex = GetPortionData().GetFieldIndex(nIndex); - if (nFldIndex >= 0) - { - const SwpHints* pSwpHints = GetTxtNode()->GetpSwpHints(); + SwFieldMgr aMgr; + SwTextField* pTextField = NULL; + SwTextNode* pTextNd = const_cast<SwTextNode*>( GetTextNode() ); + SwIndex fldIndex( pTextNd, nIndex ); + sal_Int32 nFieldIndex = GetPortionData().GetFieldIndex(nIndex); + if (nFieldIndex >= 0) + { + const SwpHints* pSwpHints = GetTextNode()->GetpSwpHints(); if (pSwpHints) { const size_t nSize = pSwpHints->Count(); for( size_t i = 0; i < nSize; ++i ) { - const SwTxtAttr* pHt = (*pSwpHints)[i]; + const SwTextAttr* pHt = (*pSwpHints)[i]; if ( ( pHt->Which() == RES_TXTATR_FIELD || pHt->Which() == RES_TXTATR_ANNOTATION || pHt->Which() == RES_TXTATR_INPUTFIELD ) - && (nFldIndex-- == 0)) + && (nFieldIndex-- == 0)) { - pTxtFld = const_cast<SwTxtFld*>( - static_txtattr_cast<SwTxtFld const*>(pHt)); + pTextField = const_cast<SwTextField*>( + static_txtattr_cast<SwTextField const*>(pHt)); break; } else if (pHt->Which() == RES_TXTATR_REFMARK - && (nFldIndex-- == 0)) + && (nFieldIndex-- == 0)) strTypeName = "set reference"; } } } - if (pTxtFld) + if (pTextField) { - const SwField* pField = (pTxtFld->GetFmtFld()).GetField(); + const SwField* pField = (pTextField->GetFormatField()).GetField(); if (pField) { strTypeName = SwFieldType::GetTypeStr(pField->GetTypeId()); @@ -1481,10 +1481,10 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex) { case REF_BOOKMARK: { - const SwGetRefField* pRefFld = dynamic_cast<const SwGetRefField*>(pField); - if ( pRefFld && pRefFld->IsRefToHeadingCrossRefBookmark() ) + const SwGetRefField* pRefField = dynamic_cast<const SwGetRefField*>(pField); + if ( pRefField && pRefField->IsRefToHeadingCrossRefBookmark() ) sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Headings")); - else if ( pRefFld && pRefFld->IsRefToNumItemCrossRefBookmark() ) + else if ( pRefField && pRefField->IsRefToNumItemCrossRefBookmark() ) sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Numbered Paragraphs")); else sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmarks")); @@ -1683,10 +1683,10 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes( pValues = aValues.getArray(); - const SwTxtNode* pTxtNode( GetTxtNode() ); + const SwTextNode* pTextNode( GetTextNode() ); PropertyValue& rValue = pValues[aValues.getLength() - 1 ]; rValue.Name = "NumberingPrefix"; - OUString sNumBullet = pTxtNode->GetNumString(); + OUString sNumBullet = pTextNode->GetNumString(); rValue.Value <<= sNumBullet; rValue.Handle = -1; rValue.State = PropertyState_DIRECT_VALUE; @@ -1740,11 +1740,11 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( const bool bOnlyCharAttrs ) { // retrieve default attributes - const SwTxtNode* pTxtNode( GetTxtNode() ); + const SwTextNode* pTextNode( GetTextNode() ); ::boost::scoped_ptr<SfxItemSet> pSet; if ( !bOnlyCharAttrs ) { - pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()), + pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()), RES_CHRATR_BEGIN, RES_CHRATR_END - 1, RES_PARATR_BEGIN, RES_PARATR_END - 1, RES_FRMATR_BEGIN, RES_FRMATR_END - 1, @@ -1752,7 +1752,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( } else { - pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()), + pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()), RES_CHRATR_BEGIN, RES_CHRATR_END - 1, 0 ) ); } @@ -1760,26 +1760,26 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( // attributes are the character attributes, which are set at the paragraph style // of the paragraph. The character attributes set at the automatic paragraph // style of the paragraph are treated as run attributes. - // pTxtNode->SwCntntNode::GetAttr( *pSet ); + // pTextNode->SwContentNode::GetAttr( *pSet ); // get default paragraph attributes, if needed, and merge these into <pSet> if ( !bOnlyCharAttrs ) { - SfxItemSet aParaSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()), + SfxItemSet aParaSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()), RES_PARATR_BEGIN, RES_PARATR_END - 1, RES_FRMATR_BEGIN, RES_FRMATR_END - 1, 0 ); - pTxtNode->SwCntntNode::GetAttr( aParaSet ); + pTextNode->SwContentNode::GetAttr( aParaSet ); pSet->Put( aParaSet ); } // get default character attributes and merge these into <pSet> - OSL_ENSURE( pTxtNode->GetTxtColl(), + OSL_ENSURE( pTextNode->GetTextColl(), "<SwAccessibleParagraph::_getDefaultAttributesImpl(..)> - missing paragraph style. Serious defect, please inform OD!" ); - if ( pTxtNode->GetTxtColl() ) + if ( pTextNode->GetTextColl() ) { - SfxItemSet aCharSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()), + SfxItemSet aCharSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()), RES_CHRATR_BEGIN, RES_CHRATR_END - 1, 0 ); - SetPutRecursive( aCharSet, pTxtNode->GetTxtColl()->GetAttrSet() ); + SetPutRecursive( aCharSet, pTextNode->GetTextColl()->GetAttrSet() ); pSet->Put( aCharSet ); } @@ -1811,13 +1811,13 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( // #i72800# // add property value entry for the paragraph style - if ( !bOnlyCharAttrs && pTxtNode->GetTxtColl() ) + if ( !bOnlyCharAttrs && pTextNode->GetTextColl() ) { if ( aDefAttrSeq.find( UNO_NAME_PARA_STYLE_NAME ) == aDefAttrSeq.end() ) { PropertyValue rPropVal; rPropVal.Name = UNO_NAME_PARA_STYLE_NAME; - uno::Any aVal( uno::makeAny( pTxtNode->GetTxtColl()->GetName() ) ); + uno::Any aVal( uno::makeAny( pTextNode->GetTextColl()->GetName() ) ); rPropVal.Value = aVal; rPropVal.Handle = -1; rPropVal.State = beans::PropertyState_DEFAULT_VALUE; @@ -1957,11 +1957,11 @@ void SwAccessibleParagraph::_getRunAttributesImpl( // create PaM for character at position <nIndex> SwPaM* pPaM( 0 ); { - const SwTxtNode* pTxtNode( GetTxtNode() ); - SwPosition* pStartPos = new SwPosition( *pTxtNode ); - pStartPos->nContent.Assign( const_cast<SwTxtNode*>(pTxtNode), nIndex ); - SwPosition* pEndPos = new SwPosition( *pTxtNode ); - pEndPos->nContent.Assign( const_cast<SwTxtNode*>(pTxtNode), nIndex+1 ); + const SwTextNode* pTextNode( GetTextNode() ); + SwPosition* pStartPos = new SwPosition( *pTextNode ); + pStartPos->nContent.Assign( const_cast<SwTextNode*>(pTextNode), nIndex ); + SwPosition* pEndPos = new SwPosition( *pTextNode ); + pEndPos->nContent.Assign( const_cast<SwTextNode*>(pTextNode), nIndex+1 ); pPaM = new SwPaM( *pStartPos, *pEndPos ); @@ -1980,13 +1980,13 @@ void SwAccessibleParagraph::_getRunAttributesImpl( // SwXTextCursor::GetCrsrAttr( *pPaM, aSet, sal_True, sal_True ); // get character attributes from automatic paragraph style and merge these into <aSet> { - const SwTxtNode* pTxtNode( GetTxtNode() ); - if ( pTxtNode->HasSwAttrSet() ) + const SwTextNode* pTextNode( GetTextNode() ); + if ( pTextNode->HasSwAttrSet() ) { SfxItemSet aAutomaticParaStyleCharAttrs( pPaM->GetDoc()->GetAttrPool(), RES_CHRATR_BEGIN, RES_CHRATR_END -1, 0 ); - aAutomaticParaStyleCharAttrs.Put( *(pTxtNode->GetpSwAttrSet()), false ); + aAutomaticParaStyleCharAttrs.Put( *(pTextNode->GetpSwAttrSet()), false ); aSet.Put( aAutomaticParaStyleCharAttrs ); } } @@ -2101,9 +2101,9 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl( const uno::Sequence< OUString >& aRequestedAttributes, tAccParaPropValMap& rSupplementalAttrSeq ) { - const SwTxtNode* pTxtNode( GetTxtNode() ); + const SwTextNode* pTextNode( GetTextNode() ); ::boost::scoped_ptr<SfxItemSet> pSet; - pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()), + pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()), RES_PARATR_ADJUST, RES_PARATR_ADJUST, RES_PARATR_TABSTOP, RES_PARATR_TABSTOP, RES_PARATR_LINESPACING, RES_PARATR_LINESPACING, @@ -2113,13 +2113,13 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl( RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1, 0 ) ); - if ( pTxtNode->HasBullet() || pTxtNode->HasNumber() ) + if ( pTextNode->HasBullet() || pTextNode->HasNumber() ) { - pSet->Put( pTxtNode->GetAttr(RES_PARATR_LIST_LEVEL, true) ); + pSet->Put( pTextNode->GetAttr(RES_PARATR_LIST_LEVEL, true) ); } - pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_UL_SPACE) ); - pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_LR_SPACE) ); - pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_PARATR_ADJUST) ); + pSet->Put( pTextNode->SwContentNode::GetAttr(RES_UL_SPACE) ); + pSet->Put( pTextNode->SwContentNode::GetAttr(RES_LR_SPACE) ); + pSet->Put( pTextNode->SwContentNode::GetAttr(RES_PARATR_ADJUST) ); tAccParaPropValMap aSupplementalAttrSeq; { @@ -2227,7 +2227,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, PropertyValue* pValues = rValues.getArray(); - const SwTxtNode* pTxtNode( GetTxtNode() ); + const SwTextNode* pTextNode( GetTextNode() ); sal_Int32 nValues = rValues.getLength(); for (sal_Int32 i = 0; i < nValues; ++i) @@ -2291,12 +2291,12 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, SwCrsrShell* pCrsrShell = GetCrsrShell(); if( pCrsrShell != NULL && pCrsrShell->GetViewOptions() && pCrsrShell->GetViewOptions()->IsOnlineSpell()) { - const SwWrongList* pWrongList = pTxtNode->GetWrong(); + const SwWrongList* pWrongList = pTextNode->GetWrong(); if( NULL != pWrongList ) { sal_Int32 nBegin = nIndex; sal_Int32 nLen = 1; - if( pWrongList->InWrongWord(nBegin,nLen) && !pTxtNode->IsSymbol(nBegin) ) + if( pWrongList->InWrongWord(nBegin,nLen) && !pTextNode->IsSymbol(nBegin) ) { rValue.Value <<= (sal_uInt16)UNDERLINE_WAVE; } @@ -2312,12 +2312,12 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, SwCrsrShell* pCrsrShell = GetCrsrShell(); if( pCrsrShell != NULL && pCrsrShell->GetViewOptions() && pCrsrShell->GetViewOptions()->IsOnlineSpell()) { - const SwWrongList* pWrongList = pTxtNode->GetWrong(); + const SwWrongList* pWrongList = pTextNode->GetWrong(); if( NULL != pWrongList ) { sal_Int32 nBegin = nIndex; sal_Int32 nLen = 1; - if( pWrongList->InWrongWord(nBegin,nLen) && !pTxtNode->IsSymbol(nBegin) ) + if( pWrongList->InWrongWord(nBegin,nLen) && !pTextNode->IsSymbol(nBegin) ) { rValue.Value <<= (sal_Int32)0x00ff0000; continue; @@ -2367,10 +2367,10 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, //number bullet if (rValue.Name == UNO_NAME_NUMBERING_RULES) { - if ( pTxtNode->HasBullet() || pTxtNode->HasNumber() ) + if ( pTextNode->HasBullet() || pTextNode->HasNumber() ) { uno::Any aVal; - SwNumRule* pNumRule = pTxtNode->GetNumRule(); + SwNumRule* pNumRule = pTextNode->GetNumRule(); if (pNumRule) { uno::Reference< container::XIndexReplace > xNum = new SwXNumberingRules(*pNumRule); @@ -2416,7 +2416,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds( aMoveState.bRealHeight = true; aMoveState.bRealWidth = true; SwSpecialPos aSpecialPos; - SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() ); + SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() ); /** #i12332# FillSpecialPos does not accept nIndex == GetString().getLength(). In that case nPos is set to the @@ -2424,7 +2424,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds( returns the rectangle for a cursor at the end of the paragraph. */ const sal_Int32 nPos = bBehindText - ? pNode->GetTxt().getLength() + ? pNode->GetText().getLength() : GetPortionData().FillSpecialPos(nIndex, aSpecialPos, aMoveState.pSpecialPos ); // call GetCharRect @@ -2467,7 +2467,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); // construct SwPosition (where GetCrsrOfst() will put the result into) - SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() ); + SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() ); SwIndex aIndex( pNode, 0); SwPosition aPos( *pNode, aIndex ); @@ -2500,14 +2500,14 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) // ask core for position OSL_ENSURE( GetFrm() != NULL, "The text frame has vanished!" ); - OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" ); - const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() ); + OSL_ENSURE( GetFrm()->IsTextFrm(), "The text frame has mutated!" ); + const SwTextFrm* pFrm = static_cast<const SwTextFrm*>( GetFrm() ); SwCrsrMoveState aMoveState; aMoveState.bPosMatchesBounds = true; const bool bSuccess = pFrm->GetCrsrOfst( &aPos, aCorePoint, &aMoveState ); - SwIndex aCntntIdx = aPos.nContent; - const sal_Int32 nIndex = aCntntIdx.GetIndex(); + SwIndex aContentIdx = aPos.nContent; + const sal_Int32 nIndex = aContentIdx.GetIndex(); if ( nIndex > 0 ) { SwRect aResultRect; @@ -2594,7 +2594,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n if( pCrsrShell != NULL ) { // create pam for selection - SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() ); + SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() ); SwIndex aIndex( pNode, GetPortionData().GetModelPosition(nStartIndex)); SwPosition aStartPos( *pNode, aIndex ); SwPaM aPaM( aStartPos ); @@ -2914,7 +2914,7 @@ sal_Bool SwAccessibleParagraph::replaceText( if( !IsEditableState() ) return sal_False; - SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() ); + SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() ); // translate positions sal_Int32 nStart; @@ -3089,31 +3089,31 @@ class SwHyperlinkIter_Impl size_t nPos; public: - SwHyperlinkIter_Impl( const SwTxtFrm *pTxtFrm ); - const SwTxtAttr *next(); + SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm ); + const SwTextAttr *next(); size_t getCurrHintPos() const { return nPos-1; } sal_Int32 startIdx() const { return nStt; } sal_Int32 endIdx() const { return nEnd; } }; -SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTxtFrm *pTxtFrm ) : - pHints( pTxtFrm->GetTxtNode()->GetpSwpHints() ), - nStt( pTxtFrm->GetOfst() ), +SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm ) : + pHints( pTextFrm->GetTextNode()->GetpSwpHints() ), + nStt( pTextFrm->GetOfst() ), nPos( 0 ) { - const SwTxtFrm *pFollFrm = pTxtFrm->GetFollow(); - nEnd = pFollFrm ? pFollFrm->GetOfst() : pTxtFrm->GetTxtNode()->Len(); + const SwTextFrm *pFollFrm = pTextFrm->GetFollow(); + nEnd = pFollFrm ? pFollFrm->GetOfst() : pTextFrm->GetTextNode()->Len(); } -const SwTxtAttr *SwHyperlinkIter_Impl::next() +const SwTextAttr *SwHyperlinkIter_Impl::next() { - const SwTxtAttr *pAttr = 0; + const SwTextAttr *pAttr = 0; if( pHints ) { while( !pAttr && nPos < pHints->Count() ) { - const SwTxtAttr *pHt = (*pHints)[nPos]; + const SwTextAttr *pHt = (*pHints)[nPos]; if( RES_TXTATR_INETFMT == pHt->Which() ) { const sal_Int32 nHtStt = pHt->GetStart(); @@ -3142,8 +3142,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount() sal_Int32 nCount = 0; // #i77108# - provide hyperlinks also in editable documents. - const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() ); - SwHyperlinkIter_Impl aIter( pTxtFrm ); + const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() ); + SwHyperlinkIter_Impl aIter( pTextFrm ); while( aIter.next() ) nCount++; @@ -3159,11 +3159,11 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL uno::Reference< XAccessibleHyperlink > xRet; - const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() ); - SwHyperlinkIter_Impl aHIter( pTxtFrm ); + const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() ); + SwHyperlinkIter_Impl aHIter( pTextFrm ); sal_Int32 nTIndex = -1; SwTOXSortTabBase* pTBase = GetTOXSortTabBase(); - SwTxtAttr* pHt = const_cast<SwTxtAttr*>(aHIter.next()); + SwTextAttr* pHt = const_cast<SwTextAttr*>(aHIter.next()); while( (nLinkIndex < getHyperLinkCount()) && nTIndex < nLinkIndex) { sal_Int32 nHStt = -1; @@ -3227,7 +3227,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL // iterate next if( bH ) // iterate next hyperlink - pHt = const_cast<SwTxtAttr*>(aHIter.next()); + pHt = const_cast<SwTextAttr*>(aHIter.next()); else if(bTOC) continue; else @@ -3256,12 +3256,12 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde sal_Int32 nRet = -1; // #i77108# { - const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() ); - SwHyperlinkIter_Impl aHIter( pTxtFrm ); + const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() ); + SwHyperlinkIter_Impl aHIter( pTextFrm ); const sal_Int32 nIdx = GetPortionData().GetModelPosition( nCharIndex ); sal_Int32 nPos = 0; - const SwTxtAttr *pHt = aHIter.next(); + const SwTextAttr *pHt = aHIter.next(); while( pHt && !(nIdx >= pHt->GetStart() && nIdx < *pHt->GetAnyEnd()) ) { pHt = aHIter.next(); @@ -3298,7 +3298,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar break; default: { - pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) ); + pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) ); } } @@ -3323,7 +3323,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( ) if( pCrsr != NULL ) { // get SwPosition for my node - const SwTxtNode* pNode = GetTxtNode(); + const SwTextNode* pNode = GetTextNode(); sal_uLong nHere = pNode->GetIndex(); // iterate over ring @@ -3398,7 +3398,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd bool bRet = false; // get SwPosition for my node - const SwTxtNode* pNode = GetTxtNode(); + const SwTextNode* pNode = GetTextNode(); sal_uLong nHere = pNode->GetIndex(); // iterate over ring @@ -3523,7 +3523,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta break; default: { - pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) ); + pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) ); } } @@ -3558,7 +3558,7 @@ uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL break; default: { - pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) ); + pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) ); } } @@ -3696,7 +3696,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex( if( pCrsr != NULL ) { // get SwPosition for my node - const SwTxtNode* pNode = GetTxtNode(); + const SwTextNode* pNode = GetTextNode(); sal_uLong nHere = pNode->GetIndex(); // iterate over ring diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index d0e53dccda8f..bc604fbb5a65 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -34,8 +34,8 @@ #include <unordered_map> class SwField; -class SwTxtFrm; -class SwTxtNode; +class SwTextFrm; +class SwTextNode; class SwPaM; class SwAccessiblePortionData; class SwAccessibleHyperTextData; @@ -90,8 +90,8 @@ class SwAccessibleParagraph : SwParaChangeTrackingInfo* mpParaChangeTrackInfo; // #i108125# - /// get the SwTxtNode (requires frame; check before) - const SwTxtNode* GetTxtNode() const; + /// get the SwTextNode (requires frame; check before) + const SwTextNode* GetTextNode() const; /// get the (accessible) text string (requires frame; check before) OUString GetString(); @@ -240,7 +240,7 @@ protected: public: SwAccessibleParagraph( SwAccessibleMap& rInitMap, - const SwTxtFrm& rTxtFrm ); + const SwTextFrm& rTextFrm ); inline operator ::com::sun::star::accessibility::XAccessibleText *(); diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index f9359fe76666..486c40c432fd 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -66,10 +66,10 @@ using i18n::Boundary; #define PORATTR_TERM 128 SwAccessiblePortionData::SwAccessiblePortionData( - const SwTxtNode* pTxtNd, + const SwTextNode* pTextNd, const SwViewOption* pViewOpt ) : SwPortionHandler(), - pTxtNode( pTxtNd ), + pTextNode( pTextNd ), aBuffer(), nModelPosition( 0 ), pViewOptions( pViewOpt ), @@ -85,7 +85,7 @@ SwAccessiblePortionData::SwAccessiblePortionData( bFinished( false ), bLastIsSpecial( false ) { - OSL_ENSURE( pTxtNode != NULL, "Text node is needed!" ); + OSL_ENSURE( pTextNode != NULL, "Text node is needed!" ); // reserve some space to reduce memory allocations aLineBreaks.reserve( 5 ); @@ -103,7 +103,7 @@ SwAccessiblePortionData::~SwAccessiblePortionData() void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/) { - OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(), + OSL_ENSURE( (nModelPosition + nLength) <= pTextNode->GetText().getLength(), "portion exceeds model string!" ); OSL_ENSURE( !bFinished, "We are already done!" ); @@ -121,15 +121,15 @@ void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int3 aPortionAttrs.push_back( nAttr ); // update buffer + nModelPosition - aBuffer.append( pTxtNode->GetTxt().copy(nModelPosition, nLength) ); + aBuffer.append( pTextNode->GetText().copy(nModelPosition, nLength) ); nModelPosition += nLength; bLastIsSpecial = false; } -void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFldType ) +void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFieldType ) { - aAttrFieldType.push_back(nAttrFldType); + aAttrFieldType.push_back(nAttrFieldType); return; } @@ -137,7 +137,7 @@ void SwAccessiblePortionData::Special( sal_Int32 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/, const SwFont* /*pFont*/) { OSL_ENSURE( nModelPosition >= 0, "illegal position" ); - OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(), + OSL_ENSURE( (nModelPosition + nLength) <= pTextNode->GetText().getLength(), "portion exceeds model string!" ); OSL_ENSURE( !bFinished, "We are already done!" ); @@ -187,7 +187,7 @@ void SwAccessiblePortionData::Special( // #i111768# - apply patch from kstribley: // Include the control characters. case POR_CONTROLCHAR: - sDisplay = rText + OUString( pTxtNode->GetTxt()[nModelPosition] ); + sDisplay = rText + OUString( pTextNode->GetText()[nModelPosition] ); break; default: sDisplay = rText; @@ -235,7 +235,7 @@ void SwAccessiblePortionData::Skip(sal_Int32 nLength) { OSL_ENSURE( !bFinished, "We are already done!" ); OSL_ENSURE( aModelPositions.empty(), "Never Skip() after portions" ); - OSL_ENSURE( nLength <= pTxtNode->GetTxt().getLength(), + OSL_ENSURE( nLength <= pTextNode->GetText().getLength(), "skip exceeds model string!" ); nModelPosition += nLength; @@ -278,7 +278,7 @@ bool SwAccessiblePortionData::IsReadOnlyPortion( size_t nPortionNo ) const bool SwAccessiblePortionData::IsGrayPortionType( sal_uInt16 nType ) const { // gray portions? - // Compare with: inftxt.cxx, SwTxtPaintInfo::DrawViewOpt(...) + // Compare with: inftxt.cxx, SwTextPaintInfo::DrawViewOpt(...) bool bGray = false; switch( nType ) { @@ -390,7 +390,7 @@ sal_Int32 SwAccessiblePortionData::GetModelPosition( sal_Int32 nPos ) const } // else: return nStartPos unmodified - OSL_ENSURE( nStartPos >= 0, "There's something weird in number of characters of SwTxtNode" ); + OSL_ENSURE( nStartPos >= 0, "There's something weird in number of characters of SwTextNode" ); return nStartPos; } @@ -505,7 +505,7 @@ void SwAccessiblePortionData::GetSentenceBoundary( sal_Int32 nNew = g_pBreakIt->GetBreakIter()->endOfSentence( sAccessibleString, nCurrent, - g_pBreakIt->GetLocale(pTxtNode->GetLang(nModelPos)) ) + 1; + g_pBreakIt->GetLocale(pTextNode->GetLang(nModelPos)) ) + 1; if( (nNew < 0) && (nNew > nLength) ) nNew = nLength; @@ -536,7 +536,7 @@ void SwAccessiblePortionData::GetAttributeBoundary( Boundary& rBound, sal_Int32 nPos) const { - OSL_ENSURE( pTxtNode != NULL, "Need SwTxtNode!" ); + OSL_ENSURE( pTextNode != NULL, "Need SwTextNode!" ); // attribute boundaries can only occur on portion boundaries FillBoundary( rBound, aAccessiblePositions, @@ -545,7 +545,7 @@ void SwAccessiblePortionData::GetAttributeBoundary( sal_Int32 SwAccessiblePortionData::GetAccessiblePosition( sal_Int32 nPos ) const { - OSL_ENSURE( nPos <= pTxtNode->GetTxt().getLength(), "illegal position" ); + OSL_ENSURE( nPos <= pTextNode->GetText().getLength(), "illegal position" ); // find the portion number // #i70538# - consider "empty" model portions - e.g. number portion @@ -614,7 +614,7 @@ sal_Int32 SwAccessiblePortionData::FillSpecialPos( // if we have anything except plain text, compute nExtend + nRefPos if( (nModelEndPos - nModelPos == 1) && - (pTxtNode->GetTxt()[nModelPos] != sAccessibleString[nPos])) + (pTextNode->GetText()[nModelPos] != sAccessibleString[nPos])) { // case 1: a one-character, non-text portion // reference position is the first accessibilty for our diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index d3f879862b05..5650b25998da 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -25,7 +25,7 @@ #include <rtl/ustrbuf.hxx> #include <vector> -class SwTxtNode; +class SwTextNode; struct SwSpecialPos; class SwViewOption; namespace com { namespace sun { namespace star { @@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { class SwAccessiblePortionData : public SwPortionHandler { // the node this portion is referring to - const SwTxtNode* pTxtNode; + const SwTextNode* pTextNode; // variables used while collecting the data OUStringBuffer aBuffer; @@ -92,7 +92,7 @@ class SwAccessiblePortionData : public SwPortionHandler sal_Int32& nCorePos, bool& bEdit ) const; public: - SwAccessiblePortionData( const SwTxtNode* pTxtNd, + SwAccessiblePortionData( const SwTextNode* pTextNd, const SwViewOption* pViewOpt = NULL ); virtual ~SwAccessiblePortionData(); @@ -103,7 +103,7 @@ public: virtual void Skip(sal_Int32 nLength) SAL_OVERRIDE; virtual void Finish() SAL_OVERRIDE; - virtual void SetAttrFieldType( sal_uInt16 nAttrFldType ) SAL_OVERRIDE; + virtual void SetAttrFieldType( sal_uInt16 nAttrFieldType ) SAL_OVERRIDE; bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos ); bool IsIndexInFootnode(sal_Int32 nIndex); bool IsInGrayPortion( sal_Int32 nPos ); @@ -146,7 +146,7 @@ public: sal_Int32 GetModelPosition( sal_Int32 nPos ) const; /// fill a SwSpecialPos structure, suitable for calling - /// SwTxtFrm->GetCharRect + /// SwTextFrm->GetCharRect /// Returns the core position, and fills rpPos either with NULL or /// with the &rPos, after putting the appropriate data into it. sal_Int32 FillSpecialPos( sal_Int32 nPos, diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index 3211f0b8e73e..cec061212223 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -301,10 +301,10 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( } else { - const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt(); - if (pFrmFmt) + const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat(); + if (pFrameFormat) { - const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor(); + const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor(); if( pAnchor.GetAnchorId() == FLY_AS_CHAR ) { const SwFrm *pParaFrm = SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrm), m_rContext.IsInPagePreview() ); diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 0c96b054f421..0deb99b4b10e 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -775,12 +775,12 @@ SwAccessibleTable::SwAccessibleTable( { SolarMutexGuard aGuard; - const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt(); - const_cast< SwFrmFmt * >( pFrmFmt )->Add( this ); + const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat(); + const_cast< SwFrameFormat * >( pFrameFormat )->Add( this ); - SetName( pFrmFmt->GetName() + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) ); + SetName( pFrameFormat->GetName() + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) ); - const OUString sArg1( static_cast< const SwTabFrm * >( GetFrm() )->GetFmt()->GetName() ); + const OUString sArg1( static_cast< const SwTabFrm * >( GetFrm() )->GetFormat()->GetName() ); const OUString sArg2( GetFormattedPageNumber() ); sDesc = GetResource( STR_ACCESS_TABLE_DESC, &sArg1, &sArg2 ); @@ -803,11 +803,11 @@ void SwAccessibleTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew case RES_NAME_CHANGED: if( pTabFrm ) { - const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt(); - OSL_ENSURE( pFrmFmt == GetRegisteredIn(), "invalid frame" ); + const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat(); + OSL_ENSURE( pFrameFormat == GetRegisteredIn(), "invalid frame" ); const OUString sOldName( GetName() ); - const OUString sNewTabName = pFrmFmt->GetName(); + const OUString sNewTabName = pFrameFormat->GetName(); SetName( sNewTabName + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) ); @@ -1520,7 +1520,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild( // if we have a selection in a table, check if it's in the // same table that we're trying to select in - const SwTableNode* pSelectedTable = pCrsrShell->IsCrsrInTbl(); + const SwTableNode* pSelectedTable = pCrsrShell->IsCrsrInTable(); if( pSelectedTable != NULL ) { // get top-most table line @@ -1535,7 +1535,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild( // create the new selection const SwStartNode* pStartNode = pBox->GetSttNd(); - if( pSelectedTable == NULL || !pCrsrShell->GetTblCrs() ) + if( pSelectedTable == NULL || !pCrsrShell->GetTableCrs() ) { pCrsrShell->StartAction(); // Set cursor into current cell. This deletes any table cursor. @@ -1547,7 +1547,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild( pCrsrShell->SetMark(); pCrsrShell->MoveTable( fnTableCurr, fnTableEnd ); // now set the cursor into the cell again. - SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs() + SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs() : pCrsrShell->GetCrsr(); *pPaM->GetPoint() = *pPaM->GetMark(); pCrsrShell->EndAction(); @@ -1561,7 +1561,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild( SwPaM aPaM( *pStartNode ); aPaM.Move( fnMoveForward, fnGoNode ); aPaM.SetMark(); - const SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs() + const SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs() : pCrsrShell->GetCrsr(); *(aPaM.GetMark()) = *pPaM->GetMark(); Select( aPaM ); @@ -1681,7 +1681,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild( // If we unselect point, then set cursor to mark. If we clear another // selected box, then set cursor to point. // reduce selection to mark. - SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs() + SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs() : pCrsrShell->GetCrsr(); bool bDeselectPoint = pBox->GetSttNd() == @@ -1698,7 +1698,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild( pCrsrShell->SetMark(); pCrsrShell->MoveTable( fnTableCurr, fnTableEnd ); // now set the cursor into the cell again. - pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs() + pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs() : pCrsrShell->GetCrsr(); *pPaM->GetPoint() = *pPaM->GetMark(); pCrsrShell->EndAction(); @@ -1867,9 +1867,9 @@ SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2 { SolarMutexGuard aGuard; - const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt(); - const_cast< SwFrmFmt * >( pFrmFmt )->Add( this ); - const OUString aName = pFrmFmt->GetName() + "-ColumnHeaders"; + const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat(); + const_cast< SwFrameFormat * >( pFrameFormat )->Add( this ); + const OUString aName = pFrameFormat->GetName() + "-ColumnHeaders"; SetName( aName + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) ); diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index b176c49c54de..cc88805cf511 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -50,11 +50,11 @@ SwAccessibleTextFrame::SwAccessibleTextFrame( msTitle(), msDesc() { - const SwFlyFrmFmt* pFlyFrmFmt = - dynamic_cast<const SwFlyFrmFmt*>( rFlyFrm.GetFmt() ); - msTitle = pFlyFrmFmt->GetObjTitle(); + const SwFlyFrameFormat* pFlyFrameFormat = + dynamic_cast<const SwFlyFrameFormat*>( rFlyFrm.GetFormat() ); + msTitle = pFlyFrameFormat->GetObjTitle(); - msDesc = pFlyFrmFmt->GetObjDescription(); + msDesc = pFlyFrameFormat->GetObjDescription(); if ( msDesc.isEmpty() && msTitle != GetName() ) { @@ -101,9 +101,9 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * aEvent.NewValue <<= msTitle; FireAccessibleEvent( aEvent ); - const SwFlyFrmFmt* pFlyFrmFmt = - dynamic_cast<const SwFlyFrmFmt*>( pFlyFrm->GetFmt() ); - if (!pFlyFrmFmt || !pFlyFrmFmt->GetObjDescription().isEmpty()) + const SwFlyFrameFormat* pFlyFrameFormat = + dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() ); + if (!pFlyFrameFormat || !pFlyFrameFormat->GetObjDescription().isEmpty()) { break; } @@ -115,9 +115,9 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * { const OUString sOldDesc( msDesc ); - const SwFlyFrmFmt* pFlyFrmFmt = - dynamic_cast<const SwFlyFrmFmt*>( pFlyFrm->GetFmt() ); - const OUString& rDesc = pFlyFrmFmt->GetObjDescription(); + const SwFlyFrameFormat* pFlyFrameFormat = + dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() ); + const OUString& rDesc = pFlyFrameFormat->GetObjDescription(); msDesc = rDesc; if ( msDesc.isEmpty() && msTitle != GetName() ) diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx index f9d2d5fa6b8a..405f4228f327 100644 --- a/sw/source/core/access/parachangetrackinginfo.cxx +++ b/sw/source/core/access/parachangetrackinginfo.cxx @@ -31,7 +31,7 @@ #include <algorithm> namespace { - void initChangeTrackTextMarkupLists( const SwTxtFrm& rTxtFrm, + void initChangeTrackTextMarkupLists( const SwTextFrm& rTextFrm, SwWrongList*& opChangeTrackInsertionTextMarkupList, SwWrongList*& opChangeTrackDeletionTextMarkupList, SwWrongList*& opChangeTrackFormatChangeTextMarkupList ) @@ -40,14 +40,14 @@ namespace { opChangeTrackDeletionTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING ); opChangeTrackFormatChangeTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING ); - if ( !rTxtFrm.GetTxtNode() ) + if ( !rTextFrm.GetTextNode() ) { - OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTxtNode> instance!" ); + OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTextNode> instance!" ); return; } - const SwTxtNode& rTxtNode( *(rTxtFrm.GetTxtNode()) ); + const SwTextNode& rTextNode( *(rTextFrm.GetTextNode()) ); - const IDocumentRedlineAccess* pIDocChangeTrack( rTxtNode.getIDocumentRedlineAccess() ); + const IDocumentRedlineAccess* pIDocChangeTrack( rTextNode.getIDocumentRedlineAccess() ); if ( !pIDocChangeTrack ) { OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <IDocumentRedlineAccess> instance!" ); @@ -55,47 +55,47 @@ namespace { } if ( !IDocumentRedlineAccess::IsShowChanges( pIDocChangeTrack->GetRedlineMode() ) || - pIDocChangeTrack->GetRedlineTbl().empty() ) + pIDocChangeTrack->GetRedlineTable().empty() ) { // nothing to do --> empty change track text markup lists. return; } - const sal_uInt16 nIdxOfFirstRedlineForTxtNode = - pIDocChangeTrack->GetRedlinePos( rTxtNode, USHRT_MAX ); - if ( nIdxOfFirstRedlineForTxtNode == USHRT_MAX ) + const sal_uInt16 nIdxOfFirstRedlineForTextNode = + pIDocChangeTrack->GetRedlinePos( rTextNode, USHRT_MAX ); + if ( nIdxOfFirstRedlineForTextNode == USHRT_MAX ) { // nothing to do --> empty change track text markup lists. return; } - const sal_Int32 nTxtFrmTextStartPos = rTxtFrm.IsFollow() - ? rTxtFrm.GetOfst() + const sal_Int32 nTextFrmTextStartPos = rTextFrm.IsFollow() + ? rTextFrm.GetOfst() : 0; - const sal_Int32 nTxtFrmTextEndPos = rTxtFrm.HasFollow() - ? rTxtFrm.GetFollow()->GetOfst() - : rTxtFrm.GetTxt().getLength(); + const sal_Int32 nTextFrmTextEndPos = rTextFrm.HasFollow() + ? rTextFrm.GetFollow()->GetOfst() + : rTextFrm.GetText().getLength(); // iteration over the redlines which overlap with the text node. - const SwRedlineTbl& rRedlineTbl = pIDocChangeTrack->GetRedlineTbl(); - const sal_uInt16 nRedlineCount( rRedlineTbl.size() ); - for ( sal_uInt16 nActRedline = nIdxOfFirstRedlineForTxtNode; + const SwRedlineTable& rRedlineTable = pIDocChangeTrack->GetRedlineTable(); + const sal_uInt16 nRedlineCount( rRedlineTable.size() ); + for ( sal_uInt16 nActRedline = nIdxOfFirstRedlineForTextNode; nActRedline < nRedlineCount; ++nActRedline) { - const SwRangeRedline* pActRedline = rRedlineTbl[ nActRedline ]; - if ( pActRedline->Start()->nNode > rTxtNode.GetIndex() ) + const SwRangeRedline* pActRedline = rRedlineTable[ nActRedline ]; + if ( pActRedline->Start()->nNode > rTextNode.GetIndex() ) { break; } - sal_Int32 nTxtNodeChangeTrackStart(COMPLETE_STRING); - sal_Int32 nTxtNodeChangeTrackEnd(COMPLETE_STRING); - pActRedline->CalcStartEnd( rTxtNode.GetIndex(), - nTxtNodeChangeTrackStart, - nTxtNodeChangeTrackEnd ); - if ( nTxtNodeChangeTrackStart > nTxtFrmTextEndPos || - nTxtNodeChangeTrackEnd < nTxtFrmTextStartPos ) + sal_Int32 nTextNodeChangeTrackStart(COMPLETE_STRING); + sal_Int32 nTextNodeChangeTrackEnd(COMPLETE_STRING); + pActRedline->CalcStartEnd( rTextNode.GetIndex(), + nTextNodeChangeTrackStart, + nTextNodeChangeTrackEnd ); + if ( nTextNodeChangeTrackStart > nTextFrmTextEndPos || + nTextNodeChangeTrackEnd < nTextFrmTextStartPos ) { // Consider only redlines which overlap with the text frame's text. continue; @@ -126,23 +126,23 @@ namespace { } if ( pMarkupList ) { - const sal_Int32 nTxtFrmChangeTrackStart = - std::max(nTxtNodeChangeTrackStart, nTxtFrmTextStartPos); + const sal_Int32 nTextFrmChangeTrackStart = + std::max(nTextNodeChangeTrackStart, nTextFrmTextStartPos); - const sal_Int32 nTxtFrmChangeTrackEnd = - std::min(nTxtNodeChangeTrackEnd, nTxtFrmTextEndPos); + const sal_Int32 nTextFrmChangeTrackEnd = + std::min(nTextNodeChangeTrackEnd, nTextFrmTextEndPos); pMarkupList->Insert( OUString(), 0, - nTxtFrmChangeTrackStart, - nTxtFrmChangeTrackEnd - nTxtFrmChangeTrackStart, + nTextFrmChangeTrackStart, + nTextFrmChangeTrackEnd - nTextFrmChangeTrackStart, pMarkupList->Count() ); } } // eof iteration over the redlines which overlap with the text node } } // eof anonymous namespace -SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTxtFrm& rTxtFrm ) - : mrTxtFrm( rTxtFrm ) +SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm ) + : mrTextFrm( rTextFrm ) , mpChangeTrackInsertionTextMarkupList( 0 ) , mpChangeTrackDeletionTextMarkupList( 0 ) , mpChangeTrackFormatChangeTextMarkupList( 0 ) @@ -176,7 +176,7 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackDeletionTextMarkupList> expected to be NULL." ); OSL_ENSURE( mpChangeTrackFormatChangeTextMarkupList == 0, "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackFormatChangeTextMarkupList> expected to be NULL." ); - initChangeTrackTextMarkupLists( mrTxtFrm, + initChangeTrackTextMarkupLists( mrTextFrm, mpChangeTrackInsertionTextMarkupList, mpChangeTrackDeletionTextMarkupList, mpChangeTrackFormatChangeTextMarkupList ); diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx index 5eaed9e6fe65..a8592529f1f0 100644 --- a/sw/source/core/access/parachangetrackinginfo.hxx +++ b/sw/source/core/access/parachangetrackinginfo.hxx @@ -22,13 +22,13 @@ #include <sal/types.h> -class SwTxtFrm; +class SwTextFrm; class SwWrongList; class SwParaChangeTrackingInfo { public: - explicit SwParaChangeTrackingInfo( const SwTxtFrm& rTxtFrm ); + explicit SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm ); ~SwParaChangeTrackingInfo(); void reset(); @@ -39,7 +39,7 @@ class SwParaChangeTrackingInfo SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION; SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION; - const SwTxtFrm& mrTxtFrm; + const SwTextFrm& mrTextFrm; SwWrongList* mpChangeTrackInsertionTextMarkupList; SwWrongList* mpChangeTrackDeletionTextMarkupList; diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx index 2217f9d84c2d..d316b21ba9c2 100644 --- a/sw/source/core/access/textmarkuphelper.cxx +++ b/sw/source/core/access/textmarkuphelper.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; // helper functions namespace { - const SwWrongList* getTextMarkupList( const SwTxtNode& rTxtNode, + const SwWrongList* getTextMarkupList( const SwTextNode& rTextNode, const sal_Int32 nTextMarkupType ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) @@ -43,7 +43,7 @@ namespace { { case text::TextMarkupType::SPELLCHECK: { - pTextMarkupList = rTxtNode.GetWrong(); + pTextMarkupList = rTextNode.GetWrong(); } break; case text::TextMarkupType::PROOFREADING: @@ -70,10 +70,10 @@ namespace { // implementation of class <SwTextMarkupoHelper> SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData, - const SwTxtNode& rTxtNode ) + const SwTextNode& rTextNode ) : mrPortionData( rPortionData ) // #i108125# - , mpTxtNode( &rTxtNode ) + , mpTextNode( &rTextNode ) , mpTextMarkupList( 0 ) { } @@ -82,7 +82,7 @@ SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionD SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData, const SwWrongList& rTextMarkupList ) : mrPortionData( rPortionData ) - , mpTxtNode( 0 ) + , mpTextNode( 0 ) , mpTextMarkupList( &rTextMarkupList ) { } @@ -97,7 +97,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp const SwWrongList* pTextMarkupList = mpTextMarkupList ? mpTextMarkupList - : getTextMarkupList( *mpTxtNode, nTextMarkupType ); + : getTextMarkupList( *mpTextNode, nTextMarkupType ); if ( pTextMarkupList ) { nTextMarkupCount = pTextMarkupList->Count(); @@ -127,7 +127,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp const SwWrongList* pTextMarkupList = mpTextMarkupList ? mpTextMarkupList - : getTextMarkupList( *mpTxtNode, nTextMarkupType ); + : getTextMarkupList( *mpTextNode, nTextMarkupType ); if ( pTextMarkupList ) { const SwWrongArea* pTextMarkup = @@ -174,7 +174,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp const SwWrongList* pTextMarkupList = mpTextMarkupList ? mpTextMarkupList - : getTextMarkupList( *mpTxtNode, nTextMarkupType ); + : getTextMarkupList( *mpTextNode, nTextMarkupType ); ::std::vector< ::com::sun::star::accessibility::TextSegment > aTmpTextMarkups; if ( pTextMarkupList ) { diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx index e38dba18ad92..37dd9f073a47 100644 --- a/sw/source/core/access/textmarkuphelper.hxx +++ b/sw/source/core/access/textmarkuphelper.hxx @@ -30,13 +30,13 @@ struct TextSegment; } } } } class SwAccessiblePortionData; -class SwTxtNode; +class SwTextNode; class SwWrongList; // #i108125# class SwTextMarkupHelper { public: SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData, - const SwTxtNode& rTxtNode ); + const SwTextNode& rTextNode ); SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData, const SwWrongList& rTextMarkupList ); // #i108125# ~SwTextMarkupHelper() {} @@ -66,7 +66,7 @@ class SwTextMarkupHelper const SwAccessiblePortionData& mrPortionData; // #i108125# - const SwTxtNode* mpTxtNode; + const SwTextNode* mpTextNode; const SwWrongList* mpTextMarkupList; }; #endif |