<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/109370/">http://git.reviewboard.kde.org/r/109370/</a>
     </td>
    </tr>
   </table>
   <br />










<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
 <p style="margin-top: 0;">On March 9th, 2013, 2:25 p.m. UTC, <b>Matus Uzak</b> wrote:</p>
 <blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
  



<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/109370/diff/1/?file=118266#file118266line128" style="color: black; font-weight: bold; text-decoration: underline;">filters/words/msword-odf/paragraph.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 Paragraph::setParagraphProperties(wvWare::SharedPtr<const wvWare::ParagraphProperties> props)</pre></td>

  </tr>
 </tbody>



 
 

 <tbody>

  <tr>
    <th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">128</font></th>
    <td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">        <span class="k">const</span> <span class="n">KoGenStyle</span> <span class="o">*</span><span class="n">pStyle</span> <span class="o">=</span> <span class="n">m_mainStyles</span><span class="o">-></span><span class="n">style</span><span class="p">(</span><span class="n">Conversion</span><span class="o">::</span><span class="n">styleName2QString</span><span class="p">(</span><span class="n">m_paragraphStyle</span><span class="o">-></span><span class="n">name</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">128</font></th>
    <td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">        <span class="k">const</span> <span class="n">KoGenStyle</span> <span class="o">*</span><span class="n">pStyle</span> <span class="o">=</span> <span class="n">m_mainStyles</span><span class="o">-></span><span class="n">style</span><span class="p">(</span><span class="n">Conversion</span><span class="o">::</span><span class="n">styleName2QString</span><span class="p">(</span><span class="n">m_paragraphStyle</span><span class="o">-></span><span class="n">name</span><span class="p">())<span class="hl">,</span></span><span class="hl"> </span><span class="n"><span class="hl">m_paragraphStyle</span></span><span class="o"><span class="hl">-></span></span><span class="n"><span class="hl">type</span></span><span class="p"><span class="hl">()</span></span><span class="hl"> </span><span class="o"><span class="hl">==</span></span><span class="hl"> </span><span class="n"><span class="hl">sgcPara</span></span><span class="hl"> </span><span class="o"><span class="hl">?</span></span><span class="hl"> </span><span class="s"><span class="hl">"paragraph"</span></span><span class="hl"> </span><span class="o"><span class="hl">:</span></span><span class="hl"> </span><span class="s"><span class="hl">"text"</span></span><span class="p">);</span></pre></td>
  </tr>

 </tbody>

</table>

  <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This is always a paragraph style.</pre>
 </blockquote>





</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I send Matus a file where this is not the case for investigation.</pre>
<br />




<p>- Thorsten</p>


<br />
<p>On March 9th, 2013, 12:43 p.m. UTC, Thorsten Zachmann wrote:</p>








<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
 <tr>
  <td>

<div>Review request for Calligra and Matus Uzak.</div>
<div>By Thorsten Zachmann.</div>


<p style="color: grey;"><i>Updated March 9, 2013, 12:43 p.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;">When testing roundtrip for headers/footers in words it happens that the header/footers are no longer shown after roundtrip. Problem is that the style used for the page style gets it's name change but is expected to be standard.
This patch adds the possibility to have same style names if the family is different.

This also fixes an import problem for doc files when the char and paragrpah style has the same name then the wrong style was used.</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;">cstester and roundtrip testing </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>filters/libmso/ODrawToOdf.cpp <span style="color: grey">(ac589a9)</span></li>

 <li>filters/libmsooxml/MsooXmlUtils.cpp <span style="color: grey">(d45089a)</span></li>

 <li>filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp <span style="color: grey">(a4e2b5f)</span></li>

 <li>filters/words/docx/DocxXmlDocumentReader.h <span style="color: grey">(97916ee)</span></li>

 <li>filters/words/docx/DocxXmlDocumentReader.cpp <span style="color: grey">(df81026)</span></li>

 <li>filters/words/msword-odf/paragraph.cpp <span style="color: grey">(3308d8d)</span></li>

 <li>filters/words/msword-odf/tablehandler.cpp <span style="color: grey">(285f4f7)</span></li>

 <li>filters/words/msword-odf/texthandler.cpp <span style="color: grey">(4473736)</span></li>

 <li>libs/koreport/renderer/odtframe/KoOdtFrameReportDocument.cpp <span style="color: grey">(51c5958)</span></li>

 <li>libs/kotext/styles/KoStyleManager.cpp <span style="color: grey">(c2a64e9)</span></li>

 <li>libs/odf/KoGenStyle.cpp <span style="color: grey">(11b1888)</span></li>

 <li>libs/odf/KoGenStyles.h <span style="color: grey">(8041441)</span></li>

 <li>libs/odf/KoGenStyles.cpp <span style="color: grey">(7a92453)</span></li>

 <li>libs/odf/tests/TestKoGenStyles.cpp <span style="color: grey">(5818091)</span></li>

</ul>

<p><a href="http://git.reviewboard.kde.org/r/109370/diff/" style="margin-left: 3em;">View Diff</a></p>







  </td>
 </tr>
</table>








  </div>
 </body>
</html>