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/inc/cntfrm.hxx | |
| parent | fc233b52ce2acc1bcd7cecc3d51bcab870c81932 (diff) | |
Avoid reserved identifiers
Change-Id: I27ff0f4f0eb395d7e0a60dd604758c220a3134c4
Diffstat (limited to 'sw/source/core/inc/cntfrm.hxx')
| -rw-r--r-- | sw/source/core/inc/cntfrm.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index 3f9af9402362..4ef2bd6d7bb7 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -40,14 +40,14 @@ class SwContentFrame: public SwFrame, public SwFlowFrame // parameter <bObjsInNewUpper> indicates that objects exist in remaining // area of new upper - bool _WouldFit( SwTwips nSpace, + bool WouldFit_( SwTwips nSpace, SwLayoutFrame *pNewUpper, bool bTstMove, const bool bObjsInNewUpper ); virtual void MakeAll(vcl::RenderContext* pRenderContext) override; - void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, + void UpdateAttr_( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool& ) override; |