Kaydet (Commit) 455d0765 authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Andras Timar

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 a219bbb6)

Change-Id: I4eccb1f80401ba620ef87342f40c1a896918f3d3
(cherry picked from commit 9092f96c)
Reviewed-on: https://gerrit.libreoffice.org/19649Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit ae846d08)
üst d87f6f5d
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment