[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] filters: Extend table lifetime
From: Anthony Fieroni <null () kde ! org>
Date: 2018-09-17 13:57:40
Message-ID: E1g1u20-0006qi-4A () code ! kde ! org
[Download RAW message or body]
Git commit cb7ff65d2e7c1811ef06f929f0860b55f771b743 by Anthony Fieroni.
Committed on 13/09/2018 at 16:39.
Pushed by anthonyfieroni into branch 'master'.
Extend table lifetime
CCBUG: 379255
Differential Revision: https://phabricator.kde.org/D15412
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
M +2 -4 filters/libmsooxml/MsooXmlDrawingReaderTableImpl.h
M +1 -1 filters/libmsooxml/MsooXmlDrawingReaderTableMethods.h
M +150 -149 filters/libmsooxml/PresetDrawingMLTables.h
M +2 -0 filters/libodf2/KoTable.cpp
M +2 -0 filters/libodf2/KoTable.h
M +1 -2 filters/stage/pptx/PptxXmlSlideReader.h
M +3 -4 filters/words/docx/import/DocxXmlDocumentReader.cpp
M +2 -3 filters/words/docx/import/DocxXmlDocumentReader.h
https://commits.kde.org/calligra/cb7ff65d2e7c1811ef06f929f0860b55f771b743
diff --git a/filters/libmsooxml/MsooXmlDrawingReaderTableImpl.h \
b/filters/libmsooxml/MsooXmlDrawingReaderTableImpl.h index 52f53110ac5..856ffb3ec47 \
100644
--- a/filters/libmsooxml/MsooXmlDrawingReaderTableImpl.h
+++ b/filters/libmsooxml/MsooXmlDrawingReaderTableImpl.h
@@ -30,6 +30,8 @@ using namespace MSOOXML;
//! tbl (Table) §21.1.3.13
KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_tbl()
{
+ m_table = KoTable::create();
+
READ_PROLOGUE
bool tableSetByMe = false;
@@ -55,8 +57,6 @@ KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_tbl()
m_context->import->loadAndParseDocument(&tableStyleReader, \
m_context->tableStylesFilePath, &tableStyleReaderContext); }
- m_table = new KoTable;
-
m_table->setName(QLatin1String("Table") + QString::number(m_currentTableNumber + \
1)); m_currentTableRowNumber = 0;
m_currentTableColumnNumber = 0;
@@ -77,8 +77,6 @@ KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_tbl()
m_table->saveOdf(*body, *mainStyles);
- delete m_table;
-
m_currentTableNumber++;
if (tableSetByMe) {
diff --git a/filters/libmsooxml/MsooXmlDrawingReaderTableMethods.h \
b/filters/libmsooxml/MsooXmlDrawingReaderTableMethods.h index \
0134ecbfe11..93912c129e9 100644
--- a/filters/libmsooxml/MsooXmlDrawingReaderTableMethods.h
+++ b/filters/libmsooxml/MsooXmlDrawingReaderTableMethods.h
@@ -37,7 +37,7 @@ protected:
uint m_currentTableRowNumber; //!< row counter, from 0, initialized in \
read_tbl()
uint m_currentTableColumnNumber; //!< column counter, from 0, initialized in \
read_tr()
- KoTable* m_table;
+ KoTable::Ptr m_table;
QString m_currentTableName;
MSOOXML::DrawingTableStyle* m_tableStyle;
diff --git a/filters/libmsooxml/PresetDrawingMLTables.h \
b/filters/libmsooxml/PresetDrawingMLTables.h index 3879137454c..ecb71dcbb7b 100644
--- a/filters/libmsooxml/PresetDrawingMLTables.h
+++ b/filters/libmsooxml/PresetDrawingMLTables.h
@@ -23,8 +23,8 @@
QString getPresetTable(const QString& reference)
{
-QMap<QString, QString> presetTables;
-presetTables["{2D5ABB26-0587-4C30-8999-92F81FD0307C}"] = "\
+static const QMap<QString, QString> presetTables = {
+{ QStringLiteral("{2D5ABB26-0587-4C30-8999-92F81FD0307C}"), QStringLiteral("\
<a:tblStyle styleId=\"{2D5ABB26-0587-4C30-8999-92F81FD0307C}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -72,8 +72,8 @@ presetTables["{2D5ABB26-0587-4C30-8999-92F81FD0307C}"] = "\
</a:tcStyle>\
</a:wholeTbl>\
</a:tblStyle>\
-";
-presetTables["{3C2FFA5D-87B4-456A-9821-1D502468CF0F}"] = "\
+") },
+{ QStringLiteral("{3C2FFA5D-87B4-456A-9821-1D502468CF0F}"), QStringLiteral("\
<a:tblStyle styleId=\"{3C2FFA5D-87B4-456A-9821-1D502468CF0F}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"2\">\
@@ -335,8 +335,8 @@ presetTables["{3C2FFA5D-87B4-456A-9821-1D502468CF0F}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{284E427A-3D55-4303-BF80-6455036E1DE7}"] = "\
+") },
+{ QStringLiteral("{284E427A-3D55-4303-BF80-6455036E1DE7}"), QStringLiteral("\
<a:tblStyle styleId=\"{284E427A-3D55-4303-BF80-6455036E1DE7}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"2\">\
@@ -598,8 +598,8 @@ presetTables["{284E427A-3D55-4303-BF80-6455036E1DE7}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{69C7853C-536D-4A76-A0AE-DD22124D55A5}"] = "\
+") },
+{ QStringLiteral("{69C7853C-536D-4A76-A0AE-DD22124D55A5}"), QStringLiteral("\
<a:tblStyle styleId=\"{69C7853C-536D-4A76-A0AE-DD22124D55A5}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"2\">\
@@ -861,8 +861,8 @@ presetTables["{69C7853C-536D-4A76-A0AE-DD22124D55A5}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{775DCB02-9BB8-47FD-8907-85C794F793BA}"] = "\
+") },
+{ QStringLiteral("{775DCB02-9BB8-47FD-8907-85C794F793BA}"), QStringLiteral("\
<a:tblStyle styleId=\"{775DCB02-9BB8-47FD-8907-85C794F793BA}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"2\">\
@@ -1124,8 +1124,8 @@ presetTables["{775DCB02-9BB8-47FD-8907-85C794F793BA}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{35758FB7-9AC5-4552-8A53-C91805E547FA}"] = "\
+") },
+{ QStringLiteral("{35758FB7-9AC5-4552-8A53-C91805E547FA}"), QStringLiteral("\
<a:tblStyle styleId=\"{35758FB7-9AC5-4552-8A53-C91805E547FA}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"2\">\
@@ -1387,8 +1387,8 @@ presetTables["{35758FB7-9AC5-4552-8A53-C91805E547FA}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{08FB837D-C827-4EFA-A057-4D05807E0F7C}"] = "\
+") },
+{ QStringLiteral("{08FB837D-C827-4EFA-A057-4D05807E0F7C}"), QStringLiteral("\
<a:tblStyle styleId=\"{08FB837D-C827-4EFA-A057-4D05807E0F7C}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"2\">\
@@ -1650,8 +1650,8 @@ presetTables["{08FB837D-C827-4EFA-A057-4D05807E0F7C}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{5940675A-B579-460E-94D1-54222C63F5DA}"] = "\
+") },
+{ QStringLiteral("{5940675A-B579-460E-94D1-54222C63F5DA}"), QStringLiteral("\
<a:tblStyle styleId=\"{5940675A-B579-460E-94D1-54222C63F5DA}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -1711,8 +1711,8 @@ presetTables["{5940675A-B579-460E-94D1-54222C63F5DA}"] = "\
</a:tcStyle>\
</a:wholeTbl>\
</a:tblStyle>\
-";
-presetTables["{D113A9D2-9D6B-4929-AA2D-F23B5EE8CBE7}"] = "\
+") },
+{ QStringLiteral("{D113A9D2-9D6B-4929-AA2D-F23B5EE8CBE7}"), QStringLiteral("\
<a:tblStyle styleId=\"{D113A9D2-9D6B-4929-AA2D-F23B5EE8CBE7}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"3\">\
@@ -1897,8 +1897,8 @@ presetTables["{D113A9D2-9D6B-4929-AA2D-F23B5EE8CBE7}"] = "\
</a:tcStyle>\
</a:neCell>\
</a:tblStyle>\
-";
-presetTables["{18603FDC-E32A-4AB5-989C-0864C3EAD2B8}"] = "\
+") },
+{ QStringLiteral("{18603FDC-E32A-4AB5-989C-0864C3EAD2B8}"), QStringLiteral("\
<a:tblStyle styleId=\"{18603FDC-E32A-4AB5-989C-0864C3EAD2B8}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"3\">\
@@ -2083,8 +2083,8 @@ presetTables["{18603FDC-E32A-4AB5-989C-0864C3EAD2B8}"] = "\
</a:tcStyle>\
</a:neCell>\
</a:tblStyle>\
-";
-presetTables["{306799F8-075E-4A3A-A7F6-7FBC6576F1A4}"] = "\
+") },
+{ QStringLiteral("{306799F8-075E-4A3A-A7F6-7FBC6576F1A4}"), QStringLiteral("\
<a:tblStyle styleId=\"{306799F8-075E-4A3A-A7F6-7FBC6576F1A4}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"3\">\
@@ -2269,8 +2269,8 @@ presetTables["{306799F8-075E-4A3A-A7F6-7FBC6576F1A4}"] = "\
</a:tcStyle>\
</a:neCell>\
</a:tblStyle>\
-";
-presetTables["{E269D01E-BC32-4049-B463-5C60D7B0CCD2}"] = "\
+") },
+{ QStringLiteral("{E269D01E-BC32-4049-B463-5C60D7B0CCD2}"), QStringLiteral("\
<a:tblStyle styleId=\"{E269D01E-BC32-4049-B463-5C60D7B0CCD2}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"3\">\
@@ -2455,8 +2455,8 @@ presetTables["{E269D01E-BC32-4049-B463-5C60D7B0CCD2}"] = "\
</a:tcStyle>\
</a:neCell>\
</a:tblStyle>\
-";
-presetTables["{327F97BB-C833-4FB7-BDE5-3F7075034690}"] = "\
+") },
+{ QStringLiteral("{327F97BB-C833-4FB7-BDE5-3F7075034690}"), QStringLiteral("\
<a:tblStyle styleId=\"{327F97BB-C833-4FB7-BDE5-3F7075034690}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"3\">\
@@ -2641,8 +2641,8 @@ presetTables["{327F97BB-C833-4FB7-BDE5-3F7075034690}"] = "\
</a:tcStyle>\
</a:neCell>\
</a:tblStyle>\
-";
-presetTables["{638B1855-1B75-4FBE-930C-398BA8C253C6}"] = "\
+") },
+{ QStringLiteral("{638B1855-1B75-4FBE-930C-398BA8C253C6}"), QStringLiteral("\
<a:tblStyle styleId=\"{638B1855-1B75-4FBE-930C-398BA8C253C6}\" styleName=\"\">\
<a:tblBg>\
<a:fillRef idx=\"3\">\
@@ -2827,8 +2827,8 @@ presetTables["{638B1855-1B75-4FBE-930C-398BA8C253C6}"] = "\
</a:tcStyle>\
</a:neCell>\
</a:tblStyle>\
-";
-presetTables["{9D7B26C5-4107-4FEC-AEDC-1716B250A1EF}"] = "\
+") },
+{ QStringLiteral("{9D7B26C5-4107-4FEC-AEDC-1716B250A1EF}"), QStringLiteral("\
<a:tblStyle styleId=\"{9D7B26C5-4107-4FEC-AEDC-1716B250A1EF}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -2955,8 +2955,8 @@ presetTables["{9D7B26C5-4107-4FEC-AEDC-1716B250A1EF}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{3B4B98B0-60AC-42C2-AFA5-B58CD77FA1E5}"] = "\
+") },
+{ QStringLiteral("{3B4B98B0-60AC-42C2-AFA5-B58CD77FA1E5}"), QStringLiteral("\
<a:tblStyle styleId=\"{3B4B98B0-60AC-42C2-AFA5-B58CD77FA1E5}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -3083,8 +3083,8 @@ presetTables["{3B4B98B0-60AC-42C2-AFA5-B58CD77FA1E5}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{0E3FDE45-AF77-4B5C-9715-49D594BDF05E}"] = "\
+") },
+{ QStringLiteral("{0E3FDE45-AF77-4B5C-9715-49D594BDF05E}"), QStringLiteral("\
<a:tblStyle styleId=\"{0E3FDE45-AF77-4B5C-9715-49D594BDF05E}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -3211,8 +3211,8 @@ presetTables["{0E3FDE45-AF77-4B5C-9715-49D594BDF05E}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{C083E6E3-FA7D-4D7B-A595-EF9225AFEA82}"] = "\
+") },
+{ QStringLiteral("{C083E6E3-FA7D-4D7B-A595-EF9225AFEA82}"), QStringLiteral("\
<a:tblStyle styleId=\"{C083E6E3-FA7D-4D7B-A595-EF9225AFEA82}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -3339,8 +3339,8 @@ presetTables["{C083E6E3-FA7D-4D7B-A595-EF9225AFEA82}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{D27102A9-8310-4765-A935-A1911B00CA55}"] = "\
+") },
+{ QStringLiteral("{D27102A9-8310-4765-A935-A1911B00CA55}"), QStringLiteral("\
<a:tblStyle styleId=\"{D27102A9-8310-4765-A935-A1911B00CA55}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -3467,8 +3467,8 @@ presetTables["{D27102A9-8310-4765-A935-A1911B00CA55}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{5FD0F851-EC5A-4D38-B0AD-8093EC10F338}"] = "\
+") },
+{ QStringLiteral("{5FD0F851-EC5A-4D38-B0AD-8093EC10F338}"), QStringLiteral("\
<a:tblStyle styleId=\"{5FD0F851-EC5A-4D38-B0AD-8093EC10F338}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -3595,8 +3595,8 @@ presetTables["{5FD0F851-EC5A-4D38-B0AD-8093EC10F338}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{68D230F3-CF80-4859-8CE7-A43EE81993B5}"] = "\
+") },
+{ QStringLiteral("{68D230F3-CF80-4859-8CE7-A43EE81993B5}"), QStringLiteral("\
<a:tblStyle styleId=\"{68D230F3-CF80-4859-8CE7-A43EE81993B5}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -3723,8 +3723,8 @@ presetTables["{68D230F3-CF80-4859-8CE7-A43EE81993B5}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{7E9639D4-E3E2-4D34-9284-5A2195B3D0D7}"] = "\
+") },
+{ QStringLiteral("{7E9639D4-E3E2-4D34-9284-5A2195B3D0D7}"), QStringLiteral("\
<a:tblStyle styleId=\"{7E9639D4-E3E2-4D34-9284-5A2195B3D0D7}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -3860,8 +3860,8 @@ presetTables["{7E9639D4-E3E2-4D34-9284-5A2195B3D0D7}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{69012ECD-51FC-41F1-AA8D-1B2483CD663E}"] = "\
+") },
+{ QStringLiteral("{69012ECD-51FC-41F1-AA8D-1B2483CD663E}"), QStringLiteral("\
<a:tblStyle styleId=\"{69012ECD-51FC-41F1-AA8D-1B2483CD663E}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -3997,8 +3997,8 @@ presetTables["{69012ECD-51FC-41F1-AA8D-1B2483CD663E}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{72833802-FEF1-4C79-8D5D-14CF1EAF98D9}"] = "\
+") },
+{ QStringLiteral("{72833802-FEF1-4C79-8D5D-14CF1EAF98D9}"), QStringLiteral("\
<a:tblStyle styleId=\"{72833802-FEF1-4C79-8D5D-14CF1EAF98D9}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -4134,8 +4134,8 @@ presetTables["{72833802-FEF1-4C79-8D5D-14CF1EAF98D9}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{F2DE63D5-997A-4646-A377-4702673A728D}"] = "\
+") },
+{ QStringLiteral("{F2DE63D5-997A-4646-A377-4702673A728D}"), QStringLiteral("\
<a:tblStyle styleId=\"{F2DE63D5-997A-4646-A377-4702673A728D}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -4271,8 +4271,8 @@ presetTables["{F2DE63D5-997A-4646-A377-4702673A728D}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{17292A2E-F333-43FB-9621-5CBBE7FDCDCB}"] = "\
+") },
+{ QStringLiteral("{17292A2E-F333-43FB-9621-5CBBE7FDCDCB}"), QStringLiteral("\
<a:tblStyle styleId=\"{17292A2E-F333-43FB-9621-5CBBE7FDCDCB}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -4408,8 +4408,8 @@ presetTables["{17292A2E-F333-43FB-9621-5CBBE7FDCDCB}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{5A111915-BE36-4E01-A7E5-04B1672EAD32}"] = "\
+") },
+{ QStringLiteral("{5A111915-BE36-4E01-A7E5-04B1672EAD32}"), QStringLiteral("\
<a:tblStyle styleId=\"{5A111915-BE36-4E01-A7E5-04B1672EAD32}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -4545,8 +4545,8 @@ presetTables["{5A111915-BE36-4E01-A7E5-04B1672EAD32}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{912C8C85-51F0-491E-9774-3900AFEF0FD7}"] = "\
+") },
+{ QStringLiteral("{912C8C85-51F0-491E-9774-3900AFEF0FD7}"), QStringLiteral("\
<a:tblStyle styleId=\"{912C8C85-51F0-491E-9774-3900AFEF0FD7}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -4682,8 +4682,8 @@ presetTables["{912C8C85-51F0-491E-9774-3900AFEF0FD7}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{616DA210-FB5B-4158-B5E0-FEB733F419BA}"] = "\
+") },
+{ QStringLiteral("{616DA210-FB5B-4158-B5E0-FEB733F419BA}"), QStringLiteral("\
<a:tblStyle styleId=\"{616DA210-FB5B-4158-B5E0-FEB733F419BA}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -4813,8 +4813,8 @@ presetTables["{616DA210-FB5B-4158-B5E0-FEB733F419BA}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{BC89EF96-8CEA-46FF-86C4-4CE0E7609802}"] = "\
+") },
+{ QStringLiteral("{BC89EF96-8CEA-46FF-86C4-4CE0E7609802}"), QStringLiteral("\
<a:tblStyle styleId=\"{BC89EF96-8CEA-46FF-86C4-4CE0E7609802}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -4944,8 +4944,8 @@ presetTables["{BC89EF96-8CEA-46FF-86C4-4CE0E7609802}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{5DA37D80-6434-44D0-A028-1B22A696006F}"] = "\
+") },
+{ QStringLiteral("{5DA37D80-6434-44D0-A028-1B22A696006F}"), QStringLiteral("\
<a:tblStyle styleId=\"{5DA37D80-6434-44D0-A028-1B22A696006F}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -5075,8 +5075,8 @@ presetTables["{5DA37D80-6434-44D0-A028-1B22A696006F}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{8799B23B-EC83-4686-B30A-512413B5E67A}"] = "\
+") },
+{ QStringLiteral("{8799B23B-EC83-4686-B30A-512413B5E67A}"), QStringLiteral("\
<a:tblStyle styleId=\"{8799B23B-EC83-4686-B30A-512413B5E67A}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -5206,8 +5206,8 @@ presetTables["{8799B23B-EC83-4686-B30A-512413B5E67A}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{ED083AE6-46FA-4A59-8FB0-9F97EB10719F}"] = "\
+") },
+{ QStringLiteral("{ED083AE6-46FA-4A59-8FB0-9F97EB10719F}"), QStringLiteral("\
<a:tblStyle styleId=\"{ED083AE6-46FA-4A59-8FB0-9F97EB10719F}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -5337,8 +5337,8 @@ presetTables["{ED083AE6-46FA-4A59-8FB0-9F97EB10719F}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{BDBED569-4797-4DF1-A0F4-6AAB3CD982D8}"] = "\
+") },
+{ QStringLiteral("{BDBED569-4797-4DF1-A0F4-6AAB3CD982D8}"), QStringLiteral("\
<a:tblStyle styleId=\"{BDBED569-4797-4DF1-A0F4-6AAB3CD982D8}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -5468,8 +5468,8 @@ presetTables["{BDBED569-4797-4DF1-A0F4-6AAB3CD982D8}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{E8B1032C-EA38-4F05-BA0D-38AFFFC7BED3}"] = "\
+") },
+{ QStringLiteral("{E8B1032C-EA38-4F05-BA0D-38AFFFC7BED3}"), QStringLiteral("\
<a:tblStyle styleId=\"{E8B1032C-EA38-4F05-BA0D-38AFFFC7BED3}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -5599,8 +5599,8 @@ presetTables["{E8B1032C-EA38-4F05-BA0D-38AFFFC7BED3}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{793D81CF-94F2-401A-BA57-92F5A7B2D0C5}"] = "\
+") },
+{ QStringLiteral("{793D81CF-94F2-401A-BA57-92F5A7B2D0C5}"), QStringLiteral("\
<a:tblStyle styleId=\"{793D81CF-94F2-401A-BA57-92F5A7B2D0C5}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -5731,8 +5731,8 @@ presetTables["{793D81CF-94F2-401A-BA57-92F5A7B2D0C5}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{B301B821-A1FF-4177-AEE7-76D212191A09}"] = "\
+") },
+{ QStringLiteral("{B301B821-A1FF-4177-AEE7-76D212191A09}"), QStringLiteral("\
<a:tblStyle styleId=\"{B301B821-A1FF-4177-AEE7-76D212191A09}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -5863,8 +5863,8 @@ presetTables["{B301B821-A1FF-4177-AEE7-76D212191A09}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{9DCAF9ED-07DC-4A11-8D7F-57B35C25682E}"] = "\
+") },
+{ QStringLiteral("{9DCAF9ED-07DC-4A11-8D7F-57B35C25682E}"), QStringLiteral("\
<a:tblStyle styleId=\"{9DCAF9ED-07DC-4A11-8D7F-57B35C25682E}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -5995,8 +5995,8 @@ presetTables["{9DCAF9ED-07DC-4A11-8D7F-57B35C25682E}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{1FECB4D8-DB02-4DC6-A0A2-4F2EBAE1DC90}"] = "\
+") },
+{ QStringLiteral("{1FECB4D8-DB02-4DC6-A0A2-4F2EBAE1DC90}"), QStringLiteral("\
<a:tblStyle styleId=\"{1FECB4D8-DB02-4DC6-A0A2-4F2EBAE1DC90}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -6127,8 +6127,8 @@ presetTables["{1FECB4D8-DB02-4DC6-A0A2-4F2EBAE1DC90}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{1E171933-4619-4E11-9A3F-F7608DF75F80}"] = "\
+") },
+{ QStringLiteral("{1E171933-4619-4E11-9A3F-F7608DF75F80}"), QStringLiteral("\
<a:tblStyle styleId=\"{1E171933-4619-4E11-9A3F-F7608DF75F80}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -6259,8 +6259,8 @@ presetTables["{1E171933-4619-4E11-9A3F-F7608DF75F80}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{FABFCF23-3B69-468F-B69F-88F6DE6A72F2}"] = "\
+") },
+{ QStringLiteral("{FABFCF23-3B69-468F-B69F-88F6DE6A72F2}"), QStringLiteral("\
<a:tblStyle styleId=\"{FABFCF23-3B69-468F-B69F-88F6DE6A72F2}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -6391,8 +6391,8 @@ presetTables["{FABFCF23-3B69-468F-B69F-88F6DE6A72F2}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{10A1B5D5-9B99-4C35-A422-299274C87663}"] = "\
+") },
+{ QStringLiteral("{10A1B5D5-9B99-4C35-A422-299274C87663}"), QStringLiteral("\
<a:tblStyle styleId=\"{10A1B5D5-9B99-4C35-A422-299274C87663}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -6523,8 +6523,8 @@ presetTables["{10A1B5D5-9B99-4C35-A422-299274C87663}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}"] = "\
+") },
+{ QStringLiteral("{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}"), QStringLiteral("\
<a:tblStyle styleId=\"{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -6702,8 +6702,8 @@ presetTables["{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}"] = "\
+") },
+{ QStringLiteral("{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}"), QStringLiteral("\
<a:tblStyle styleId=\"{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -6881,8 +6881,8 @@ presetTables["{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}"] = "\
+") },
+{ QStringLiteral("{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}"), QStringLiteral("\
<a:tblStyle styleId=\"{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -7060,8 +7060,8 @@ presetTables["{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{F5AB1C69-6EDB-4FF4-983F-18BD219EF322}"] = "\
+") },
+{ QStringLiteral("{F5AB1C69-6EDB-4FF4-983F-18BD219EF322}"), QStringLiteral("\
<a:tblStyle styleId=\"{F5AB1C69-6EDB-4FF4-983F-18BD219EF322}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -7239,8 +7239,8 @@ presetTables["{F5AB1C69-6EDB-4FF4-983F-18BD219EF322}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{00A15C55-8517-42AA-B614-E9B94910E393}"] = "\
+") },
+{ QStringLiteral("{00A15C55-8517-42AA-B614-E9B94910E393}"), QStringLiteral("\
<a:tblStyle styleId=\"{00A15C55-8517-42AA-B614-E9B94910E393}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -7418,8 +7418,8 @@ presetTables["{00A15C55-8517-42AA-B614-E9B94910E393}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{7DF18680-E054-41AD-8BC1-D1AEF772440D}"] = "\
+") },
+{ QStringLiteral("{7DF18680-E054-41AD-8BC1-D1AEF772440D}"), QStringLiteral("\
<a:tblStyle styleId=\"{7DF18680-E054-41AD-8BC1-D1AEF772440D}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -7597,8 +7597,8 @@ presetTables["{7DF18680-E054-41AD-8BC1-D1AEF772440D}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{93296810-A885-4BE3-A3E7-6D5BEEA58F35}"] = "\
+") },
+{ QStringLiteral("{93296810-A885-4BE3-A3E7-6D5BEEA58F35}"), QStringLiteral("\
<a:tblStyle styleId=\"{93296810-A885-4BE3-A3E7-6D5BEEA58F35}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -7776,8 +7776,8 @@ presetTables["{93296810-A885-4BE3-A3E7-6D5BEEA58F35}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{8EC20E35-A176-4012-BC5E-935CFFF8708E}"] = "\
+") },
+{ QStringLiteral("{8EC20E35-A176-4012-BC5E-935CFFF8708E}"), QStringLiteral("\
<a:tblStyle styleId=\"{8EC20E35-A176-4012-BC5E-935CFFF8708E}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -7951,8 +7951,8 @@ presetTables["{8EC20E35-A176-4012-BC5E-935CFFF8708E}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{6E25E649-3F16-4E02-A733-19D2CDBF48F0}"] = "\
+") },
+{ QStringLiteral("{6E25E649-3F16-4E02-A733-19D2CDBF48F0}"), QStringLiteral("\
<a:tblStyle styleId=\"{6E25E649-3F16-4E02-A733-19D2CDBF48F0}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -8127,8 +8127,8 @@ presetTables["{6E25E649-3F16-4E02-A733-19D2CDBF48F0}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{85BE263C-DBD7-4A20-BB59-AAB30ACAA65A}"] = "\
+") },
+{ QStringLiteral("{85BE263C-DBD7-4A20-BB59-AAB30ACAA65A}"), QStringLiteral("\
<a:tblStyle styleId=\"{85BE263C-DBD7-4A20-BB59-AAB30ACAA65A}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -8303,8 +8303,8 @@ presetTables["{85BE263C-DBD7-4A20-BB59-AAB30ACAA65A}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{EB344D84-9AFB-497E-A393-DC336BA19D2E}"] = "\
+") },
+{ QStringLiteral("{EB344D84-9AFB-497E-A393-DC336BA19D2E}"), QStringLiteral("\
<a:tblStyle styleId=\"{EB344D84-9AFB-497E-A393-DC336BA19D2E}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -8479,8 +8479,8 @@ presetTables["{EB344D84-9AFB-497E-A393-DC336BA19D2E}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{EB9631B5-78F2-41C9-869B-9F39066F8104}"] = "\
+") },
+{ QStringLiteral("{EB9631B5-78F2-41C9-869B-9F39066F8104}"), QStringLiteral("\
<a:tblStyle styleId=\"{EB9631B5-78F2-41C9-869B-9F39066F8104}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -8655,8 +8655,8 @@ presetTables["{EB9631B5-78F2-41C9-869B-9F39066F8104}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{74C1A8A3-306A-4EB7-A6B1-4F7E0EB9C5D6}"] = "\
+") },
+{ QStringLiteral("{74C1A8A3-306A-4EB7-A6B1-4F7E0EB9C5D6}"), QStringLiteral("\
<a:tblStyle styleId=\"{74C1A8A3-306A-4EB7-A6B1-4F7E0EB9C5D6}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -8831,8 +8831,8 @@ presetTables["{74C1A8A3-306A-4EB7-A6B1-4F7E0EB9C5D6}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{2A488322-F2BA-4B5B-9748-0D474271808F}"] = "\
+") },
+{ QStringLiteral("{2A488322-F2BA-4B5B-9748-0D474271808F}"), QStringLiteral("\
<a:tblStyle styleId=\"{2A488322-F2BA-4B5B-9748-0D474271808F}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -9007,8 +9007,8 @@ presetTables["{2A488322-F2BA-4B5B-9748-0D474271808F}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{D7AC3CCA-C797-4891-BE02-D94E43425B78}"] = "\
+") },
+{ QStringLiteral("{D7AC3CCA-C797-4891-BE02-D94E43425B78}"), QStringLiteral("\
<a:tblStyle styleId=\"{D7AC3CCA-C797-4891-BE02-D94E43425B78}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -9142,8 +9142,8 @@ presetTables["{D7AC3CCA-C797-4891-BE02-D94E43425B78}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{69CF1AB2-1976-4502-BF36-3FF5EA218861}"] = "\
+") },
+{ QStringLiteral("{69CF1AB2-1976-4502-BF36-3FF5EA218861}"), QStringLiteral("\
<a:tblStyle styleId=\"{69CF1AB2-1976-4502-BF36-3FF5EA218861}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -9277,8 +9277,8 @@ presetTables["{69CF1AB2-1976-4502-BF36-3FF5EA218861}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{8A107856-5554-42FB-B03E-39F5DBC370BA}"] = "\
+") },
+{ QStringLiteral("{8A107856-5554-42FB-B03E-39F5DBC370BA}"), QStringLiteral("\
<a:tblStyle styleId=\"{8A107856-5554-42FB-B03E-39F5DBC370BA}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -9412,8 +9412,8 @@ presetTables["{8A107856-5554-42FB-B03E-39F5DBC370BA}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{0505E3EF-67EA-436B-97B2-0124C06EBD24}"] = "\
+") },
+{ QStringLiteral("{0505E3EF-67EA-436B-97B2-0124C06EBD24}"), QStringLiteral("\
<a:tblStyle styleId=\"{0505E3EF-67EA-436B-97B2-0124C06EBD24}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -9547,8 +9547,8 @@ presetTables["{0505E3EF-67EA-436B-97B2-0124C06EBD24}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{C4B1156A-380E-4F78-BDF5-A606A8083BF9}"] = "\
+") },
+{ QStringLiteral("{C4B1156A-380E-4F78-BDF5-A606A8083BF9}"), QStringLiteral("\
<a:tblStyle styleId=\"{C4B1156A-380E-4F78-BDF5-A606A8083BF9}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -9682,8 +9682,8 @@ presetTables["{C4B1156A-380E-4F78-BDF5-A606A8083BF9}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{22838BEF-8BB2-4498-84A7-C5851F593DF1}"] = "\
+") },
+{ QStringLiteral("{22838BEF-8BB2-4498-84A7-C5851F593DF1}"), QStringLiteral("\
<a:tblStyle styleId=\"{22838BEF-8BB2-4498-84A7-C5851F593DF1}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -9817,8 +9817,8 @@ presetTables["{22838BEF-8BB2-4498-84A7-C5851F593DF1}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{16D9F66E-5EB9-4882-86FB-DCBF35E3C3E4}"] = "\
+") },
+{ QStringLiteral("{16D9F66E-5EB9-4882-86FB-DCBF35E3C3E4}"), QStringLiteral("\
<a:tblStyle styleId=\"{16D9F66E-5EB9-4882-86FB-DCBF35E3C3E4}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -9952,8 +9952,8 @@ presetTables["{16D9F66E-5EB9-4882-86FB-DCBF35E3C3E4}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{E8034E78-7F5D-4C2E-B375-FC64B27BC917}"] = "\
+") },
+{ QStringLiteral("{E8034E78-7F5D-4C2E-B375-FC64B27BC917}"), QStringLiteral("\
<a:tblStyle styleId=\"{E8034E78-7F5D-4C2E-B375-FC64B27BC917}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -10155,8 +10155,8 @@ presetTables["{E8034E78-7F5D-4C2E-B375-FC64B27BC917}"] = "\
</a:tcStyle>\
</a:nwCell>\
</a:tblStyle>\
-";
-presetTables["{125E5076-3810-47DD-B79F-674D7AD40C01}"] = "\
+") },
+{ QStringLiteral("{125E5076-3810-47DD-B79F-674D7AD40C01}"), QStringLiteral("\
<a:tblStyle styleId=\"{125E5076-3810-47DD-B79F-674D7AD40C01}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -10356,8 +10356,8 @@ presetTables["{125E5076-3810-47DD-B79F-674D7AD40C01}"] = "\
</a:tcStyle>\
</a:nwCell>\
</a:tblStyle>\
-";
-presetTables["{37CE84F3-28C3-443E-9E96-99CF82512B78}"] = "\
+") },
+{ QStringLiteral("{37CE84F3-28C3-443E-9E96-99CF82512B78}"), QStringLiteral("\
<a:tblStyle styleId=\"{37CE84F3-28C3-443E-9E96-99CF82512B78}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -10557,8 +10557,8 @@ presetTables["{37CE84F3-28C3-443E-9E96-99CF82512B78}"] = "\
</a:tcStyle>\
</a:nwCell>\
</a:tblStyle>\
-";
-presetTables["{D03447BB-5D67-496B-8E87-E561075AD55C}"] = "\
+") },
+{ QStringLiteral("{D03447BB-5D67-496B-8E87-E561075AD55C}"), QStringLiteral("\
<a:tblStyle styleId=\"{D03447BB-5D67-496B-8E87-E561075AD55C}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -10758,8 +10758,8 @@ presetTables["{D03447BB-5D67-496B-8E87-E561075AD55C}"] = "\
</a:tcStyle>\
</a:nwCell>\
</a:tblStyle>\
-";
-presetTables["{E929F9F4-4A8F-4326-A1B4-22849713DDAB}"] = "\
+") },
+{ QStringLiteral("{E929F9F4-4A8F-4326-A1B4-22849713DDAB}"), QStringLiteral("\
<a:tblStyle styleId=\"{E929F9F4-4A8F-4326-A1B4-22849713DDAB}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -10959,8 +10959,8 @@ presetTables["{E929F9F4-4A8F-4326-A1B4-22849713DDAB}"] = "\
</a:tcStyle>\
</a:nwCell>\
</a:tblStyle>\
-";
-presetTables["{8FD4443E-F989-4FC4-A0C8-D5A2AF1F390B}"] = "\
+") },
+{ QStringLiteral("{8FD4443E-F989-4FC4-A0C8-D5A2AF1F390B}"), QStringLiteral("\
<a:tblStyle styleId=\"{8FD4443E-F989-4FC4-A0C8-D5A2AF1F390B}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -11160,8 +11160,8 @@ presetTables["{8FD4443E-F989-4FC4-A0C8-D5A2AF1F390B}"] = "\
</a:tcStyle>\
</a:nwCell>\
</a:tblStyle>\
-";
-presetTables["{AF606853-7671-496A-8E4F-DF71F8EC918B}"] = "\
+") },
+{ QStringLiteral("{AF606853-7671-496A-8E4F-DF71F8EC918B}"), QStringLiteral("\
<a:tblStyle styleId=\"{AF606853-7671-496A-8E4F-DF71F8EC918B}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -11361,8 +11361,8 @@ presetTables["{AF606853-7671-496A-8E4F-DF71F8EC918B}"] = "\
</a:tcStyle>\
</a:nwCell>\
</a:tblStyle>\
-";
-presetTables["{5202B0CA-FC54-4496-8BCA-5EF66A818D29}"] = "\
+") },
+{ QStringLiteral("{5202B0CA-FC54-4496-8BCA-5EF66A818D29}"), QStringLiteral("\
<a:tblStyle styleId=\"{5202B0CA-FC54-4496-8BCA-5EF66A818D29}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -11487,8 +11487,8 @@ presetTables["{5202B0CA-FC54-4496-8BCA-5EF66A818D29}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{0660B408-B3CF-4A94-85FC-2B1E0A45F4A2}"] = "\
+") },
+{ QStringLiteral("{0660B408-B3CF-4A94-85FC-2B1E0A45F4A2}"), QStringLiteral("\
<a:tblStyle styleId=\"{0660B408-B3CF-4A94-85FC-2B1E0A45F4A2}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -11613,8 +11613,8 @@ presetTables["{0660B408-B3CF-4A94-85FC-2B1E0A45F4A2}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{91EBBBCC-DAD2-459C-BE2E-F6DE35CF9A28}"] = "\
+") },
+{ QStringLiteral("{91EBBBCC-DAD2-459C-BE2E-F6DE35CF9A28}"), QStringLiteral("\
<a:tblStyle styleId=\"{91EBBBCC-DAD2-459C-BE2E-F6DE35CF9A28}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -11739,8 +11739,8 @@ presetTables["{91EBBBCC-DAD2-459C-BE2E-F6DE35CF9A28}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
-presetTables["{46F890A9-2807-4EBB-B81D-B2AA78EC7F39}"] = "\
+") },
+{ QStringLiteral("{46F890A9-2807-4EBB-B81D-B2AA78EC7F39}"), QStringLiteral("\
<a:tblStyle styleId=\"{46F890A9-2807-4EBB-B81D-B2AA78EC7F39}\" styleName=\"\">\
<a:wholeTbl>\
<a:tcTxStyle>\
@@ -11865,6 +11865,7 @@ presetTables["{46F890A9-2807-4EBB-B81D-B2AA78EC7F39}"] = "\
</a:tcStyle>\
</a:firstRow>\
</a:tblStyle>\
-";
+") }
+};
return presetTables.value(reference);
}
diff --git a/filters/libodf2/KoTable.cpp b/filters/libodf2/KoTable.cpp
index a239e26aa43..88e969cb2fd 100644
--- a/filters/libodf2/KoTable.cpp
+++ b/filters/libodf2/KoTable.cpp
@@ -23,6 +23,8 @@
#include <KoXmlWriter.h>
+KOSTYLE_DECLARE_SHARED_POINTER_IMPL(KoTable)
+
KoTable::KoTable()
: m_columns()
, m_rows()
diff --git a/filters/libodf2/KoTable.h b/filters/libodf2/KoTable.h
index 5789e02773f..d0c946f33d8 100644
--- a/filters/libodf2/KoTable.h
+++ b/filters/libodf2/KoTable.h
@@ -49,6 +49,8 @@ class KoGenStyles;
class KOODF2_EXPORT KoTable
{
public:
+ KOSTYLE_DECLARE_SHARED_POINTER(KoTable)
+
KoTable();
~KoTable();
diff --git a/filters/stage/pptx/PptxXmlSlideReader.h \
b/filters/stage/pptx/PptxXmlSlideReader.h index ace827b623c..1f8faca1c5b 100644
--- a/filters/stage/pptx/PptxXmlSlideReader.h
+++ b/filters/stage/pptx/PptxXmlSlideReader.h
@@ -29,6 +29,7 @@
#include <MsooXmlDrawingTableStyle.h>
#include <VmlDrawingReader.h>
#include <KoGenStyle.h>
+#include <KoTable.h>
class KoXmlWriter;
class PptxXmlSlideReaderContext;
@@ -39,8 +40,6 @@ class MsooXmlRelationships;
class TableStyleList;
}
-class KoTable;
-
//! Data structure collecting information about single slide's shape (p:sp)
class PptxShapeProperties
{
diff --git a/filters/words/docx/import/DocxXmlDocumentReader.cpp \
b/filters/words/docx/import/DocxXmlDocumentReader.cpp index 760349f6ccf..090d9532680 \
100644
--- a/filters/words/docx/import/DocxXmlDocumentReader.cpp
+++ b/filters/words/docx/import/DocxXmlDocumentReader.cpp
@@ -5438,14 +5438,13 @@ KoFilter::ConversionStatus \
DocxXmlDocumentReader::read_background() //! @todo support all child elements
KoFilter::ConversionStatus DocxXmlDocumentReader::read_tbl()
{
+ m_table = KoTable::create();
+
READ_PROLOGUE
// save current state of lists processing
saveState();
- KoTable table;
- m_table = &table;
-
m_table->setName(QLatin1String("Table") + \
QString::number(++m_currentTableNumber)); m_currentTableRowNumber = 0;
m_currentTableColumnNumber = 0;
@@ -6081,7 +6080,7 @@ KoFilter::ConversionStatus DocxXmlDocumentReader::read_tc()
body = oldBody;
}
else if(QUALIFIED_NAME_IS(tbl)) {
- KoTable* currentTable = m_table;
+ KoTable::Ptr currentTable = m_table;
int currentRow = m_currentTableRowNumber;
int currentColumn = m_currentTableColumnNumber;
MSOOXML::TableStyleProperties* currentDefaultCellStyle = \
m_currentDefaultCellStyle;
diff --git a/filters/words/docx/import/DocxXmlDocumentReader.h \
b/filters/words/docx/import/DocxXmlDocumentReader.h index 38fa71f5c51..0a34b86b1f0 \
100644
--- a/filters/words/docx/import/DocxXmlDocumentReader.h
+++ b/filters/words/docx/import/DocxXmlDocumentReader.h
@@ -36,6 +36,7 @@
#include <styles/KoCharacterStyle.h>
#include <KoBorder.h>
#include <KoTblStyle.h>
+#include <KoTable.h>
//#define NO_DRAWINGML_PICTURE // disables pic:pic, etc. in MsooXmlCommonReader
@@ -48,8 +49,6 @@ struct TableStyleProperties;
class LocalTableStyles;
}
-class KoTable;
-
//! A class reading MSOOXML DOCX markup - document.xml part.
class DocxXmlDocumentReader : public MSOOXML::MsooXmlCommonReader
{
@@ -256,7 +255,7 @@ protected:
// ! Used for setting up properties for border padding
QMap<BorderSide, qreal> m_textBorderPaddings;
- KoTable* m_table;
+ KoTable::Ptr m_table;
QString m_currentTableStyleName;
KoTblStyle::Ptr m_tableMainStyle;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic