[Libreoffice-commits] core.git: 2 commits - sw/source

[Jan Holesovsky]

 sw/source/core/text/pormulti.cxx    |   36 ++++++++++++++++++------------------
 sw/source/core/txtnode/atrflyin.cxx |    6 +++---
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit f794c3f919ac9f4e27c445ea10379e0ce2d6736c
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Nov 16 12:04:13 2015 +0100

    sw: Rename to avoid conflict after Frm -> Frame rename.
    
    Change-Id: Iffb3681458aeee7b374d1836158e30b6fd488122

diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index 51b50f7..d1f746b 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
commit d72c90cc836873a1d34552ab87b10038d4150dce
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Nov 16 12:01:38 2015 +0100

    sw: Rename to avoid conflict after Crsr -> Cursor rename.
    
    Change-Id: Iee7124259cadc1db416e8aedc5b4e87f75ba9d21

diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 541798a..5426990 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -2237,49 +2237,49 @@ SwLinePortion* SwTextFormatter::MakeRestPortion( const SwLineLayout* pLine,
 // SwTextCursorSave notes the start and current line of a SwTextCursor,
 // sets them to the values for GetCrsrOfst inside a multiportion
 // and restores them in the destructor.
-SwTextCursorSave::SwTextCursorSave( SwTextCursor* pTextCursor,
+SwTextCursorSave::SwTextCursorSave( SwTextCursor* pCursor,
                                   SwMultiPortion* pMulti,
                                   SwTwips nY,
                                   sal_uInt16& nX,
                                   sal_Int32 nCurrStart,
                                   long nSpaceAdd )
 {
-    pTextCrsr = pTextCursor;
-    nStart = pTextCursor->m_nStart;
-    pTextCursor->m_nStart = nCurrStart;
-    pCurr = pTextCursor->m_pCurr;
-    pTextCursor->m_pCurr = &pMulti->GetRoot();
-    while( pTextCursor->Y() + pTextCursor->GetLineHeight() < nY &&
-        pTextCursor->Next() )
+    pTextCrsr = pCursor;
+    nStart = pCursor->m_nStart;
+    pCursor->m_nStart = nCurrStart;
+    pCurr = pCursor->m_pCurr;
+    pCursor->m_pCurr = &pMulti->GetRoot();
+    while( pCursor->Y() + pCursor->GetLineHeight() < nY &&
+        pCursor->Next() )
         ; // nothing
-    nWidth = pTextCursor->m_pCurr->Width();
-    nOldProp = pTextCursor->GetPropFont();
+    nWidth = pCursor->m_pCurr->Width();
+    nOldProp = pCursor->GetPropFont();
 
     if ( pMulti->IsDouble() || pMulti->IsBidi() )
     {
-        bSpaceChg = pMulti->ChgSpaceAdd( pTextCursor->m_pCurr, nSpaceAdd );
+        bSpaceChg = pMulti->ChgSpaceAdd( pCursor->m_pCurr, nSpaceAdd );
 
         sal_Int32 nSpaceCnt;
         if ( pMulti->IsDouble() )
         {
-            pTextCursor->SetPropFont( 50 );
+            pCursor->SetPropFont( 50 );
             nSpaceCnt = static_cast<SwDoubleLinePortion*>(pMulti)->GetSpaceCnt();
         }
         else
         {
-            const sal_Int32 nOldIdx = pTextCursor->GetInfo().GetIdx();
-            pTextCursor->GetInfo().SetIdx ( nCurrStart );
-            nSpaceCnt = static_cast<SwBidiPortion*>(pMulti)->GetSpaceCnt(pTextCursor->GetInfo());
-            pTextCursor->GetInfo().SetIdx ( nOldIdx );
+            const sal_Int32 nOldIdx = pCursor->GetInfo().GetIdx();
+            pCursor->GetInfo().SetIdx ( nCurrStart );
+            nSpaceCnt = static_cast<SwBidiPortion*>(pMulti)->GetSpaceCnt(pCursor->GetInfo());
+            pCursor->GetInfo().SetIdx ( nOldIdx );
         }
 
         if( nSpaceAdd > 0 && !pMulti->HasTabulator() )
-            pTextCursor->m_pCurr->Width( static_cast<sal_uInt16>(nWidth + nSpaceAdd * nSpaceCnt / SPACING_PRECISION_FACTOR ) );
+            pCursor->m_pCurr->Width( static_cast<sal_uInt16>(nWidth + nSpaceAdd * nSpaceCnt / SPACING_PRECISION_FACTOR ) );
 
         // For a BidiPortion we have to calculate the offset from the
         // end of the portion
         if ( nX && pMulti->IsBidi() )
-            nX = pTextCursor->m_pCurr->Width() - nX;
+            nX = pCursor->m_pCurr->Width() - nX;
     }
     else
         bSpaceChg = false;