[openoffice] branch AOO41X updated: #i126367 existing command text is repeated when insert formula Patch by: Marcos Paulo de Souza

[mseidel]

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO41X by this push:
     new 79ee02b8ac #i126367 existing command text is repeated when insert 
formula Patch by: Marcos Paulo de Souza <marcos.souza....@gmail.com>
79ee02b8ac is described below

commit 79ee02b8ac7b9f9ab497a2e00c303f9dec353eb2
Author: Regina Henschel <reg...@apache.org>
AuthorDate: Mon Jun 15 20:35:27 2015 +0000

    #i126367 existing command text is repeated when insert formula
    Patch by: Marcos Paulo de Souza <marcos.souza....@gmail.com>
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1685665 
13f79535-47bb-0310-9956-ffa450edef68
    (cherry picked from commit 7db8e6903f1f33a109e86c2c0669c4a39fef0c71)
---
 main/starmath/source/mathmlimport.cxx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/main/starmath/source/mathmlimport.cxx 
b/main/starmath/source/mathmlimport.cxx
index 594f8279f8..c50d544104 100644
--- a/main/starmath/source/mathmlimport.cxx
+++ b/main/starmath/source/mathmlimport.cxx
@@ -577,12 +577,10 @@ void SmXMLImport::endDocument(void)
             pDocShell->SetFormulaTree(pTree);
             if (0 == aText.Len())  //If we picked up no annotation text
             {
-                //Make up some editable text
-                aText = pDocShell->GetText();
+                // Get text from imported formula
                 pTree->CreateTextFromNode(aText);
                 aText.EraseTrailingChars();
             }
-            pDocShell->SetText( String() );
 
             // Convert symbol names
             SmParser &rParser = pDocShell->GetParser();