From ab465b90f6c6da5595393a0ba73f33a1e71a2b65 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 20 May 2015 13:05:49 +0200 Subject: bin/rename-sw-abbreviations.sh renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9 --- sw/source/core/edit/edws.cxx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'sw/source/core/edit/edws.cxx') diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx index 8320085184ab..2303e07a3a45 100644 --- a/sw/source/core/edit/edws.cxx +++ b/sw/source/core/edit/edws.cxx @@ -128,7 +128,7 @@ sal_uInt16 SwEditShell::GetCntType() const bool SwEditShell::HasOtherCnt() const { - if ( !GetDoc()->GetSpzFrmFmts()->empty() ) + if ( !GetDoc()->GetSpzFrameFormats()->empty() ) return true; const SwNodes &rNds = GetDoc()->GetNodes(); @@ -169,10 +169,10 @@ SwMvContext::~SwMvContext() m_rShell.EndCrsrMove(); } -SwFrmFmt *SwEditShell::GetTableFmt() // fastest test on a table +SwFrameFormat *SwEditShell::GetTableFormat() // fastest test on a table { - const SwTableNode* pTblNd = IsCrsrInTbl(); - return pTblNd ? (SwFrmFmt*)pTblNd->GetTable().GetFrmFmt() : 0; + const SwTableNode* pTableNd = IsCrsrInTable(); + return pTableNd ? (SwFrameFormat*)pTableNd->GetTable().GetFrameFormat() : 0; } // TODO: Why is this called 3x for a new document? @@ -242,16 +242,16 @@ void SwEditShell::AutoCorrect( SvxAutoCorrect& rACorr, bool bInsert, StartAllAction(); SwPaM* pCrsr = getShellCrsr( true ); - SwTxtNode* pTNd = pCrsr->GetNode().GetTxtNode(); + SwTextNode* pTNd = pCrsr->GetNode().GetTextNode(); SwAutoCorrDoc aSwAutoCorrDoc( *this, *pCrsr, cChar ); // FIXME: this _must_ be called with reference to the actual node text! - OUString const& rNodeText(pTNd->GetTxt()); + OUString const& rNodeText(pTNd->GetText()); rACorr.DoAutoCorrect( aSwAutoCorrDoc, rNodeText, pCrsr->GetPoint()->nContent.GetIndex(), cChar, bInsert, GetWin() ); if( cChar ) - SaveTblBoxCntnt( pCrsr->GetPoint() ); + SaveTableBoxContent( pCrsr->GetPoint() ); EndAllAction(); } @@ -267,12 +267,12 @@ bool SwEditShell::GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord ) bool bRet; SwPaM* pCrsr = getShellCrsr( true ); const sal_Int32 nPos = pCrsr->GetPoint()->nContent.GetIndex(); - SwTxtNode* pTNd = pCrsr->GetNode().GetTxtNode(); + SwTextNode* pTNd = pCrsr->GetNode().GetTextNode(); if( pTNd && nPos ) { SwAutoCorrDoc aSwAutoCorrDoc( *this, *pCrsr, 0 ); bRet = rACorr.GetPrevAutoCorrWord( aSwAutoCorrDoc, - pTNd->GetTxt(), nPos, rWord ); + pTNd->GetText(), nPos, rWord ); } else bRet = false; -- cgit v1.2.3