diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-28 14:43:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-28 14:43:50 +0000 |
| commit | 9ec011f6874cf663db54d0420c41d9299e4ed882 (patch) | |
| tree | eed2e316c88b3aefde1e77b7338d165b286687ca /lotuswordpro/source/filter/lwplayout.cxx | |
| parent | fb905e6457ba3f793d783523cdacfe3a9e8ac48f (diff) | |
guard against infinite recursion in GetGeometry
Change-Id: I901f77f5846512cb528f2e14bbc50409fa29bef2
Diffstat (limited to 'lotuswordpro/source/filter/lwplayout.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwplayout.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 68003a7cad5e..32bc4fda0f98 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -560,9 +560,12 @@ void LwpLayoutMisc::Read(LwpObjectStream* pStrm) } LwpMiddleLayout::LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm ) - : LwpVirtualLayout(objHdr, pStrm), - m_pStyleStuff(new LwpLayoutStyle), m_pMiscStuff(new LwpLayoutMisc) -{} + : LwpVirtualLayout(objHdr, pStrm) + , m_pStyleStuff(new LwpLayoutStyle) + , m_pMiscStuff(new LwpLayoutMisc) + , m_bGettingGeometry(false) +{ +} LwpMiddleLayout::~LwpMiddleLayout() { @@ -637,7 +640,7 @@ rtl::Reference<LwpObject> LwpMiddleLayout::GetBasedOnStyle() * @descr: Get the geometry of current layout * */ -LwpLayoutGeometry* LwpMiddleLayout::GetGeometry() +LwpLayoutGeometry* LwpMiddleLayout::Geometry() { if( !m_LayGeometry.IsNull() ) { |