summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Nebel <nn@openoffice.org>2011-03-02 10:22:36 +0100
committerNiklas Nebel <nn@openoffice.org>2011-03-02 10:22:36 +0100
commit02519a1f0e873dd8774d2efecdecb7b94f2c69ba (patch)
treec0a60bd3876afab6f548d96f81ce4ae9cf131763
parent20dc7550d91515a71646dd3865934c20db8a8b6d (diff)
calc66: #i114839# make sure the output factor is valid for UpdateAllRowHeights after loading
-rw-r--r--sc/inc/docuno.hxx2
-rw-r--r--sc/source/filter/xml/xmlsubti.cxx3
-rw-r--r--sc/source/ui/unoobj/docuno.cxx6
3 files changed, 8 insertions, 3 deletions
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index e152b4a88f97..f213806762d8 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -129,7 +129,7 @@ public:
ScDocument* GetDocument() const;
SfxObjectShell* GetEmbeddedObject() const;
- void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL );
+ void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL, bool bCalcOutputFactor = false );
void BeforeXMLLoading();
void AfterXMLLoading(sal_Bool bRet);
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index e6cc7b853764..3e182c919032 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -614,7 +614,8 @@ void ScMyTables::UpdateRowHeights()
if (aUpdateSheets.GetSelectCount())
{
pDoc->LockStreamValid( true ); // ignore draw page size (but not formula results)
- ScModelObj::getImplementation(rImport.GetModel())->UpdateAllRowHeights(&aUpdateSheets);
+ // #i114839# make sure the output factor is valid for UpdateAllRowHeights
+ ScModelObj::getImplementation(rImport.GetModel())->UpdateAllRowHeights(&aUpdateSheets, true);
pDoc->LockStreamValid( false );
}
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 23eb1abd2d82..5f9ca7b7f5bc 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -411,10 +411,14 @@ SfxObjectShell* ScModelObj::GetEmbeddedObject() const
return pDocShell;
}
-void ScModelObj::UpdateAllRowHeights(const ScMarkData* pTabMark)
+void ScModelObj::UpdateAllRowHeights(const ScMarkData* pTabMark, bool bCalcOutputFactor)
{
if (pDocShell)
+ {
+ if (bCalcOutputFactor)
+ pDocShell->CalcOutputFactor();
pDocShell->UpdateAllRowHeights(pTabMark);
+ }
}
void ScModelObj::BeforeXMLLoading()