[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/source

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Fri Apr 3 15:17:48 UTC 2020


 sc/source/ui/docshell/impex.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41d90ebc2f53df095c8b66d3cd31adef2a5304c9
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Mar 12 19:44:34 2020 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Fri Apr 3 17:17:14 2020 +0200

    tdf#131273: fix crash when pasting quotes with fixed width
    
    See bt https://bugs.documentfoundation.org/show_bug.cgi?id=131273#c2
    
    Change-Id: I78f592bb2ee59b50e7301fe4e6f282e53c4eeb7e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90438
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit cf3fec9e7cadd0a6c4f42a4015df429d9e32b7e8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90398
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 3d264dc8742733a797a3e315033851d0bda3bffd)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90952
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 58d848a3095e..c7cdc06186b2 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1265,7 +1265,7 @@ static OUString lcl_GetFixed( const OUString& rLine, sal_Int32 nStart, sal_Int32
         bool bFits = (nSpace - nStart - 3 <= SAL_MAX_UINT16);
         OSL_ENSURE( bFits, "lcl_GetFixed: line doesn't fit into data");
         if (bFits)
-            return rLine.copy(nStart+1, nSpace-nStart-2);
+            return rLine.copy(nStart+1, std::max< sal_Int32 >(0, nSpace-nStart-2));
         else
         {
             rbOverflowCell = true;


More information about the Libreoffice-commits mailing list