[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice-devel
Subject: Re: Review Request: Fix displaying image bullets
From: "Thomas Zander" <zander () kde ! org>
Date: 2010-10-12 9:09:53
Message-ID: 20101012090953.935.36745 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://svn.reviewboard.kde.org/r/5600/#review8086
-----------------------------------------------------------
Ship it!
Thanks,
also please close the associated bug when you commit to trunk :) see 222209
- Thomas
On 2010-10-12 08:52:22, Thorsten Zachmann wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://svn.reviewboard.kde.org/r/5600/
> -----------------------------------------------------------
>
> (Updated 2010-10-12 08:52:22)
>
>
> Review request for KOffice.
>
>
> Summary
> -------
>
> Fix displaying image bullets.
>
> The problem is the following:
>
> In
>
> void Layout::drawListItem(QPainter *painter, const QTextBlock &block, \
> KoImageCollection *imageCollection) { \
> KoTextBlockData *data = dynamic_cast<KoTextBlockData*>(block.userData()); \
> if (data == 0) \
> return; \
>
> QTextList *list = block.textList(); \
> if (list && data->hasCounterData()) { \
>
> data->hasCounterData() returns false this is as:
>
> bool KoTextBlockData::hasCounterData() const \
> { \
> return d->counterWidth >= 0 && !d->counterText.isNull(); \
> } \
>
> counterText.isNull() is true.
>
> The reason for that is that the setTextCounter of isNull + isNull + isNull is an \
> string that is also isNull. However the counterText needs to be not null as \
> otherwise it code in Layout::drawListItem the code to draw the counter is not \
> reached.
>
> This addresses bug 239773.
> https://bugs.kde.org/show_bug.cgi?id=239773
>
>
> Diffs
> -----
>
> trunk/koffice/plugins/textshape/ListItemsHelper.cpp 1184994
> trunk/koffice/plugins/textshape/Layout.cpp 1184994
> trunk/koffice/libs/kotext/KoTextBlockData.cpp 1184994
> trunk/koffice/libs/kotext/KoTextBlockData.h 1184994
>
> Diff: http://svn.reviewboard.kde.org/r/5600/diff
>
>
> Testing
> -------
>
> With the patch the file in the bug report shows the picture bullets correctly.
>
>
> Thanks,
>
> Thorsten
>
>
[Attachment #5 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://svn.reviewboard.kde.org/r/5600/">http://svn.reviewboard.kde.org/r/5600/</a>
</td>
</tr>
</table>
<br />
<p>Ship it!</p>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Thanks,
also please close the associated bug when you commit to trunk :) see 222209</pre>
<br />
<p>- Thomas</p>
<br />
<p>On October 12th, 2010, 8:52 a.m., Thorsten Zachmann wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://svn.reviewboard.kde.orgrb/images/review_request_box_top_bg.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for KOffice.</div>
<div>By Thorsten Zachmann.</div>
<p style="color: grey;"><i>Updated 2010-10-12 08:52:22</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Fix displaying image bullets.
The problem is the following:
In
void Layout::drawListItem(QPainter *painter, const QTextBlock &block, \
KoImageCollection *imageCollection) { \
KoTextBlockData *data = dynamic_cast<KoTextBlockData*>(block.userData()); \
if (data == 0) \
return; \
\
QTextList *list = block.textList(); \
if (list && data->hasCounterData()) { \
data->hasCounterData() returns false this is as:
bool KoTextBlockData::hasCounterData() const \
{ \
return d->counterWidth >= 0 && !d->counterText.isNull(); \
} \
counterText.isNull() is true.
The reason for that is that the setTextCounter of isNull + isNull + isNull is an \
string that is also isNull. However the counterText needs to be not null as \
otherwise it code in Layout::drawListItem the code to draw the counter is not \
reached. </pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">With the patch the file in the bug report shows the picture bullets \
correctly.</pre> </td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="https://bugs.kde.org/show_bug.cgi?id=239773">239773</a>
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>trunk/koffice/plugins/textshape/ListItemsHelper.cpp <span style="color: \
grey">(1184994)</span></li>
<li>trunk/koffice/plugins/textshape/Layout.cpp <span style="color: \
grey">(1184994)</span></li>
<li>trunk/koffice/libs/kotext/KoTextBlockData.cpp <span style="color: \
grey">(1184994)</span></li>
<li>trunk/koffice/libs/kotext/KoTextBlockData.h <span style="color: \
grey">(1184994)</span></li>
</ul>
<p><a href="http://svn.reviewboard.kde.org/r/5600/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic