From f794c3f919ac9f4e27c445ea10379e0ce2d6736c Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Mon, 16 Nov 2015 12:04:13 +0100 Subject: sw: Rename to avoid conflict after Frm -> Frame rename. Change-Id: Iffb3681458aeee7b374d1836158e30b6fd488122 --- sw/source/core/txtnode/atrflyin.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sw') diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index 51b50f7c7e9b..d1f746bdfbb6 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -255,9 +255,9 @@ SwFlyInCntFrm *SwTextFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm ) // Dabei wird eine sofortige Neuformatierung von pCurrFrm angestossen. // Die Rekursion wird durch den Lockmechanismus in SwTextFrm::Format() // abgewuergt. - SwFrm* pCurrFrame = const_cast< SwFrm* >(pCurrFrm); - SwFlyInCntFrm *pFly = new SwFlyInCntFrm( static_cast(pFrameFormat), pCurrFrame, pCurrFrame ); - pCurrFrame->AppendFly( pFly ); + SwFrm* pCurrentFrame = const_cast(pCurrFrm); + SwFlyInCntFrm *pFly = new SwFlyInCntFrm(static_cast(pFrameFormat), pCurrentFrame, pCurrentFrame); + pCurrentFrame->AppendFly(pFly); pFly->RegistFlys(); // 7922: Wir muessen dafuer sorgen, dass der Inhalt des FlyInCnt -- cgit