diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-05-06 20:43:43 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-05-06 22:18:01 +0200 |
| commit | 83c0018dba00ae0c0cf5b179cfc7a47ce08ff2b7 (patch) | |
| tree | 046a66a947bbe123019d093589e75b9dac3a33cc /sw/inc/viewsh.hxx | |
| parent | 65d7eced14c7b2f23deafe8326af1311fa14a3cc (diff) | |
SwViewShell: fix brain-damaged non-virtual CalcLayout() override
The ooxml_export test crashes on Mac, because
SwModelTestBase::calcLayout() calls ViewShell::CalcLayout() and that
does not do StartAction(), and inside the layout indirectly a
StartAction()/EndAction() is then called, which of course trashes
the still-under-construction layout.
Strangely no crash on Linux, the layout is completely finished before
the SwModelTestBase::calcLayout() is called,
maybe because of the headless vclplug.
Change-Id: I767b1e41597ce752eb8c61dc106390f2abb90257
Diffstat (limited to 'sw/inc/viewsh.hxx')
| -rw-r--r-- | sw/inc/viewsh.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index de76f7ea5b8e..341346f3c739 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -282,7 +282,7 @@ public: Size GetDocSize() const; // Get document size. - void CalcLayout(); // Force complete formatting of layout. + virtual void CalcLayout(); // Force complete formatting of layout. sal_uInt16 GetPageCount() const; |