mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz#7146 Infinite recurse

Browse Source 
Change-Id: I0afc3a73933e3370c5b1aeca1beabec94c56a6e6
Reviewed-on: https://gerrit.libreoffice.org/51911
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2018-03-26 17:02:46 +01:00
parent 4869f83cc0
commit 78a43ceeca
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lotuswordpro/source/filter/lwplayout.cxx
View File

@@ -83,6 +83,7 @@ LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader const &objHdr, LwpSvStream* p
, m_bGettingMarginsValue(false) , m_bGettingMarginsValue(false)
, m_bGettingExtMarginsValue(false) , m_bGettingExtMarginsValue(false)
, m_bGettingUsePrinterSettings(false) , m_bGettingUsePrinterSettings(false)
, m_bGettingScaleCenter(false)
, m_bGettingUseWhen(false) , m_bGettingUseWhen(false)
, m_bGettingStyleLayout(false) , m_bGettingStyleLayout(false)
, m_nAttributes(0) , m_nAttributes(0)
@@ -953,16 +954,26 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile()
sal_uInt16 LwpMiddleLayout::GetScaleCenter() sal_uInt16 LwpMiddleLayout::GetScaleCenter()
{ {
if (m_bGettingScaleCenter)
throw std::runtime_error("recursion in layout");
m_bGettingScaleCenter = true;
sal_uInt16 nRet = 0;
if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && GetLayoutScale()) if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && GetLayoutScale())
{ {
return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::CENTERED) nRet = (GetLayoutScale()->GetPlacement() & LwpLayoutScale::CENTERED)
? 1 : 0; ? 1 : 0;
} }
rtl::Reference<LwpObject> xBase(GetBasedOnStyle());
if (xBase.is())
return dynamic_cast<LwpMiddleLayout&>(*xBase.get()).GetScaleCenter();
else else
return 0; {
rtl::Reference<LwpObject> xBase(GetBasedOnStyle());
if (xBase.is())
nRet = dynamic_cast<LwpMiddleLayout&>(*xBase.get()).GetScaleCenter();
}
m_bGettingScaleCenter = false;
return nRet;
} }
bool LwpMiddleLayout::CanSizeRight() bool LwpMiddleLayout::CanSizeRight()

1
lotuswordpro/source/filter/lwplayout.hxx
View File

@@ -237,6 +237,7 @@ protected:
bool m_bGettingMarginsValue; bool m_bGettingMarginsValue;
bool m_bGettingExtMarginsValue; bool m_bGettingExtMarginsValue;
bool m_bGettingUsePrinterSettings; bool m_bGettingUsePrinterSettings;
bool m_bGettingScaleCenter;
bool m_bGettingUseWhen; bool m_bGettingUseWhen;
bool m_bGettingStyleLayout; bool m_bGettingStyleLayout;
sal_uInt32 m_nAttributes; sal_uInt32 m_nAttributes;