From bcecf9b13b7eee0e7c60a6827a310f8b38d13f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 11 Mar 2016 10:38:46 +0000
Subject: [PATCH] tweat ExtMargins with same recurse protection as Margins

Change-Id: I24640971ea6ca89878043966293492a991f01008
---
 lotuswordpro/qa/cppunit/data/fail/recurse-1.lwp | Bin 0 -> 15975 bytes
 lotuswordpro/source/filter/lwplayout.cxx        |   5 +++--
 lotuswordpro/source/filter/lwplayout.hxx        |  16 +++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 lotuswordpro/qa/cppunit/data/fail/recurse-1.lwp

diff --git a/lotuswordpro/qa/cppunit/data/fail/recurse-1.lwp b/lotuswordpro/qa/cppunit/data/fail/recurse-1.lwp
new file mode 100644
index 0000000000000000000000000000000000000000..ffc7a44e346a1d2344f3f044df74b59eefa11deb
GIT binary patch
literal 15975
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
LU-0!GQ}h1=<C;AS

literal 0
HcmV?d00001

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.
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 0456cfad1645..991dfac5fed7 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -99,7 +99,6 @@ public:
     inline virtual sal_uInt16 GetNumCols(){return 1;}
     virtual double GetColWidth(sal_uInt16 nIndex);
     virtual double GetColGap(sal_uInt16 nIndex);
-    virtual double GetExtMarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;}
     virtual bool IsAutoGrow(){ return false;}
     virtual bool IsAutoGrowUp(){ return false;}
     virtual bool IsAutoGrowDown(){ return false;}
@@ -154,6 +153,15 @@ public:
         m_bGettingMarginsValue = false;
         return fRet;
     }
+    double GetExtMarginsValue(const sal_uInt8& nWhichSide)
+    {
+        if (m_bGettingExtMarginsValue)
+            throw std::runtime_error("recursion in layout");
+        m_bGettingExtMarginsValue = true;
+        auto fRet = ExtMarginsValue(nWhichSide);
+        m_bGettingExtMarginsValue = false;
+        return fRet;
+    }
     OUString GetStyleName(){ return m_StyleName;}
     bool IsComplex();
     virtual bool IsAnchorPage(){ return false;}
@@ -207,6 +215,7 @@ protected:
     virtual bool HonorProtection();
     virtual bool IsProtected();
     virtual double MarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;}
+    virtual double ExtMarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;}
     virtual bool MarginsSameAsParent();
 protected:
     bool m_bGettingHonorProtection;
@@ -214,6 +223,7 @@ protected:
     bool m_bGettingHasProtection;
     bool m_bGettingIsProtected;
     bool m_bGettingMarginsValue;
+    bool m_bGettingExtMarginsValue;
     sal_uInt32 m_nAttributes;
     sal_uInt32 m_nAttributes2;
     sal_uInt32 m_nAttributes3;
@@ -323,8 +333,6 @@ class LwpMiddleLayout : public LwpVirtualLayout
 public:
     LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm );
     virtual ~LwpMiddleLayout();
-    virtual double MarginsValue(const sal_uInt8& nWhichSide) override;
-    virtual double GetExtMarginsValue(const sal_uInt8& nWhichSide) override;
     LwpLayoutGeometry* GetGeometry()
     {
         if (m_bGettingGeometry)
@@ -379,6 +387,8 @@ public:
 protected:
     void Read() override;
     virtual bool MarginsSameAsParent() override;
+    virtual double MarginsValue(const sal_uInt8& nWhichSide) override;
+    virtual double ExtMarginsValue(const sal_uInt8& nWhichSide) override;
 private:
     LwpObjectID m_BasedOnStyle;
     LwpLayoutGeometry* Geometry();