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/edit/edundo.cxx | |
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/edit/edundo.cxx')
-rw-r--r-- | sw/source/core/edit/edundo.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index f657c0609c4f..3a3944e01b29 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -53,15 +53,15 @@ void SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext) return; } - SwFrmFmt * pSelFmt(0); + SwFrameFormat * pSelFormat(0); SdrMarkList * pMarkList(0); - rContext.GetSelections(pSelFmt, pMarkList); + rContext.GetSelections(pSelFormat, pMarkList); - if (pSelFmt) // select frame + if (pSelFormat) // select frame { - if (RES_DRAWFRMFMT == pSelFmt->Which()) + if (RES_DRAWFRMFMT == pSelFormat->Which()) { - SdrObject* pSObj = pSelFmt->FindSdrObject(); + SdrObject* pSObj = pSelFormat->FindSdrObject(); static_cast<SwFEShell*>(this)->SelectObj( pSObj->GetCurrentBoundRect().Center() ); } @@ -69,14 +69,14 @@ void SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext) { Point aPt; SwFlyFrm *const pFly = - static_cast<SwFlyFrmFmt*>(pSelFmt)->GetFrm(& aPt, false); + static_cast<SwFlyFrameFormat*>(pSelFormat)->GetFrm(& aPt, false); if (pFly) { // fdo#36681: Invalidate the content and layout to refresh // the picture anchoring properly SwPageFrm* pPageFrm = pFly->FindPageFrmOfAnchor(); pPageFrm->InvalidateFlyLayout(); - pPageFrm->InvalidateCntnt(); + pPageFrm->InvalidateContent(); static_cast<SwFEShell*>(this)->SelectFlyFrm(*pFly, true); } @@ -121,7 +121,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount) Push(); // Destroy stored TableBoxPtr. A dection is only permitted for the new "Box"! - ClearTblBoxCntnt(); + ClearTableBoxContent(); const RedlineMode_t eOld = GetDoc()->getIDocumentRedlineAccess().GetRedlineMode(); @@ -146,7 +146,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount) GetDoc()->getIDocumentRedlineAccess().CompressRedlines(); // automatic detection of the new "Box" - SaveTblBoxCntnt(); + SaveTableBoxContent(); } EndAllAction(); @@ -177,7 +177,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount) Push(); // Destroy stored TableBoxPtr. A dection is only permitted for the new "Box"! - ClearTblBoxCntnt(); + ClearTableBoxContent(); RedlineMode_t eOld = GetDoc()->getIDocumentRedlineAccess().GetRedlineMode(); @@ -198,7 +198,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount) GetDoc()->getIDocumentRedlineAccess().CompressRedlines(); // automatic detection of the new "Box" - SaveTblBoxCntnt(); + SaveTableBoxContent(); } EndAllAction(); |