diff options
| author | Daniel Bankston <daniel.e.bankston@gmail.com> | 2012-07-12 08:48:40 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-08-23 11:49:57 -0400 |
| commit | a96998cdd131e715746db83cc3b08823e4318100 (patch) | |
| tree | 859e23455e7bc5f9981af4de2f6442cb7ff424e5 /sc | |
| parent | bed0447cefb949fc77cfde7543397d96590082ba (diff) | |
Disable adjust height flag once for whole doc instead for each tab
Change-Id: Ib82a72d257772b3dcdf9368c4ee5850a6f411d6e
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
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<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 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; } |