<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/102488/">http://git.reviewboard.kde.org/r/102488/</a>
</td>
</tr>
</table>
<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="http://git.reviewboard.kde.org/r/102488/diff/1/?file=33256#file33256line165" style="color: black; font-weight: bold; text-decoration: underline;">plugins/chartshape/ChartShape.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; ">static const ChartSubtype defaultSubtypes[ NUM_CHARTTYPES ] = {</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">155</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">KoGenStyle</span><span class="o">::</span><span class="n">PropertyType</span> <span class="n">tt</span> <span class="o">=</span> <span class="n">KoGenStyle</span><span class="o">::</span><span class="n">TextType</span><span class="p">;</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">165</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">KoGenStyle</span> <span class="n">autoStyle</span><span class="p">(</span><span class="n">KoGenStyle</span><span class="o">::</span><span class="n">ParagraphAutoStyle</span><span class="p">,</span> <span class="s">"chart"</span><span class="p">,</span> <span class="mi">0</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;">Is that correct? I mean that we still use KoGenStyle::ParagraphAutoStyle here?</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="http://git.reviewboard.kde.org/r/102488/diff/1/?file=33256#file33256line199" style="color: black; font-weight: bold; text-decoration: underline;">plugins/chartshape/ChartShape.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; ">void saveOdfLabel( KoShape *label, KoXmlWriter &bodyWriter,</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#ebb1ba" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">188</font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">bodyWriter</span><span class="p">.</span><span class="n">addAttributePt</span><span class="p">(</span> <span class="s">"svg:width"</span><span class="p">,</span> <span class="n">label</span><span class="o">-></span><span class="n">size</span><span class="p">().</span><span class="n">width</span><span class="p">()</span> <span class="p">);</span></pre></td>
<th bgcolor="#ebb1ba" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></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;">commit 6698ad09 which added those both lines did add saving for width+height of the title and the label.
I guess the reason was that we need that to proper center-align? To bad Johannes didn't wrote why we need it :-/
Are you sure removing that lines is correct and if yes, why only here and not at Axis.cpp:1491 at those
bodyWriter.addAttributePt( "svg:width", d->title->size().width() );
too? I think that cries for us better not removing that lines but commenting them out and adding a comment why we did so. That way we at least leave a hint for the next one who tries to deal with that code (and who may readd those lines if he doesn't know that they got removed to fix this case).
</pre>
</div>
<br />
<p>- Sebastian</p>
<br />
<p>On August 30th, 2011, 7 a.m., Thorsten Zachmann 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 Thorsten Zachmann.</div>
<p style="color: grey;"><i>Updated Aug. 30, 2011, 7 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;">Fix odf loading/saving of chart related attributes/elements.
When checking for errors in the odf of the embedded chart in http://www.zagge.de/files/ho.odp
I got the following errors.
Object 1/content.xml:5:247: error: attribute "fill" from namespace "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" not allowed at this point; ignored
Object 1/content.xml:5:247: error: attribute "stroke" from namespace "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" not allowed at this point; ignored
Object 1/content.xml:5:247: error: attribute "clip" from namespace "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:5:247: error: attribute "wrap" from namespace "urn:oasis:names:tc:opendocument:xmlns:style:1.0" not allowed at this point; ignored
Object 1/content.xml:5:247: error: attribute "wrap-dynamic-threshold" from namespace "urn:oasis:names:tc:opendocument:xmlns:style:1.0" not allowed at this point; ignored
Object 1/content.xml:9:60: error: attribute "display-label" from namespace "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" not allowed at this point; ignored
Object 1/content.xml:22:84: error: element "chart-properties" from namespace "urn:oasis:names:tc:opendocument:xmlns:style:1.0" not allowed in this context
Object 1/content.xml:22:84: error: attribute "family" from namespace "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" not allowed at this point; ignored
Object 1/content.xml:26:84: error: element "chart-properties" from namespace "urn:oasis:names:tc:opendocument:xmlns:style:1.0" not allowed in this context
Object 1/content.xml:26:84: error: attribute "family" from namespace "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" not allowed at this point; ignored
Object 1/content.xml:30:84: error: element "chart-properties" from namespace "urn:oasis:names:tc:opendocument:xmlns:style:1.0" not allowed in this context
Object 1/content.xml:30:84: error: attribute "family" from namespace "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" not allowed at this point; ignored
Object 1/content.xml:34:84: error: element "chart-properties" from namespace "urn:oasis:names:tc:opendocument:xmlns:style:1.0" not allowed in this context
Object 1/content.xml:34:84: error: attribute "family" from namespace "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" not allowed at this point; ignored
Object 1/content.xml:38:84: error: element "chart-properties" from namespace "urn:oasis:names:tc:opendocument:xmlns:style:1.0" not allowed in this context
Object 1/content.xml:38:84: error: attribute "family" from namespace "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" not allowed at this point; ignored
Object 1/content.xml:42:84: error: element "chart-properties" from namespace "urn:oasis:names:tc:opendocument:xmlns:style:1.0" not allowed in this context
Object 1/content.xml:42:84: error: attribute "family" from namespace "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "fill" from namespace "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "fill-color" from namespace "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "opacity" from namespace "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "stroke" from namespace "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "stroke-linejoin" from namespace "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "clip" from namespace "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "margin" from namespace "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "wrap" from namespace "urn:oasis:names:tc:opendocument:xmlns:style:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "wrap-dynamic-threshold" from namespace "urn:oasis:names:tc:opendocument:xmlns:style:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "stroke-color" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "stroke-linecap" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "stroke-opacity" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:48:460: error: attribute "stroke-width" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:53:176: error: attribute "x" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:53:176: error: attribute "y" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:54:197: error: attribute "id" from namespace "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" not allowed at this point; ignored
Object 1/content.xml:54:197: error: attribute "layer" from namespace "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" not allowed at this point; ignored
Object 1/content.xml:54:197: error: attribute "legend-expansion" from namespace "urn:oasis:names:tc:opendocument:xmlns:office:1.0" not allowed at this point; ignored
Object 1/content.xml:57:131: error: attribute "width" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:57:131: error: attribute "height" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:58:82: error: element "categories" from namespace "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" not allowed in this context
Object 1/content.xml:63:131: error: attribute "width" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:63:131: error: attribute "height" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:64:82: error: element "categories" from namespace "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" not allowed in this context
This patch fixes all but
Object 1/content.xml:58:131: error: attribute "width" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:58:131: error: attribute "height" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:64:131: error: attribute "width" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
Object 1/content.xml:64:131: error: attribute "height" from namespace "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" not allowed at this point; ignored
I did not fix those as we also read those back when loading the title of an axis.
I paste the fixes here as I also changed the way styles are saved to make it possible to save the styles in the correct properites of the style.</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;">Run the tests after saving the files and it looks much better.</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>libs/flake/KoShape.cpp <span style="color: grey">(4e01de1)</span></li>
<li>libs/flake/KoShapeShadow.cpp <span style="color: grey">(3958db4)</span></li>
<li>libs/odf/KoGenStyle.h <span style="color: grey">(e48fb2e)</span></li>
<li>libs/odf/KoOdfGraphicStyles.cpp <span style="color: grey">(54ded90)</span></li>
<li>plugins/chartshape/Axis.cpp <span style="color: grey">(cbc7ded)</span></li>
<li>plugins/chartshape/ChartShape.h <span style="color: grey">(c28f8dd)</span></li>
<li>plugins/chartshape/ChartShape.cpp <span style="color: grey">(42f11ee)</span></li>
<li>plugins/chartshape/DataSet.cpp <span style="color: grey">(2a3e272)</span></li>
<li>plugins/chartshape/Legend.cpp <span style="color: grey">(282901f)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/102488/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>