[Libreoffice-commits] core.git: sc/source

[Markus Mohrhard]

 sc/source/filter/xml/xmlcelli.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 97361478e64f11330f7f7aea819d60c7562fb0f6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Dec 15 16:23:31 2015 +0100

    don't call getOutputString when we are not using the result, tdf#92802
    
    Change-Id: I5569eb618b5577714bd10c77ade198638394df8b
    Reviewed-on: https://gerrit.libreoffice.org/20725
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index f55e570..9d691ed 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1331,7 +1331,7 @@ void ScXMLTableRowCellContext::AddNonFormulaCell( const ScAddress& rCellPos )
 
     if( nCellType == util::NumberFormat::TEXT )
     {
-        if( cellExists(rCellPos) && CellsAreRepeated() )
+        if( !bIsEmpty && !maStringValue && !mbEditEngineHasText && cellExists(rCellPos) && CellsAreRepeated() )
             pOUText.reset( getOutputString(rXMLImport.GetDocument(), rCellPos) );
 
         if (!mbEditEngineHasText && !pOUText && !maStringValue)