From koffice-devel Thu Jul 22 11:35:06 2010 From: Thomas Zander Date: Thu, 22 Jul 2010 11:35:06 +0000 To: koffice-devel Subject: Re: koffice/kword/part/frames Message-Id: <201007221335.06828.zander () kde ! org> X-MARC-Message: https://marc.info/?l=koffice-devel&m=127979857502030 Is there a reason you stopped using reviewboard for commits that I think there was a clear understanding we need reviewboard for ? On Wednesday 21. July 2010 17.23.24 Casper Boemann wrote: > SVN commit 1152612 by boemann: > > Make layout of text not fail in certain situations in tables. The symptom > was that every line of the text was laid out on individual lines. > > This removes the rightIndent in the fitting process. > > Try without this patch and see how it was even trying to do the wrong > thing: Write some text and set some right indent, then add a anchored > shape and you will see how it worked wrongly > > > > M +0 -4 KWTextDocumentLayout.cpp > > > --- trunk/koffice/kword/part/frames/KWTextDocumentLayout.cpp > #1152611:1152612 @@ -268,7 +268,6 @@ > void tryFit() { > const qreal leftIndent = m_state->x(); > const qreal width = m_state->width(); > - const qreal rightIndent = m_state->shape->size().width() - > width - leftIndent; QRectF rect(leftIndent, m_state->y(), width, 1.); > line.setLineWidth(rect.width()); > if (rect.width() <= 0. || line.textLength() == 0) { > @@ -294,9 +293,6 @@ > x += leftIndent; > effectiveLineWidth -= leftIndent; > } > - if (leftIndent + width > rect.right()) // limit > moved the right edge, keep the indent. - > effectiveLineWidth = rect.width() - rightIndent; - > line.setLineWidth(effectiveLineWidth); > line.setPosition(QPointF(x, rect.y())); > } -- Thomas Zander _______________________________________________ koffice-devel mailing list koffice-devel@kde.org https://mail.kde.org/mailman/listinfo/koffice-devel