From 9efd8deb867c89baf0f5df410b87e8310fff524b Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 24 Aug 2012 10:31:45 +0100 Subject: fix for fdo#49255 This patch disables row height calculations ( and uses the hard heights read from the xml instead ) The bug here partially exisits because the height calculation doesn't work correctly because the factor from ScDocShell::GetOutputFactor() has not been calculated yet ( and has a default value of 1 ) This number is used in setting up the correct nPPTX and because it isn't setup correctly the height calculated for the text is incorrect. We use EnableAdjustHeight to inhibit auto height calculations that result from various changes ( like style changes etc. ) from the start of the load and re-enabled it at the end. Change-Id: Ib6715c39b7cb5793458f15b1f0b3c9ecd16412f9 --- sc/source/filter/xml/xmlimprt.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index bf7c18b795f2..d0234b29ed6f 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2811,6 +2811,7 @@ 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 @@ -3105,7 +3106,6 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE pDoc->SetStreamValid( nTab, true ); } - aTables.UpdateRowHeights(); aTables.FixupOLEs(); } if (GetModel().is()) @@ -3120,6 +3120,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE { ScModelObj::getImplementation(GetModel())->AfterXMLLoading(true); } + pDoc->EnableAdjustHeight( true ); } // XEventListener -- cgit v1.2.3