diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-10-28 14:15:01 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-10-28 14:47:18 +0100 |
| commit | 9092f96c63c05833ee5319935da1078afe216b55 (patch) | |
| tree | 80804bd9af99f41c2d39760dd79e38f494fafd9c /sw | |
| parent | ade0e181ac5c58186a71969fc5e81ad570d33fb3 (diff) | |
tdf#94871: sw: fix a frame formatting regression that affects help
The early return must also be taken if the anchor is neither AT_CHAR nor
AT_PARA.
(regression from a219bbb62f974020fac0799143fbc51c385bb460)
Change-Id: I4eccb1f80401ba620ef87342f40c1a896918f3d3
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/itratr.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 71425ae5c068..1af40f97db4a 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -434,15 +434,17 @@ static void lcl_MinMaxNode( SwFrameFormat* pNd, SwMinMaxNodeArgs* pIn ) { const SwFormatAnchor& rFormatA = pNd->GetAnchor(); - if ((FLY_AT_PARA == rFormatA.GetAnchorId()) || - (FLY_AT_CHAR == rFormatA.GetAnchorId())) + if ((FLY_AT_PARA != rFormatA.GetAnchorId()) && + (FLY_AT_CHAR != rFormatA.GetAnchorId())) { - const SwPosition *pPos = rFormatA.GetContentAnchor(); - OSL_ENSURE(pPos && pIn, "Unexpected NULL arguments"); - if (!pPos || !pIn || pIn->nIndx != pPos->nNode.GetIndex()) - return; + return; } + const SwPosition *pPos = rFormatA.GetContentAnchor(); + OSL_ENSURE(pPos && pIn, "Unexpected NULL arguments"); + if (!pPos || !pIn || pIn->nIndx != pPos->nNode.GetIndex()) + return; + long nMin, nMax; SwHTMLTableLayout *pLayout = 0; const bool bIsDrawFrameFormat = pNd->Which()==RES_DRAWFRMFMT; |