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

[Caolán McNamara]

 starmath/source/edit.cxx        |    4 ++--
 sw/source/core/doc/extinput.cxx |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 7be74f1bc55ee8d41d91738ec4ab89b6cfd4f875
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 19 13:51:18 2013 +0100

    OUString::copy second arg is len, not index
    
    Change-Id: I54729ad816efd4e51e13c0a2985c591920750d59

diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index a1a541f..e95e85f 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -436,7 +436,7 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
                 sal_Int32 index = selected.indexOf("\n", aSelection.nEndPos);
                 if (index != -1)
                 {
-                    selected = selected.copy(index, sal_Int32(aSelection.nEndPos));
+                    selected = selected.copy(index, sal_Int32(aSelection.nEndPos-index));
                     if (selected.trim().isEmpty())
                         autoClose = true;
                 }
@@ -447,7 +447,7 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
                         autoClose = true;
                     else
                     {
-                        selected = selected.copy(aSelection.nEndPos, length);
+                        selected = selected.copy(aSelection.nEndPos);
                         if (selected.trim().isEmpty())
                             autoClose = true;
                     }
commit b249776e52846c74c44ebe9e9b00364f3acda97f
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Tue Sep 10 21:24:49 2013 +0200

    Really loop over ExtInput ring
    
    Change-Id: I13e4ec0daa40f60a563b1fd39094b86bf3709c47

diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index f997ba7..92075ab 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -283,7 +283,8 @@ SwExtTextInput* SwDoc::GetExtTextInput( const SwNode& rNd,
                 pRet = pTmp;
                 break;
             }
-        } while( mpExtInputRing != (pTmp = (SwExtTextInput*)mpExtInputRing ) );
+            pTmp = static_cast<SwExtTextInput*>(pTmp->GetNext());
+        } while ( pTmp!=mpExtInputRing );
     }
     return pRet;
 }