[Libreoffice-commits] .: sc/source

Eike Rathke erack at kemper.freedesktop.org
Thu Apr 12 16:37:25 PDT 2012


 sc/source/ui/docshell/impex.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 2a2d04dff73b85185f7da59fea173a8bffb7c190
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Apr 13 01:37:00 2012 +0200

    one more lcl_appendLineData() for line size >64k
    
    Though this specific piece of code is not used in CSV import it may act on
    long lines now.

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index a8790bb..6227c3a 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -634,7 +634,13 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String& rString,
                     break;
                     case DQM_CONCAT :
                         if ( p0+1 < p )
-                            rString.Append( p0, sal::static_int_cast<xub_StrLen>( (p-1) - p0 ) );  // first part
+                        {
+                            // first part
+                            if (!lcl_appendLineData( rString, p0, p-1))
+                            {
+                                /* TODO: warning at UI, data truncated */
+                            }
+                        }
                         p0 = ++p;       // text of next part starts here
                     break;
                     case DQM_SEPARATE :


More information about the Libreoffice-commits mailing list