sc/source/filter/xml/xmlimprt.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 390a18bfdccfa9b2334ff0e76800358177f1c661
Author: Noel Power <noel.po...@suse.com>
Date: Fri Aug 24 10:31:45 2012 +0100
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
Signed-off-by: Kohei Yoshida <kohei.yosh...@gmail.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
