diff options
Diffstat (limited to 'sw/source/core/tox/tox.cxx')
| -rw-r--r-- | sw/source/core/tox/tox.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 14417ca08b4c..3ba10e149c04 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -98,7 +98,7 @@ SwTOXMark::SwTOXMark() : SfxPoolItem( RES_TXTATR_TOXMARK ) , SwModify( 0 ) , - pTxtAttr( 0 ), nLevel( 0 ), + pTextAttr( 0 ), nLevel( 0 ), bAutoGenerated(false), bMainEntry(false) { @@ -108,7 +108,7 @@ SwTOXMark::SwTOXMark( const SwTOXType* pTyp ) : SfxPoolItem( RES_TXTATR_TOXMARK ) , SwModify( const_cast<SwTOXType*>(pTyp) ) , - pTxtAttr( 0 ), nLevel( 0 ), + pTextAttr( 0 ), nLevel( 0 ), bAutoGenerated(false), bMainEntry(false) { @@ -122,7 +122,7 @@ SwTOXMark::SwTOXMark( const SwTOXMark& rCopy ) aTextReading( rCopy.aTextReading ), aPrimaryKeyReading( rCopy.aPrimaryKeyReading ), aSecondaryKeyReading( rCopy.aSecondaryKeyReading ), - pTxtAttr( 0 ), nLevel( rCopy.nLevel ), + pTextAttr( 0 ), nLevel( rCopy.nLevel ), bAutoGenerated( rCopy.bAutoGenerated), bMainEntry(rCopy.bMainEntry) { @@ -172,14 +172,14 @@ OUString SwTOXMark::GetText() const if( !aAltText.isEmpty() ) return aAltText; - if( pTxtAttr && pTxtAttr->GetpTxtNd() ) + if( pTextAttr && pTextAttr->GetpTextNd() ) { - const sal_Int32* pEndIdx = pTxtAttr->GetEnd(); + const sal_Int32* pEndIdx = pTextAttr->GetEnd(); OSL_ENSURE( pEndIdx, "TOXMark without mark!"); if( pEndIdx ) { - const sal_Int32 nStt = pTxtAttr->GetStart(); - return pTxtAttr->GetpTxtNd()->GetExpandTxt( nStt, *pEndIdx-nStt ); + const sal_Int32 nStt = pTextAttr->GetStart(); + return pTextAttr->GetpTextNd()->GetExpandText( nStt, *pEndIdx-nStt ); } } @@ -192,7 +192,7 @@ void SwTOXMark::InsertTOXMarks( SwTOXMarks& aMarks, const SwTOXType& rType ) SwTOXMark* pMark = aIter.First(); while( pMark ) { - if(pMark->GetTxtTOXMark()) + if(pMark->GetTextTOXMark()) aMarks.push_back(pMark); pMark = aIter.Next(); } @@ -369,7 +369,7 @@ void SwForm::AdjustTabStops( SwDoc& rDoc ) // #i21237# const sal_uInt16 nFormMax = GetFormMax(); for ( sal_uInt16 nLevel = 1; nLevel < nFormMax; ++nLevel ) { - SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName( GetTemplate(nLevel) ); + SwTextFormatColl* pColl = rDoc.FindTextFormatCollByName( GetTemplate(nLevel) ); if( pColl == NULL ) { // Paragraph Style for this level has not been created. @@ -421,7 +421,7 @@ OUString SwForm::GetFormPageNums() {return OUString("<#>");} OUString SwForm::GetFormLinkStt() {return OUString("<LS>");} OUString SwForm::GetFormLinkEnd() {return OUString("<LE>");} OUString SwForm::GetFormEntryNum() {return OUString("<E#>");} -OUString SwForm::GetFormEntryTxt() {return OUString("<ET>");} +OUString SwForm::GetFormEntryText() {return OUString("<ET>");} OUString SwForm::GetFormChapterMark() {return OUString("<C>");} OUString SwForm::GetFormText() {return OUString("<X>");} OUString SwForm::GetFormAuth() {return OUString("<A>");} @@ -571,7 +571,7 @@ OUString SwFormToken::GetString() const sToken = SwForm::GetFormEntryNum(); break; case TOKEN_ENTRY_TEXT: - sToken = SwForm::GetFormEntryTxt(); + sToken = SwForm::GetFormEntryText(); break; case TOKEN_ENTRY: sToken = SwForm::GetFormEntry(); @@ -673,7 +673,7 @@ static FormTokenType lcl_GetTokenType(const OUString & sToken, { SwForm::GetFormLinkStt(), 1, TOKEN_LINK_START }, { SwForm::GetFormLinkEnd(), 1, TOKEN_LINK_END }, { SwForm::GetFormEntryNum(), 1, TOKEN_ENTRY_NO }, - { SwForm::GetFormEntryTxt(), 1, TOKEN_ENTRY_TEXT }, + { SwForm::GetFormEntryText(), 1, TOKEN_ENTRY_TEXT }, { SwForm::GetFormChapterMark(), 1, TOKEN_CHAPTER_INFO }, { SwForm::GetFormText(), 1, TOKEN_TEXT }, { SwForm::GetFormEntry(), 1, TOKEN_ENTRY }, |