Re: [REVIEW-3-6][REVIEW-3-5] fix for fdo#49255 FORMATTING: row height not preserved after FILESAVE and reopen

I never did attach the patch in question :-/ cherry-pickers welcome

Noel

On 24/08/12 11:24, Noel Power wrote:
> please excuse my old school use of the mail-list,
>
> Looking at 
> http://wiki.documentfoundation.org/Development/gerrit/SubmitPatch
>
> "Only the last line is special and will push all patches in your 
> current branch to the review queue for the master branch (Adjust 
> accordingly, if you want to submit a patch to one of the release 
> branches)."
>
> I read the line above as referring to the fact that 'logerrit' ( the 
> special thing in the last line ) doesn't exist in the branch tree so 
> adjust accordingly e.g. don't use it, things will happen 
> automatically. So... that's what I did I pushed the patch and expected 
> it to go to the review queue for 3.6. However I see that I have 
> committed the patch directly to 3.6 ( reverted now. ) I wonder what 
> you really are supposed to do, obviously I am too dumb to figure it out
>
> Noel
> _______________________________________________
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

From 9efd8deb867c89baf0f5df410b87e8310fff524b Mon Sep 17 00:00:00 2001
From: Noel Power <noel.power@suse.com>
Date: Fri, 24 Aug 2012 10:31:45 +0100
Subject: [PATCH] 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 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index bf7c18b..d0234b2 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<document::XActionLockable> 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
-- 
1.7.3.4