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

Steve Yin steve_y at apache.org
Fri Feb 14 19:30:47 CET 2014


 sc/source/core/data/documen3.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8610d99b04720958b42047f08ef1f5b00a2d4f4f
Author: Steve Yin <steve_y at apache.org>
Date:   Fri Feb 14 08:44:17 2014 +0000

    Related: #i124065# Low performance opening attached .ods
    
    (cherry picked from commit d89ee4f6306ce8f290e01c80edbcc28a5cd8dcc3)
    
    Conflicts:
    	sc/inc/document.hxx
    	sc/source/core/data/documen3.cxx
    	sc/source/ui/unoobj/nameuno.cxx
    
    Change-Id: Iced475cefe1df62920535db252841fe40339ebb1

diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index e8fed65d..5cafb2a 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -200,11 +200,13 @@ void ScDocument::SetRangeName(SCTAB nTab, ScRangeName* pNew)
 
 void ScDocument::SetRangeName( ScRangeName* pNewRangeName )
 {
+    if (pRangeName == pNewRangeName)
+        return;
+
     delete pRangeName;
     pRangeName = pNewRangeName;
 }
 
-
 const ScRangeData* ScDocument::GetRangeAtBlock( const ScRange& rBlock, OUString* pName ) const
 {
     const ScRangeData* pData = NULL;


More information about the Libreoffice-commits mailing list