From 49c2b9808df8a6b197dec666dfc0cda6321a4306 Mon Sep 17 00:00:00 2001 From: Robinson Tryon Date: Wed, 25 Nov 2015 06:03:10 -0500 Subject: bin/rename-sw-abbreviations.sh This commit renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8 --- sw/source/core/doc/docftn.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sw/source/core/doc/docftn.cxx') diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 8cca4cd8b0ba..5bec265ffe26 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -251,7 +251,7 @@ SwFootnoteInfo::SwFootnoteInfo(SwTextFormatColl *pFormat) : void SwDoc::SetFootnoteInfo(const SwFootnoteInfo& rInfo) { - SwRootFrm* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout(); + SwRootFrame* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout(); if( !(GetFootnoteInfo() == rInfo) ) { const SwFootnoteInfo &rOld = GetFootnoteInfo(); @@ -277,7 +277,7 @@ void SwDoc::SetFootnoteInfo(const SwFootnoteInfo& rInfo) if (pTmpRoot) { - std::set aAllLayouts = GetAllLayouts(); + std::set aAllLayouts = GetAllLayouts(); if ( bFootnotePos ) for( auto aLayout : aAllLayouts ) aLayout->AllRemoveFootnotes(); @@ -323,7 +323,7 @@ void SwDoc::SetFootnoteInfo(const SwFootnoteInfo& rInfo) void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo) { - SwRootFrm* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout(); + SwRootFrame* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout(); if( !(GetEndNoteInfo() == rInfo) ) { if(GetIDocumentUndoRedo().DoesUndo()) @@ -393,7 +393,7 @@ bool SwDoc::SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr, sal_uInt16 nNumber, bool bIsEndNote ) { SwFootnoteIdxs& rFootnoteArr = GetFootnoteIdxs(); - SwRootFrm* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout(); + SwRootFrame* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout(); const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End(); const sal_uLong nSttNd = pStt->nNode.GetIndex(); -- cgit