[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/docshell/docsh.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a6050279eb4e70cb82cfcae2e04b6fce07583149
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Jan 22 23:50:47 2013 +0100

    reset automatic row height flag after import, fdo#59193
    
    Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b
    Reviewed-on: https://gerrit.libreoffice.org/1832
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Joren De Cuyper <joren.libreoffice at telenet.be>
    Reviewed-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Tested-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 948f622..43fd526 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -469,11 +469,14 @@ sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::un
         // still need to recalc volatile formula cells.
         aDocument.CalcFormulaTree(false, true, false);
 
+    bool bAdjustHeightOld = aDocument.IsAdjustHeightEnabled();
     aDocument.EnableAdjustHeight(false);
 
     aDocument.SetXMLFromWrapper( false );
     AfterXMLLoading(bRet);
 
+    aDocument.EnableAdjustHeight(bAdjustHeightOld);
+
     return bRet;
 }