sc/source/filter/xml/xmlimprt.cxx | 21 --------------------- 1 file changed, 21 deletions(-)
New commits: commit 4ce677114c979764d70bffa4d0b0f87278444275 Author: Thorsten Behrens <thorsten.behr...@cib.de> AuthorDate: Fri Oct 12 01:23:58 2018 +0200 Commit: Thorsten Behrens <thorsten.behr...@cib.de> CommitDate: Tue Oct 30 12:51:43 2018 +0100 Partial revert of allow row height recalculation on document load This reverts commit 0896fdb1b165b44ef22c2b909184ce6ae5548b48: tdf#62268: allow row height recalculation on document load Change-Id: I9745f064fab5c5a410d84fcb5ed886c553cb4a91 diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 3aa2d017433e..a82de485c12e 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -73,7 +73,6 @@ #include "pivotsource.hxx" #include <unonames.hxx> #include <numformat.hxx> -#include <sizedev.hxx> #include <comphelper/extract.hxx> @@ -3258,26 +3257,6 @@ void SAL_CALL ScXMLImport::endDocument() pDoc->SetStreamValid( nTab, true ); } } - - // There are rows with optimal height which need to be updated - if (!maRecalcRowRanges.empty()) - { - bool bLockHeight = !pDoc->IsAdjustHeightEnabled(); - if (bLockHeight) - { - pDoc->EnableAdjustHeight(true); - } - - ScSizeDeviceProvider aProv(static_cast<ScDocShell*>(pDoc->GetDocumentShell())); - ScDocRowHeightUpdater aUpdater(*pDoc, aProv.GetDevice(), aProv.GetPPTX(), aProv.GetPPTY(), &maRecalcRowRanges); - aUpdater.update(); - - if (bLockHeight) - { - pDoc->EnableAdjustHeight(false); - } - } - aTables.FixupOLEs(); } if (GetModel().is()) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits