[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - sc/source

[Daniel Bankston]

 sc/source/filter/xml/xmlimprt.cxx |    2 --
 sc/source/ui/docshell/docsh.cxx   |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f760f6875f22f1e6d0b782d8f6aee4250835b2a4
Author: Daniel Bankston <daniel.e.bankston at gmail.com>
Date:   Thu Jul 12 08:48:40 2012 -0500

    Disable adjust height flag once for whole doc instead for each tab
    
    Change-Id: Ib82a72d257772b3dcdf9368c4ee5850a6f411d6e

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 831176c..8168b54 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2810,8 +2810,6 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R
     uno::Reference<document::XActionLockable> xActionLockable(xDoc, uno::UNO_QUERY);
     if (xActionLockable.is())
         xActionLockable->addActionLock();
-
-    pDoc->EnableAdjustHeight(false);
 }
 
 // XServiceInfo
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 5f7b828..2ba8500 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -440,9 +440,10 @@ sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::un
     else //still need to recalc volatile formula cells
         DoRecalc(false);
 
+    aDocument.EnableAdjustHeight(false);
+
     aDocument.SetXMLFromWrapper( false );
     AfterXMLLoading(bRet);
-    //! row heights...
 
     return bRet;
 }