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

[Caolán McNamara]

 editeng/source/uno/unotext.cxx |    2 +-
 sc/source/ui/app/scdll.cxx     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6a761619141a42123c64b942bdfd24294e3a7b91
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 4 13:57:14 2014 +0100

    translate comment for posterity anyway
    
    Change-Id: I0a83f1a2fd50d8772b02ae61bf903123c4779fc8

diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 63a68c9..755839a 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -248,7 +248,7 @@ void ScDLL::Init()
 
     //  Child-Windows
 
-    // Hack: Eingabezeile mit 42 registrieren, damit sie im PlugIn immer sichtbar ist
+    // Hack: register input line with 42 so it is always visible in the PlugIn
     ScInputWindowWrapper        ::RegisterChildWindow(42, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK);
     ScNavigatorDialogWrapper    ::RegisterChildWindowContext(static_cast<sal_uInt16>(ScTabViewShell::GetInterfaceId()), pMod);
     ScSolverDlgWrapper          ::RegisterChildWindow(false, pMod);
commit 3d330f20ef65a8723bcb1b4fde7a673a41b5554c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 3 15:56:55 2014 +0100

    Resolves: coverity#705447 Self assignment
    
    in every other !bAbsorb branch we set the StartPara to the EndPara
    
    Change-Id: I4fc877e9d63f823679acf9c4b1550d5e877819be

diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 9c46bfb..1bbd3b2 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1891,8 +1891,8 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text
                 }
                 else
                 {
+                    aRange.nStartPara = aRange.nEndPara;
                     aRange.nStartPos = aRange.nEndPos;
-                    aRange.nStartPara = aRange.nStartPara;
                 }
 
                 pForwarder->QuickInsertLineBreak( aRange );