diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
| commit | 85825e0fd54551735ef05b8484f71974734b9135 (patch) | |
| tree | 8bece458e55c1b5eab7559076579bf76cca8df68 /sw/source/core/layout/objectformatterlayfrm.cxx | |
| parent | fc233b52ce2acc1bcd7cecc3d51bcab870c81932 (diff) | |
Avoid reserved identifiers
Change-Id: I27ff0f4f0eb395d7e0a60dd604758c220a3134c4
Diffstat (limited to 'sw/source/core/layout/objectformatterlayfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/objectformatterlayfrm.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx index 76e6d1d9c64b..60507497a1f1 100644 --- a/sw/source/core/layout/objectformatterlayfrm.cxx +++ b/sw/source/core/layout/objectformatterlayfrm.cxx @@ -73,7 +73,7 @@ SwFrame& SwObjectFormatterLayFrame::GetAnchorFrame() bool SwObjectFormatterLayFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj, const bool ) { - _FormatObj( _rAnchoredObj ); + FormatObj_( _rAnchoredObj ); // #124218# - consider that the layout action has to be // restarted due to a deleted page frame. @@ -84,7 +84,7 @@ bool SwObjectFormatterLayFrame::DoFormatObjs() { bool bSuccess( true ); - bSuccess = _FormatObjsAtFrame(); + bSuccess = FormatObjsAtFrame_(); if ( bSuccess && GetAnchorFrame().IsPageFrame() ) { @@ -92,7 +92,7 @@ bool SwObjectFormatterLayFrame::DoFormatObjs() // Thus, format also all anchored objects, which are registered at // this page frame, whose 'anchor' isn't on this page frame and whose // anchor frame is valid. - bSuccess = _AdditionalFormatObjsOnPage(); + bSuccess = AdditionalFormatObjsOnPage(); } return bSuccess; @@ -104,11 +104,11 @@ bool SwObjectFormatterLayFrame::DoFormatObjs() OD 2004-07-02 #i28701# */ -bool SwObjectFormatterLayFrame::_AdditionalFormatObjsOnPage() +bool SwObjectFormatterLayFrame::AdditionalFormatObjsOnPage() { if ( !GetAnchorFrame().IsPageFrame() ) { - OSL_FAIL( "<SwObjectFormatterLayFrame::_AdditionalFormatObjsOnPage()> - mis-usage of method, call only for anchor frames of type page frame" ); + OSL_FAIL( "<SwObjectFormatterLayFrame::AdditionalFormatObjsOnPage()> - mis-usage of method, call only for anchor frames of type page frame" ); return true; } @@ -146,7 +146,7 @@ bool SwObjectFormatterLayFrame::_AdditionalFormatObjsOnPage() // #i26945# - check, if the page frame of the // object's anchor frame isn't the given page frame OSL_ENSURE( pPageFrameOfAnchor, - "<SwObjectFormatterLayFrame::_AdditionalFormatObjsOnPage()> - missing page frame" ); + "<SwObjectFormatterLayFrame::AdditionalFormatObjsOnPage()> - missing page frame" ); if ( pPageFrameOfAnchor && // #i35911# pPageFrameOfAnchor->GetPhyPageNum() < rPageFrame.GetPhyPageNum() ) |