sw/source/core/text/itratr.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
New commits: commit e0b9abe1f9cfcf6b43ea3bfc7ae47f649c0992bb Author: Michael Stahl <[email protected]> Date: Wed Oct 28 14:15:01 2015 +0100 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) (cherry picked from commit 9092f96c63c05833ee5319935da1078afe216b55) Change-Id: I4eccb1f80401ba620ef87342f40c1a896918f3d3 Reviewed-on: https://gerrit.libreoffice.org/19687 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Miklos Vajna <[email protected]> diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 2a97c44..4ee3b7f 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -435,15 +435,17 @@ static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn ) { const SwFmtAnchor& rFmtA = pNd->GetAnchor(); - if ((FLY_AT_PARA == rFmtA.GetAnchorId()) || - (FLY_AT_CHAR == rFmtA.GetAnchorId())) + if ((FLY_AT_PARA != rFmtA.GetAnchorId()) && + (FLY_AT_CHAR != rFmtA.GetAnchorId())) { - const SwPosition *pPos = rFmtA.GetCntntAnchor(); - OSL_ENSURE(pPos && pIn, "Unexpected NULL arguments"); - if (!pPos || !pIn || pIn->nIndx != pPos->nNode.GetIndex()) - return; + return; } + const SwPosition *pPos = rFmtA.GetCntntAnchor(); + OSL_ENSURE(pPos && pIn, "Unexpected NULL arguments"); + if (!pPos || !pIn || pIn->nIndx != pPos->nNode.GetIndex()) + return; + long nMin, nMax; SwHTMLTableLayout *pLayout = 0; const bool bIsDrawFrmFmt = pNd->Which()==RES_DRAWFRMFMT; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
