diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-25 14:01:25 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-05-23 13:17:47 +0100 |
| commit | 1948aa5649c114aa570c215d460578a6cc6c3866 (patch) | |
| tree | 545eb4fb4bb6e132b0a96514f8bdb0256dbf0a50 /lotuswordpro/source/filter/lwplayout.cxx | |
| parent | 6b73da7bee4d3d60af6ff1ee01039f7183e57680 (diff) | |
ofz#7109 infinite regress
Change-Id: Iac0bd81c9b0e3ac6b005bb0065895ca1b4ca4233
Reviewed-on: https://gerrit.libreoffice.org/51828
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit e4308d4b3638d52ca70778565ba2541e9f3f0ff2)
(cherry picked from commit 79bb8c64b633f9397601df4e73f09d7fef066c2b)
Diffstat (limited to 'lotuswordpro/source/filter/lwplayout.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwplayout.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 75524aaf4f64..3f7aeda23cd4 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -78,6 +78,7 @@ LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) , m_bGettingMarginsSameAsParent(false) , m_bGettingHasProtection(false) , m_bGettingIsProtected(false) + , m_bGettingIsAutoGrowDown(false) , m_bGettingMarginsValue(false) , m_bGettingExtMarginsValue(false) , m_nAttributes(0) @@ -391,7 +392,7 @@ LwpVirtualLayout* LwpVirtualLayout::FindChildByType(LWP_LAYOUT_TYPE eType) */ bool LwpVirtualLayout::IsFitGraphic() { - return IsAutoGrowRight() && !IsAutoGrowLeft() && IsAutoGrowDown(); + return IsAutoGrowRight() && !IsAutoGrowLeft() && GetIsAutoGrowDown(); } /** @@ -1174,7 +1175,7 @@ bool LwpMiddleLayout::IsAutoGrowDown() rtl::Reference<LwpObject> xBase(GetBasedOnStyle()); if (LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*>(xBase.get())) { - return pLay->IsAutoGrowDown(); + return pLay->GetIsAutoGrowDown(); } } return LwpVirtualLayout::IsAutoGrowDown(); |