diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-10-28 14:15:01 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-30 11:19:49 +0000 |
| commit | ae846d08b1a18d4cd8f7d59774b3f6686e383280 (patch) | |
| tree | 24202c498469b49fa0b071e0ae11d15c84f24dee /sw | |
| parent | 813b11a96e4c1243c4d3533eee148c49d8926ecc (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
(cherry picked from commit 9092f96c63c05833ee5319935da1078afe216b55)
Reviewed-on: https://gerrit.libreoffice.org/19649
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
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 3201e7f92f92..28f8febee681 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; |