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

[Jan Holesovsky]

 sw/source/core/unocore/unotext.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 78bad759600e868753934df00b237e6bb48005b8
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Nov 16 12:22:52 2015 +0100

    sw: Rename to void conflict after Crsr -> Cursor rename.
    
    Change-Id: I850a207aebdf2a0f85f1ae75bb6b9a1532b3b4a6

diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index ae52adf..f10a378 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -443,9 +443,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             }
             else if (pCursor)
             {
-                SwPaM *const pCrsr = pCursor->GetPaM();
-                *pCrsr->GetPoint() = *aPam.GetPoint();
-                pCrsr->DeleteMark();
+                SwPaM *const pCursorPam = pCursor->GetPaM();
+                *pCursorPam->GetPoint() = *aPam.GetPoint();
+                pCursorPam->DeleteMark();
             }
         }
         break;