<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://git.reviewboard.kde.org/r/102890/">http://git.reviewboard.kde.org/r/102890/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On October 16th, 2011, 4:56 p.m., <b>Thorsten Zachmann</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Looking at the patch it does not support loading of the user defined variables for kopageapp. Also I think support for tables should be added.
I think loading/saving should be done as the saving is done in kopageapp as it is not realy text content and therefore it does not belong into the text loading. It works for words as the main text is loaded with the same mechanism.</pre>
</blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Sorry but the above is not very clear. What I meant is that the loading of the text:user-field-decls should not be done in KoTextLoader as that does only work for words. A more common place would be good to do that. How about loading it in KoTextSharedLoadingData?
</pre>
<br />
<p>- Thorsten</p>
<br />
<p>On October 16th, 2011, 9:47 a.m., Sebastian Sauer wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/media/rb/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 Calligra.</div>
<div>By Sebastian Sauer.</div>
<p style="color: grey;"><i>Updated Oct. 16, 2011, 9:47 a.m.</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;">Following patch implements user defined variables. This solves bug https://bugs.kde.org/show_bug.cgi?id=282972
What I did;
* extended the KoVariableManager to handle now also such user defined variables.
* the KoVariableManager now has loadOdf and saveOdf methods to load and save user defined variables declarations.
* the user defined variables are implemented using the new plugins/variables/User* classes.
* KoVariable::manager() can now be used even on KoVariable::createOptionsWidget
* replaced the previous unused KoInlineObject::User with KoInlineObject::UserGet and KoInlineObject::UserInput and make use of them
* extended KoTextLoader.cpp to proper load user defined variables into the KoVariableManager. Instances are created using the new UserVariable plugin.
* extended KoOdfNumberStyles with the formatFraction method. Ideally I would also move the other format (e.g. formatDate, formatTime, etc.) methods from the plugin to the KoOdfNumberStyles class to have it reusable (we at least need formatDate and KoOdfNumberStyles also in the DateVariable later).
* added the KoOdfNumberStyles::saveOdfBooleanStyle to also save boolean formattings proper back.
* introduced the KoOdfNumberStyles::saveOdfNumberStyle method to handle choosing the proper KoOdfNumberStyles::saveOdf*Style methods.
* extended KWOdfWriter.cpp to proper save the user defined variable declarations back to the ODT.
Remaining problems;
* atm libs/kopageapp/KoPADocument.cpp contains in the patch code to variableManager->saveOdf(bodyWriter); but that is probably not the correct place to do that. In any case this needs more testing with Stage to look if it works as expected. Stage is mostly untested yet but only Words got tested.
* also I ask myself what other applications beside Stage and Words are able to deal with user-defined variables. Logically it would be any application where we are able to add a textshape too but I am not sure there. This needs more investigation and testing as well.
* the UI still misses a way to set/modify custom formatings.
* support for formulas... but this is another beast and partly already covered at bug 283816. I do not plan to work on this anytime soon.
I plan to address the remaining problems before merging but are already asking for a review to get that patch in asap to a) prevent merge probs in the near future (it's rather large already) and b) get the working solution for bug 282972 into master asap.
</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;">see the documents attached to bug 282972</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="http://bugs.kde.org/show_bug.cgi?id=282972">282972</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>libs/kopageapp/KoPADocument.cpp <span style="color: grey">(43e002a)</span></li>
<li>libs/kotext/InsertVariableAction.cpp <span style="color: grey">(de68bbf)</span></li>
<li>libs/kotext/KoInlineObject.h <span style="color: grey">(fbd1795)</span></li>
<li>libs/kotext/KoVariableManager.h <span style="color: grey">(680a29b)</span></li>
<li>libs/kotext/KoVariableManager.cpp <span style="color: grey">(a915b77)</span></li>
<li>libs/kotext/opendocument/KoTextLoader.cpp <span style="color: grey">(af29fb7)</span></li>
<li>libs/kotext/tests/TestKoInlineTextObjectManager.cpp <span style="color: grey">(70e18ef)</span></li>
<li>libs/odf/KoOdfNumberStyles.h <span style="color: grey">(536408d)</span></li>
<li>libs/odf/KoOdfNumberStyles.cpp <span style="color: grey">(5611465)</span></li>
<li>plugins/variables/CMakeLists.txt <span style="color: grey">(cca8198)</span></li>
<li>plugins/variables/UserVariable.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>plugins/variables/UserVariable.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>plugins/variables/UserVariableFactory.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>plugins/variables/UserVariableFactory.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>plugins/variables/VariablesPlugin.cpp <span style="color: grey">(913aebc)</span></li>
<li>words/part/KWAboutData.h <span style="color: grey">(1cdc87e)</span></li>
<li>words/part/KWOdfLoader.cpp <span style="color: grey">(f292ea6)</span></li>
<li>words/part/KWOdfWriter.cpp <span style="color: grey">(3c1c019)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/102890/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>