[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice-devel
Subject: Re: Review Request: Add loading/saving support for user-defined
From: "Thomas Zander" <zander () kde ! org>
Date: 2010-08-23 21:52:58
Message-ID: 20100823215258.24768.35296 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://reviewboard.kde.org/r/5092/#review7182
-----------------------------------------------------------
Cool stuff, thanks for getting variables up and running :)
I like the approach and the new code looks good. I did notice some minor is=
sues that if we fix them it would be even better.
One thing I did notice is that after applying this the unit test kotext-odf=
-TestChangeLoading stopped passing with;
QFATAL : TestChangeLoading::testSimpleDeleteSaving() Received signal 11
I guess a quick gdb will give you the reason :)
trunk/koffice/libs/kotext/KoTextShapeData.cpp
<http://reviewboard.kde.org/r/5092/#comment7327>
Can we check if there are actual "user-field-decls" to save? If there a=
re not it would be nice to avoid starting the element at all.
trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp
<http://reviewboard.kde.org/r/5092/#comment7329>
Resolving the varManager etc could likely be done outside of the for lo=
op, which would be faster.
=
Also please remove the debug lines below.
trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp
<http://reviewboard.kde.org/r/5092/#comment7328>
Various lines in this block of added code are preceded with tabs; could=
you please convert them to spaces for consistency?
- Thomas
On 2010-08-23 14:05:24, Robert Marmorstein wrote:
> =
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://reviewboard.kde.org/r/5092/
> -----------------------------------------------------------
> =
> (Updated 2010-08-23 14:05:24)
> =
> =
> Review request for KOffice and Thomas Zander.
> =
> =
> Summary
> -------
> =
> While koffice supports loading and saving of DateVariable and other Varia=
bles defined by plugins, support for user-defined variables (in KoNamedVari=
able) was missing. This patch adds support for user-defined variables usin=
g the "user-field-decls" tag from the ODF spec, sections 6.3.5-6.3.7. Beca=
use KoNamedVariables are not created by a factory class, the code for loadi=
ng had to be directly embedded into the KoTextLoader, so there is an empty =
"loadOdf" function in KoNamedVariable.cpp (it can't go away entirely, becau=
se inheriting classes need it).
> =
> Variables defined as plugins are not affected by these changes, but it lo=
oks to me like they are not correctly implemented -- they should save to th=
e ODF file as "simple variables", not simply as embedded text. =
> =
> Note: This patch doesn't add any UI functionality for manipulating variab=
les. It is still needed to have a way for the user to directly add, delete=
, and edit variables. =
> =
> =
> Diffs
> -----
> =
> trunk/koffice/libs/kotext/KoNamedVariable.cpp 1167069 =
> trunk/koffice/libs/kotext/KoTextShapeData.cpp 1167069 =
> trunk/koffice/libs/kotext/opendocument/KoTextLoader.h 1167069 =
> trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp 1167069 =
> =
> Diff: http://reviewboard.kde.org/r/5092/diff
> =
> =
> Testing
> -------
> =
> Created a document, embedded some user-defined variables in it (by way of=
the publish-to docker), saved it. Closed out and opened it first in OpenO=
ffice (which works fine) and then in kword again (which also works fine). =
Variables are saved and displayed just fine.
> =
> =
> Thanks,
> =
> Robert
> =
>
[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://reviewboard.kde.org/r/5092/">http://reviewboard.kde.org/r/5092/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Cool stuff, thanks for \
getting variables up and running :) I like the approach and the new code looks good. \
I did notice some minor issues that if we fix them it would be even better.
One thing I did notice is that after applying this the unit test \
kotext-odf-TestChangeLoading stopped passing with; QFATAL : \
TestChangeLoading::testSimpleDeleteSaving() Received signal 11 I guess a quick gdb \
will give you the reason :)</pre> <br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="/r/5092/diff/1/?file=34385#file34385line233" style="color: black; font-weight: \
bold; text-decoration: underline;">trunk/koffice/libs/kotext/KoTextShapeData.cpp</a> \
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">bool \
KoTextShapeData::loadOdf(const KoXmlElement &element, KoShapeLoadingContext \
&context, KoDocumentRdfBase *rdfData, KoShape *shape)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">233</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">context</span><span class="p">.</span><span class="n">xmlWriter</span><span \
class="p">().</span><span class="n">startElement</span><span class="p">(</span><span \
class="s">"text:user-field-decls"</span><span \
class="p">);</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Can we \
check if there are actual "user-field-decls" to save? If there are not it \
would be nice to avoid starting the element at all.</pre> </div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="/r/5092/diff/1/?file=34387#file34387line1388" style="color: black; font-weight: \
bold; text-decoration: \
underline;">trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp</a> <span \
style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
"></pre></td> <td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: \
0; ">void KoTextLoader::loadVariableDeclarations(const KoXmlElement &element, \
QTextCursor &cursor)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1388</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">KoTextDocumentLayout</span> <span class="o">*</span><span \
class="n">layout</span> <span class="o">=</span> <span \
class="n">qobject_cast</span><span class="o"><</span><span \
class="n">KoTextDocumentLayout</span><span class="o">*></span><span \
class="p">(</span><span class="n">cursor</span><span class="p">.</span><span \
class="n">block</span><span class="p">().</span><span class="n">document</span><span \
class="p">()</span><span class="o">-></span><span \
class="n">documentLayout</span><span class="p">());</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Resolving \
the varManager etc could likely be done outside of the for loop, which would be \
faster.
Also please remove the debug lines below.</pre>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="/r/5092/diff/1/?file=34387#file34387line1394" style="color: black; font-weight: \
bold; text-decoration: \
underline;">trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp</a> <span \
style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
"></pre></td> <td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: \
0; ">void KoTextLoader::loadVariableDeclarations(const KoXmlElement &element, \
QTextCursor &cursor)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1394</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">QString</span> <span class="n">name</span> <span class="o">=</span> <span \
class="n">e</span><span class="p">.</span><span class="n">attributeNS</span><span \
class="p">(</span><span class="n">KoXmlNS</span><span class="o">::</span><span \
class="n">text</span><span class="p">,</span> <span \
class="s">"name"</span><span class="p">);</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Various \
lines in this block of added code are preceded with tabs; could you please convert \
them to spaces for consistency?</pre> </div>
<br />
<p>- Thomas</p>
<br />
<p>On August 23rd, 2010, 2:05 p.m., Robert Marmorstein wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://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 and Thomas Zander.</div>
<div>By Robert Marmorstein.</div>
<p style="color: grey;"><i>Updated 2010-08-23 14:05:24</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;">While koffice supports loading and saving of DateVariable and other \
Variables defined by plugins, support for user-defined variables (in KoNamedVariable) \
was missing. This patch adds support for user-defined variables using the \
"user-field-decls" tag from the ODF spec, sections 6.3.5-6.3.7. Because \
KoNamedVariables are not created by a factory class, the code for loading had to be \
directly embedded into the KoTextLoader, so there is an empty "loadOdf" \
function in KoNamedVariable.cpp (it can't go away entirely, because inheriting \
classes need it).
Variables defined as plugins are not affected by these changes, but it looks to me \
like they are not correctly implemented -- they should save to the ODF file as \
"simple variables", not simply as embedded text.
Note: This patch doesn't add any UI functionality for manipulating variables. It \
is still needed to have a way for the user to directly add, delete, and edit \
variables. </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;">Created a document, embedded some user-defined variables in it (by way \
of the publish-to docker), saved it. Closed out and opened it first in OpenOffice \
(which works fine) and then in kword again (which also works fine). Variables are \
saved and displayed just fine.
</pre>
</td>
</tr>
</table>
<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/libs/kotext/KoNamedVariable.cpp <span style="color: \
grey">(1167069)</span></li>
<li>trunk/koffice/libs/kotext/KoTextShapeData.cpp <span style="color: \
grey">(1167069)</span></li>
<li>trunk/koffice/libs/kotext/opendocument/KoTextLoader.h <span style="color: \
grey">(1167069)</span></li>
<li>trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp <span style="color: \
grey">(1167069)</span></li>
</ul>
<p><a href="http://reviewboard.kde.org/r/5092/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