[prev in list] [next in list] [prev in thread] [next in thread]
List: calligra-devel
Subject: Re: Review Request 122045: Calligra filters: refactor chart handling and make it sane
From: "Inge Wallin" <inge () lysator ! liu ! se>
Date: 2015-03-02 15:11:50
Message-ID: 20150302151150.6756.43401 () probe ! kde ! org
[Download RAW message or body]
--===============7114495243605230454==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/122045/
-----------------------------------------------------------
(Updated March 2, 2015, 3:11 p.m.)
Status
------
This change has been marked as submitted.
Review request for Calligra, Lassi Nieminen and Jarosław Staniek.
Repository: calligra
Description
-------
This patch is a refactoring of how charts are handled in the filters. There are two \
purposes of it: 1. Make it sane in general. As it was before, the various filters \
where reaching into each other for bits and pieces of code, and the naming was \
strange in places. There was also a strange mixture of MS binary and MSOOXML concepts \
in the same files. 2. To prepare for the next step which is sharing storage classes \
for charts between the filters and the chart shape. As it is now, many defines and \
both loading and saving is duplicated all over Calligra. This is not the way we want \
things to be.
There is hardly any new code in here, only rearranging of what was already there. \
Here is a summary (everything happens inside the filters/ tree):
- Factor out common parts and move them to libodf2/charts
- Factor out the parts common to MS handling and move them to libmso/
- Move common parts within the ooxml filters from the xlsx tree to libmsooxml/
- Move things that only have to do with MS binary parts to libmso/
- Rename the vaguely named namespace "Charting" to "KoChart"
- Rename ChartExport to KoOdfChartWriter, which should be clearer
- Make the filters use and link to the libraries instead of each other
Diffs
-----
filters/libodf2/chart/PLAN PRE-CREATION
filters/sheets/excel/export/CMakeLists.txt acc5a73
filters/sheets/excel/import/CMakeLists.txt de653ee
filters/sheets/excel/import/ExcelImport.cpp abf4c52
filters/sheets/excel/import/excelimporttoods.cc 5d6887b
filters/sheets/excel/sidewinder/CMakeLists.txt 097e2a8
filters/sheets/excel/sidewinder/chartsubstreamhandler.h d22c02b
filters/sheets/excel/sidewinder/chartsubstreamhandler.cpp ecd9071
filters/sheets/excel/sidewinder/objects.h 5162cee
filters/sheets/xlsx/CMakeLists.txt 294f048
filters/sheets/xlsx/ChartExport.h aa9895d
filters/sheets/xlsx/ChartExport.cpp 27b075b
filters/sheets/xlsx/Charting.h 4fea470
filters/words/msword-odf/CMakeLists.txt 2b975a1
CMakeLists.txt 1f992dd
filters/libmso/CMakeLists.txt 19aced3
filters/libmso/MsoUtils.h PRE-CREATION
filters/libmso/MsoUtils.cpp PRE-CREATION
filters/libmso/NumberFormatParser.h PRE-CREATION
filters/libmso/NumberFormatParser.cpp PRE-CREATION
filters/libmso/XlsUtils.h PRE-CREATION
filters/libmsooxml/CMakeLists.txt 7dc2d7f
filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h e8748ef
filters/libmsooxml/MsooXmlDrawingTableStyleReader.cpp c7bd7fe
filters/libmsooxml/MsooXmlImport.cpp 49ad484
filters/libmsooxml/MsooXmlTheme.h PRE-CREATION
filters/libmsooxml/MsooXmlThemesReader.h 9682c34
filters/libmsooxml/MsooXmlThemesReader.cpp 5335029
filters/libmsooxml/MsooXmlUtils.h 055fa15
filters/libmsooxml/MsooXmlUtils.cpp 31df41e
filters/libodf2/CMakeLists.txt 3792771
filters/libodf2/chart/Charting.h PRE-CREATION
filters/libodf2/chart/KoOdfChartWriter.h PRE-CREATION
filters/libodf2/chart/KoOdfChartWriter.cpp PRE-CREATION
filters/sheets/xlsx/NumberFormatParser.h e877d40
filters/sheets/xlsx/NumberFormatParser.cpp 433ffe8
filters/sheets/xlsx/XlsxChartOdfWriter.h PRE-CREATION
filters/sheets/xlsx/XlsxChartOdfWriter.cpp PRE-CREATION
filters/sheets/xlsx/XlsxImport.cpp b0091ca
filters/sheets/xlsx/XlsxUtils.h 2858ce4
filters/sheets/xlsx/XlsxXmlChartReader.h a2b07e8
filters/sheets/xlsx/XlsxXmlChartReader.cpp 0434961
filters/sheets/xlsx/XlsxXmlCommentsReader.h e025a06
filters/sheets/xlsx/XlsxXmlCommonReader.h e406b0a
filters/sheets/xlsx/XlsxXmlDocumentReader.h 6395799
filters/sheets/xlsx/XlsxXmlDocumentReader.cpp a4961ee
filters/words/docx/import/DocxXmlDocumentReader.h bfb9171
filters/words/docx/import/DocxXmlDocumentReader.cpp ae7cb0e
filters/stage/pptx/CMakeLists.txt 36434f9
filters/stage/pptx/PptxXmlSlideReader.cpp 702a381
filters/words/docx/import/CMakeLists.txt 70490d4
filters/sheets/xlsx/XlsxXmlWorksheetReader.h 559a029
filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp 74e1302
filters/sheets/xlsx/XlsxXmlStylesReader.h 4793ae3
filters/sheets/xlsx/XlsxXmlDrawingReader.h 69c75ac
filters/sheets/xlsx/XlsxXmlDrawingReader.cpp def1ff6
Diff: https://git.reviewboard.kde.org/r/122045/diff/
Testing
-------
There is no new code at all, only rearrangement. But all the filters work as \
expected.
Thanks,
Inge Wallin
--===============7114495243605230454==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/122045/">https://git.reviewboard.kde.org/r/122045/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#e0e0e0" width="100%" cellpadding="12" style="border: 1px gray solid; \
border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> <tr>
<td>
<h1 style="margin: 0; padding: 0; font-size: 10pt;">This change has been marked as \
submitted.</h1> </td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for Calligra, Lassi Nieminen and Jarosław Staniek.</div>
<div>By Inge Wallin.</div>
<p style="color: grey;"><i>Updated March 2, 2015, 3:11 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
calligra
</div>
<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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">This patch is a refactoring of how charts are handled \
in the filters. There are two purposes of it: 1. Make it sane in general. As it was \
before, the various filters where reaching into each other for bits and pieces of \
code, and the naming was strange in places. There was also a strange mixture of MS \
binary and MSOOXML concepts in the same files. 2. To prepare for the next step which \
is sharing storage classes for charts between the filters and the chart shape. As it \
is now, many defines and both loading and saving is duplicated all over Calligra. \
This is not the way we want things to be.</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">There is hardly any new \
code in here, only rearranging of what was already there. Here is a summary \
(everything happens inside the filters/ tree):
- Factor out common parts and move them to libodf2/charts
- Factor out the parts common to MS handling and move them to libmso/
- Move common parts within the ooxml filters from the xlsx tree to libmsooxml/
- Move things that only have to do with MS binary parts to libmso/
- Rename the vaguely named namespace "Charting" to "KoChart"
- Rename ChartExport to KoOdfChartWriter, which should be clearer
- Make the filters use and link to the libraries instead of each other</p></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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">There is no new code at all, only rearrangement. But \
all the filters work as expected.</p></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/libodf2/chart/PLAN <span style="color: grey">(PRE-CREATION)</span></li>
<li>filters/sheets/excel/export/CMakeLists.txt <span style="color: \
grey">(acc5a73)</span></li>
<li>filters/sheets/excel/import/CMakeLists.txt <span style="color: \
grey">(de653ee)</span></li>
<li>filters/sheets/excel/import/ExcelImport.cpp <span style="color: \
grey">(abf4c52)</span></li>
<li>filters/sheets/excel/import/excelimporttoods.cc <span style="color: \
grey">(5d6887b)</span></li>
<li>filters/sheets/excel/sidewinder/CMakeLists.txt <span style="color: \
grey">(097e2a8)</span></li>
<li>filters/sheets/excel/sidewinder/chartsubstreamhandler.h <span style="color: \
grey">(d22c02b)</span></li>
<li>filters/sheets/excel/sidewinder/chartsubstreamhandler.cpp <span style="color: \
grey">(ecd9071)</span></li>
<li>filters/sheets/excel/sidewinder/objects.h <span style="color: \
grey">(5162cee)</span></li>
<li>filters/sheets/xlsx/CMakeLists.txt <span style="color: \
grey">(294f048)</span></li>
<li>filters/sheets/xlsx/ChartExport.h <span style="color: \
grey">(aa9895d)</span></li>
<li>filters/sheets/xlsx/ChartExport.cpp <span style="color: \
grey">(27b075b)</span></li>
<li>filters/sheets/xlsx/Charting.h <span style="color: grey">(4fea470)</span></li>
<li>filters/words/msword-odf/CMakeLists.txt <span style="color: \
grey">(2b975a1)</span></li>
<li>CMakeLists.txt <span style="color: grey">(1f992dd)</span></li>
<li>filters/libmso/CMakeLists.txt <span style="color: grey">(19aced3)</span></li>
<li>filters/libmso/MsoUtils.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>filters/libmso/MsoUtils.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>filters/libmso/NumberFormatParser.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>filters/libmso/NumberFormatParser.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>filters/libmso/XlsUtils.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>filters/libmsooxml/CMakeLists.txt <span style="color: \
grey">(7dc2d7f)</span></li>
<li>filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h <span style="color: \
grey">(e8748ef)</span></li>
<li>filters/libmsooxml/MsooXmlDrawingTableStyleReader.cpp <span style="color: \
grey">(c7bd7fe)</span></li>
<li>filters/libmsooxml/MsooXmlImport.cpp <span style="color: \
grey">(49ad484)</span></li>
<li>filters/libmsooxml/MsooXmlTheme.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>filters/libmsooxml/MsooXmlThemesReader.h <span style="color: \
grey">(9682c34)</span></li>
<li>filters/libmsooxml/MsooXmlThemesReader.cpp <span style="color: \
grey">(5335029)</span></li>
<li>filters/libmsooxml/MsooXmlUtils.h <span style="color: \
grey">(055fa15)</span></li>
<li>filters/libmsooxml/MsooXmlUtils.cpp <span style="color: \
grey">(31df41e)</span></li>
<li>filters/libodf2/CMakeLists.txt <span style="color: grey">(3792771)</span></li>
<li>filters/libodf2/chart/Charting.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>filters/libodf2/chart/KoOdfChartWriter.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>filters/libodf2/chart/KoOdfChartWriter.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>filters/sheets/xlsx/NumberFormatParser.h <span style="color: \
grey">(e877d40)</span></li>
<li>filters/sheets/xlsx/NumberFormatParser.cpp <span style="color: \
grey">(433ffe8)</span></li>
<li>filters/sheets/xlsx/XlsxChartOdfWriter.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>filters/sheets/xlsx/XlsxChartOdfWriter.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>filters/sheets/xlsx/XlsxImport.cpp <span style="color: \
grey">(b0091ca)</span></li>
<li>filters/sheets/xlsx/XlsxUtils.h <span style="color: grey">(2858ce4)</span></li>
<li>filters/sheets/xlsx/XlsxXmlChartReader.h <span style="color: \
grey">(a2b07e8)</span></li>
<li>filters/sheets/xlsx/XlsxXmlChartReader.cpp <span style="color: \
grey">(0434961)</span></li>
<li>filters/sheets/xlsx/XlsxXmlCommentsReader.h <span style="color: \
grey">(e025a06)</span></li>
<li>filters/sheets/xlsx/XlsxXmlCommonReader.h <span style="color: \
grey">(e406b0a)</span></li>
<li>filters/sheets/xlsx/XlsxXmlDocumentReader.h <span style="color: \
grey">(6395799)</span></li>
<li>filters/sheets/xlsx/XlsxXmlDocumentReader.cpp <span style="color: \
grey">(a4961ee)</span></li>
<li>filters/words/docx/import/DocxXmlDocumentReader.h <span style="color: \
grey">(bfb9171)</span></li>
<li>filters/words/docx/import/DocxXmlDocumentReader.cpp <span style="color: \
grey">(ae7cb0e)</span></li>
<li>filters/stage/pptx/CMakeLists.txt <span style="color: \
grey">(36434f9)</span></li>
<li>filters/stage/pptx/PptxXmlSlideReader.cpp <span style="color: \
grey">(702a381)</span></li>
<li>filters/words/docx/import/CMakeLists.txt <span style="color: \
grey">(70490d4)</span></li>
<li>filters/sheets/xlsx/XlsxXmlWorksheetReader.h <span style="color: \
grey">(559a029)</span></li>
<li>filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp <span style="color: \
grey">(74e1302)</span></li>
<li>filters/sheets/xlsx/XlsxXmlStylesReader.h <span style="color: \
grey">(4793ae3)</span></li>
<li>filters/sheets/xlsx/XlsxXmlDrawingReader.h <span style="color: \
grey">(69c75ac)</span></li>
<li>filters/sheets/xlsx/XlsxXmlDrawingReader.cpp <span style="color: \
grey">(def1ff6)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/122045/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============7114495243605230454==--
[Attachment #3 (text/plain)]
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic