<table><tr><td style="">davidllewellynjones accepted this revision.<br />davidllewellynjones added a comment.<br />This revision is now accepted and ready to land.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D24943">View Revision</a></tr></table><br /><div><div><p>I've made some suggestions and have a couple of queries, but they're all very minor.</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D24943#inline-141099">View Inline</a><span style="color: #4b4d51; font-weight: bold;">DocumentDestination.cpp:125</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">m_charactersToSkip</span> <span style="color: #aa2211">=</span> <span class="bright"></span><span style="color: #601200"><span class="bright">1</span></span><span class="bright"></span><span class="p"><span class="bright">;</span></span><span class="bright"> </span><span style="color: #74777d"><span class="bright">/* TODO: this should be driven by \uc, default to 1 */</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">m_charactersToSkip</span> <span style="color: #aa2211">=</span> <span class="bright"></span><span class="n"><span class="bright">m_unicodeSkip</span></span><span class="bright"></span><span class="p"><span class="bright">;</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">}</span> <span style="color: #aa4000">else</span> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">controlWord</span> <span style="color: #aa2211">==</span> <span style="color: #766510">"uc"</span> <span style="color: #aa2211">&&</span> <span class="n">hasValue</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">m_unicodeSkip</span> <span style="color: #aa2211">=</span> <span class="n">value</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">A minor issue, but the spacing around the brackets here doesn't match the surrounding code.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D24943#inline-141106">View Inline</a><span style="color: #4b4d51; font-weight: bold;">PictDestination.cpp:46</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">m_format</span> <span style="color: #aa2211">=</span> <span style="color: #766510">"png"</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">}</span> <span style="color: #aa4000">else</span> <span style="color: #aa4000">if</span> <span class="p">(</span> <span class="n">controlWord</span> <span style="color: #aa2211">==</span> <span style="color: #766510">"dibitmap"</span> <span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">qCDebug</span><span class="p">(</span><span class="n">lcRtf</span><span class="p">)</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"BMP"</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">The spec mentions <tt style="background: #ebebeb; font-size: 13px;">\wbitmap</tt> is also a Windows device-dependent bitmap. Could that be sent through this branch too?</p>
<p style="padding: 0; margin: 8px;">(see: <a href="http://latex2rtf.sourceforge.net/rtfspec_7.html#rtfspec_24" class="remarkup-link" target="_blank" rel="noreferrer">http://latex2rtf.sourceforge.net/rtfspec_7.html#rtfspec_24</a>)</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D24943#inline-141104">View Inline</a><span style="color: #4b4d51; font-weight: bold;">PictDestination.cpp:54</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span> <span style="color: #aa4000">else</span> <span style="color: #aa4000">if</span> <span class="p">(</span> <span class="n">controlWord</span> <span style="color: #aa2211">==</span> <span style="color: #766510">"pich"</span> <span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">qCDebug</span><span class="p">(</span><span class="n">lcRtf</span><span class="p">)</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"pict height: "</span> <span style="color: #aa2211"><<</span> <span class="n">value</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">m_imageFormat</span><span class="p">.</span><span class="n">setHeight</span><span class="p">(</span> <span class="n">value</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span> <span style="color: #aa4000">else</span> <span style="color: #aa4000">if</span> <span class="p">(</span> <span class="n">controlWord</span> <span style="color: #aa2211">==</span> <span style="color: #766510">"picscalex"</span> <span class="p">)</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">The <tt style="background: #ebebeb; font-size: 13px;">\picw</tt> and <tt style="background: #ebebeb; font-size: 13px;">\pich</tt> keywords are now ignored; is this intentional? It looks like they're mandatory, whereas the <tt style="background: #ebebeb; font-size: 13px;">\picwgoal</tt>, <tt style="background: #ebebeb; font-size: 13px;">\pichgoal</tt>, <tt style="background: #ebebeb; font-size: 13px;">\picscalex</tt> and <tt style="background: #ebebeb; font-size: 13px;">\picscaley</tt> which seem to be used now instead, are optional.</p>
<p style="padding: 0; margin: 8px;">(see: <a href="http://latex2rtf.sourceforge.net/rtfspec_7.html#rtfspec_24" class="remarkup-link" target="_blank" rel="noreferrer">http://latex2rtf.sourceforge.net/rtfspec_7.html#rtfspec_24</a>)</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D24943#inline-141108">View Inline</a><span style="color: #4b4d51; font-weight: bold;">PictDestination.cpp:110</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">qCWarning</span><span class="p">(</span><span class="n">lcRtf</span><span class="p">)</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"Embedded picture in unknown format"</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">}</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Lines 87-110 seem to use different spacing around the brackets than elsewhere.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D24943#inline-141100">View Inline</a><span style="color: #4b4d51; font-weight: bold;">TextDocumentRtfOutput.cpp:68</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">m_cursor</span><span style="color: #aa2211">-></span><span class="n">insertText</span><span class="p">(</span><span class="n">str</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">The tabs/spaces are all over the place in this file already, but it probably makes sense to stick to one or the other nevertheless (spaces by the looks of it).</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R8 Calligra</div></div></div><br /><div><strong>BRANCH</strong><div><div>master</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D24943">https://phabricator.kde.org/D24943</a></div></div><br /><div><strong>To: </strong>pvuorela, davidllewellynjones<br /><strong>Cc: </strong>davidllewellynjones, Calligra-Devel-list, dcaliste, cochise, vandenoever<br /></div>