From kde-commits Sat Apr 30 21:06:22 2011 From: Casper Boemann Date: Sat, 30 Apr 2011 21:06:22 +0000 To: kde-commits Subject: =?utf-8?q?=5Bcalligra/textlayout-anchors-boemann=5D_libs/textlay?= Message-Id: <20110430210622.D867EA60B9 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=130419762723975 Git commit 625013e8b4550151853e5d757d46b4ed1e713443 by Casper Boemann. Committed on 29/04/2011 at 23:24. Pushed by boemann into branch 'textlayout-anchors-boemann'. Remove testing assert and add a comment M +1 -1 libs/textlayout/KoTextDocumentLayout.cpp http://commits.kde.org/calligra/625013e8b4550151853e5d757d46b4ed1e713443 diff --git a/libs/textlayout/KoTextDocumentLayout.cpp b/libs/textlayout/KoTextDocumentLayout.cpp index 9f26bb7..d8425fb 100644 --- a/libs/textlayout/KoTextDocumentLayout.cpp +++ b/libs/textlayout/KoTextDocumentLayout.cpp @@ -290,12 +290,12 @@ void KoTextDocumentLayout::positionAnchoredShapes() */ } +// This method is called by qt every time QTextLine.setWidth()/setNumColums() is called void KoTextDocumentLayout::positionInlineObject(QTextInlineObject item, int position, const QTextFormat &format) { qDebug() << "positionInlineObject called"; //We are called before layout so that we can position objects Q_ASSERT(format.isCharFormat()); - Q_ASSERT(false); if (d->inlineTextObjectManager == 0) return; QTextCharFormat cf = format.toCharFormat();