diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-11-16 12:04:13 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-11-16 12:18:52 +0100 |
| commit | f794c3f919ac9f4e27c445ea10379e0ce2d6736c (patch) | |
| tree | e45e1db5d74b06b8017d1105fa257101a48ce948 | |
| parent | d72c90cc836873a1d34552ab87b10038d4150dce (diff) | |
sw: Rename to avoid conflict after Frm -> Frame rename.
Change-Id: Iffb3681458aeee7b374d1836158e30b6fd488122
| -rw-r--r-- | sw/source/core/txtnode/atrflyin.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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<SwFlyFrameFormat*>(pFrameFormat), pCurrFrame, pCurrFrame ); - pCurrFrame->AppendFly( pFly ); + SwFrm* pCurrentFrame = const_cast<SwFrm*>(pCurrFrm); + SwFlyInCntFrm *pFly = new SwFlyInCntFrm(static_cast<SwFlyFrameFormat*>(pFrameFormat), pCurrentFrame, pCurrentFrame); + pCurrentFrame->AppendFly(pFly); pFly->RegistFlys(); // 7922: Wir muessen dafuer sorgen, dass der Inhalt des FlyInCnt |