[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source

Michael Meeks michael.meeks at collabora.com
Tue Apr 25 16:08:51 UTC 2017


 sw/source/filter/ascii/parasc.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 57f248ec1b39235a372d6e031d77301f265d70ba
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Apr 24 14:58:54 2017 +0100

    Optimize plain-text import.
    
    Cost of managing rsids is very significant >50% of import time, new
    Rsids will be generated for changes anyway.
    Also avoid un-necessary splitting of paragraphs on new-line.
    
    Change-Id: Ib959306f187f93bd3a85ead11fd2342b99d4ece3
    Reviewed-on: https://gerrit.libreoffice.org/36938
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit e68b6e349c31ac1376e90218013e1e7612f2b522)
    Reviewed-on: https://gerrit.libreoffice.org/36952
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index b3c75f625b85..f6ed774a3c63 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -479,7 +479,7 @@ sal_uLong SwASCIIParser::ReadChars()
         {
             // We found a CR/LF, thus save the text
             InsertText( OUString( pLastStt ));
-            pDoc->getIDocumentContentOperations().SplitNode( *pPam->GetPoint(), false );
+            pDoc->getIDocumentContentOperations().AppendTextNode( *pPam->GetPoint() );
             pLastStt = pStt;
             nLineLen = 0;
         }
@@ -496,8 +496,6 @@ sal_uLong SwASCIIParser::ReadChars()
 void SwASCIIParser::InsertText( const OUString& rStr )
 {
     pDoc->getIDocumentContentOperations().InsertString( *pPam, rStr );
-    pDoc->UpdateRsid( *pPam, rStr.getLength() );
-    pDoc->UpdateParRsid( pPam->GetPoint()->nNode.GetNode().GetTextNode() );
 
     if( pItemSet && g_pBreakIt && nScript != ( SvtScriptType::LATIN |
                                              SvtScriptType::ASIAN |


More information about the Libreoffice-commits mailing list