diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-03-11 10:38:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-11 10:39:24 +0000 |
| commit | bcecf9b13b7eee0e7c60a6827a310f8b38d13f69 (patch) | |
| tree | 837b7a6d7ff1fec0cdff056524c2c831f2d6af07 /lotuswordpro/source/filter/lwplayout.cxx | |
| parent | 6aa5bdc371d0feab085e46b5dc58b1c56369cef1 (diff) | |
tweat ExtMargins with same recurse protection as Margins
Change-Id: I24640971ea6ca89878043966293492a991f01008
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 17eb43d4907f..e5c8c1d3d851 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -78,6 +78,7 @@ LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) , m_bGettingHasProtection(false) , m_bGettingIsProtected(false) , m_bGettingMarginsValue(false) + , m_bGettingExtMarginsValue(false) , m_nAttributes(0) , m_nAttributes2(0) , m_nAttributes3(0) @@ -750,7 +751,7 @@ double LwpMiddleLayout::MarginsValue(const sal_uInt8 &nWhichSide) * @param: * @return: */ -double LwpMiddleLayout::GetExtMarginsValue(const sal_uInt8 &nWhichSide) +double LwpMiddleLayout::ExtMarginsValue(const sal_uInt8 &nWhichSide) { double fValue = 0; if(m_nOverrideFlag & OVER_MARGINS) @@ -768,7 +769,7 @@ double LwpMiddleLayout::GetExtMarginsValue(const sal_uInt8 &nWhichSide) fValue = pStyle->GetExtMarginsValue(nWhichSide); return fValue; } - return LwpVirtualLayout::GetExtMarginsValue(nWhichSide); + return LwpVirtualLayout::ExtMarginsValue(nWhichSide); } /** * @descr: Get the LwpBorderStuff object according to m_LayBorderStuff id. |