summaryrefslogtreecommitdiff
path: root/lotuswordpro/source/filter/lwplayout.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'lotuswordpro/source/filter/lwplayout.hxx')
-rw-r--r--lotuswordpro/source/filter/lwplayout.hxx12
1 files changed, 2 insertions, 10 deletions
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 2d0694b67864..98d7ca515906 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -347,19 +347,11 @@ class LwpMiddleLayout : public LwpVirtualLayout
public:
LwpMiddleLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm );
virtual ~LwpMiddleLayout() override;
- LwpLayoutGeometry* GetGeometry()
- {
- if (m_bGettingGeometry)
- throw std::runtime_error("recursion in layout");
- m_bGettingGeometry = true;
- auto pRet = Geometry();
- m_bGettingGeometry = false;
- return pRet;
- }
double GetGeometryHeight();
double GetGeometryWidth();
LwpBorderStuff* GetBorderStuff();
LwpBackgroundStuff* GetBackgroundStuff();
+ LwpLayoutGeometry* GetGeometry();
enumXFTextDir GetTextDirection();
XFBorders* GetXFBorders();
LwpColor* GetBackColor();
@@ -402,7 +394,6 @@ protected:
virtual bool IsAutoGrowDown() override;
private:
LwpObjectID m_BasedOnStyle;
- LwpLayoutGeometry* Geometry();
protected:
enum
{
@@ -422,6 +413,7 @@ protected:
LwpObjectID m_LayBackgroundStuff;
LwpObjectID m_LayExtBorderStuff;
bool m_bGettingGeometry;
+ bool m_bGettingBackgroundStuff;
public:
LwpObjectID& GetContent() { return m_Content; }
LwpTabOverride* GetTabOverride();