[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Aug 24 03:10:57 PDT 2012
sc/source/filter/xml/xmlimprt.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit e093e553185ed8beff83ef784f0ed5de95c2bc8f
Author: Noel Power <noel.power at suse.com>
Date: Fri Aug 24 11:10:33 2012 +0100
Revert "fix for fdo#49255"
This reverts commit 9efd8deb867c89baf0f5df410b87e8310fff524b.
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index d0234b2..bf7c18b 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2811,7 +2811,6 @@ 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
@@ -3106,6 +3105,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE
pDoc->SetStreamValid( nTab, true );
}
+ aTables.UpdateRowHeights();
aTables.FixupOLEs();
}
if (GetModel().is())
@@ -3120,7 +3120,6 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE
{
ScModelObj::getImplementation(GetModel())->AfterXMLLoading(true);
}
- pDoc->EnableAdjustHeight( true );
}
// XEventListener
More information about the Libreoffice-commits
mailing list