Author: af
Date: Thu Jun 21 09:38:03 2012
New Revision: 1352479
URL: http://svn.apache.org/viewvc?rev=1352479&view=rev
Log:
#i119960# Fixed copy-and-past of quoted text from clipboard.
Patch by: zhaoshzh
Review by: Andre Fischer
Modified:
incubator/ooo/trunk/main/sc/source/ui/docshell/impex.cxx
Modified: incubator/ooo/trunk/main/sc/source/ui/docshell/impex.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/docshell/impex.cxx?rev=1352479&r1=1352478&r2=1352479&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/ui/docshell/impex.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/ui/docshell/impex.cxx Thu Jun 21
09:38:03 2012
@@ -843,23 +843,20 @@ sal_Bool ScImportExport::Text2Doc( SvStr
while( *p )
{
aCell.Erase();
- if( *p == cStr )
+
+ if( *p == cStr )//cStr = "
{
p = lcl_ScanString( p, aCell, cStr,
DQM_KEEP );
- while( *p && *p != cSep )
- p++;
- if( *p )
- p++;
- }
- else
- {
- const sal_Unicode* q = p;
- while( *p && *p != cSep )
- p++;
- aCell.Assign( q, sal::static_int_cast<xub_StrLen>( p - q )
);
- if( *p )
- p++;
}
+
+ const sal_Unicode* q = p;
+ while( *p && *p != cSep )// cSep = tab
+ p++;
+
+ aCell.Append( q, sal::static_int_cast<xub_StrLen>( p - q ) );
+
+ if( *p )
+ p++;
if (ValidCol(nCol) && ValidRow(nRow) )
{
if( bSingle )
