From a96998cdd131e715746db83cc3b08823e4318100 Mon Sep 17 00:00:00 2001 From: Daniel Bankston Date: Thu, 12 Jul 2012 08:48:40 -0500 Subject: Disable adjust height flag once for whole doc instead for each tab Change-Id: Ib82a72d257772b3dcdf9368c4ee5850a6f411d6e --- sc/source/filter/xml/xmlimprt.cxx | 2 -- sc/source/ui/docshell/docsh.cxx | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'sc') diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 4f2ff595a12b..90e68acb8504 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2809,8 +2809,6 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R uno::Reference 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 eb2880605b9a..d59206a43e2f 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -443,9 +443,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; } -- cgit