From kde-commits Mon Sep 17 13:57:40 2018 From: Anthony Fieroni Date: Mon, 17 Sep 2018 13:57:40 +0000 To: kde-commits Subject: [calligra] filters: Extend table lifetime Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=153719267521545 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 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/l= ibmsooxml/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) =C2=A721.1.3.13 KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_tbl() { + m_table =3D KoTable::create(); + READ_PROLOGUE = bool tableSetByMe =3D false; @@ -55,8 +57,6 @@ KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_tb= l() m_context->import->loadAndParseDocument(&tableStyleReader, m_conte= xt->tableStylesFilePath, &tableStyleReaderContext); } = - m_table =3D new KoTable; - m_table->setName(QLatin1String("Table") + QString::number(m_currentTab= leNumber + 1)); m_currentTableRowNumber =3D 0; m_currentTableColumnNumber =3D 0; @@ -77,8 +77,6 @@ KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_tb= l() = m_table->saveOdf(*body, *mainStyles); = - delete m_table; - m_currentTableNumber++; = if (tableSetByMe) { diff --git a/filters/libmsooxml/MsooXmlDrawingReaderTableMethods.h b/filter= s/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, initiali= zed 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/libmsooxm= l/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 presetTables; -presetTables["{2D5ABB26-0587-4C30-8999-92F81FD0307C}"] =3D "\ +static const QMap presetTables =3D { +{ QStringLiteral("{2D5ABB26-0587-4C30-8999-92F81FD0307C}"), QStringLiteral= ("\ \ \ \ @@ -72,8 +72,8 @@ presetTables["{2D5ABB26-0587-4C30-8999-92F81FD0307C}"] = =3D "\ \ \ \ -"; -presetTables["{3C2FFA5D-87B4-456A-9821-1D502468CF0F}"] =3D "\ +") }, +{ QStringLiteral("{3C2FFA5D-87B4-456A-9821-1D502468CF0F}"), QStringLiteral= ("\ \ \ \ @@ -335,8 +335,8 @@ presetTables["{3C2FFA5D-87B4-456A-9821-1D502468CF0F}"] = =3D "\ \ \ \ -"; -presetTables["{284E427A-3D55-4303-BF80-6455036E1DE7}"] =3D "\ +") }, +{ QStringLiteral("{284E427A-3D55-4303-BF80-6455036E1DE7}"), QStringLiteral= ("\ \ \ \ @@ -598,8 +598,8 @@ presetTables["{284E427A-3D55-4303-BF80-6455036E1DE7}"] = =3D "\ \ \ \ -"; -presetTables["{69C7853C-536D-4A76-A0AE-DD22124D55A5}"] =3D "\ +") }, +{ QStringLiteral("{69C7853C-536D-4A76-A0AE-DD22124D55A5}"), QStringLiteral= ("\ \ \ \ @@ -861,8 +861,8 @@ presetTables["{69C7853C-536D-4A76-A0AE-DD22124D55A5}"] = =3D "\ \ \ \ -"; -presetTables["{775DCB02-9BB8-47FD-8907-85C794F793BA}"] =3D "\ +") }, +{ QStringLiteral("{775DCB02-9BB8-47FD-8907-85C794F793BA}"), QStringLiteral= ("\ \ \ \ @@ -1124,8 +1124,8 @@ presetTables["{775DCB02-9BB8-47FD-8907-85C794F793BA}"= ] =3D "\ \ \ \ -"; -presetTables["{35758FB7-9AC5-4552-8A53-C91805E547FA}"] =3D "\ +") }, +{ QStringLiteral("{35758FB7-9AC5-4552-8A53-C91805E547FA}"), QStringLiteral= ("\ \ \ \ @@ -1387,8 +1387,8 @@ presetTables["{35758FB7-9AC5-4552-8A53-C91805E547FA}"= ] =3D "\ \ \ \ -"; -presetTables["{08FB837D-C827-4EFA-A057-4D05807E0F7C}"] =3D "\ +") }, +{ QStringLiteral("{08FB837D-C827-4EFA-A057-4D05807E0F7C}"), QStringLiteral= ("\ \ \ \ @@ -1650,8 +1650,8 @@ presetTables["{08FB837D-C827-4EFA-A057-4D05807E0F7C}"= ] =3D "\ \ \ \ -"; -presetTables["{5940675A-B579-460E-94D1-54222C63F5DA}"] =3D "\ +") }, +{ QStringLiteral("{5940675A-B579-460E-94D1-54222C63F5DA}"), QStringLiteral= ("\ \ \ \ @@ -1711,8 +1711,8 @@ presetTables["{5940675A-B579-460E-94D1-54222C63F5DA}"= ] =3D "\ \ \ \ -"; -presetTables["{D113A9D2-9D6B-4929-AA2D-F23B5EE8CBE7}"] =3D "\ +") }, +{ QStringLiteral("{D113A9D2-9D6B-4929-AA2D-F23B5EE8CBE7}"), QStringLiteral= ("\ \ \ \ @@ -1897,8 +1897,8 @@ presetTables["{D113A9D2-9D6B-4929-AA2D-F23B5EE8CBE7}"= ] =3D "\ \ \ \ -"; -presetTables["{18603FDC-E32A-4AB5-989C-0864C3EAD2B8}"] =3D "\ +") }, +{ QStringLiteral("{18603FDC-E32A-4AB5-989C-0864C3EAD2B8}"), QStringLiteral= ("\ \ \ \ @@ -2083,8 +2083,8 @@ presetTables["{18603FDC-E32A-4AB5-989C-0864C3EAD2B8}"= ] =3D "\ \ \ \ -"; -presetTables["{306799F8-075E-4A3A-A7F6-7FBC6576F1A4}"] =3D "\ +") }, +{ QStringLiteral("{306799F8-075E-4A3A-A7F6-7FBC6576F1A4}"), QStringLiteral= ("\ \ \ \ @@ -2269,8 +2269,8 @@ presetTables["{306799F8-075E-4A3A-A7F6-7FBC6576F1A4}"= ] =3D "\ \ \ \ -"; -presetTables["{E269D01E-BC32-4049-B463-5C60D7B0CCD2}"] =3D "\ +") }, +{ QStringLiteral("{E269D01E-BC32-4049-B463-5C60D7B0CCD2}"), QStringLiteral= ("\ \ \ \ @@ -2455,8 +2455,8 @@ presetTables["{E269D01E-BC32-4049-B463-5C60D7B0CCD2}"= ] =3D "\ \ \ \ -"; -presetTables["{327F97BB-C833-4FB7-BDE5-3F7075034690}"] =3D "\ +") }, +{ QStringLiteral("{327F97BB-C833-4FB7-BDE5-3F7075034690}"), QStringLiteral= ("\ \ \ \ @@ -2641,8 +2641,8 @@ presetTables["{327F97BB-C833-4FB7-BDE5-3F7075034690}"= ] =3D "\ \ \ \ -"; -presetTables["{638B1855-1B75-4FBE-930C-398BA8C253C6}"] =3D "\ +") }, +{ QStringLiteral("{638B1855-1B75-4FBE-930C-398BA8C253C6}"), QStringLiteral= ("\ \ \ \ @@ -2827,8 +2827,8 @@ presetTables["{638B1855-1B75-4FBE-930C-398BA8C253C6}"= ] =3D "\ \ \ \ -"; -presetTables["{9D7B26C5-4107-4FEC-AEDC-1716B250A1EF}"] =3D "\ +") }, +{ QStringLiteral("{9D7B26C5-4107-4FEC-AEDC-1716B250A1EF}"), QStringLiteral= ("\ \ \ \ @@ -2955,8 +2955,8 @@ presetTables["{9D7B26C5-4107-4FEC-AEDC-1716B250A1EF}"= ] =3D "\ \ \ \ -"; -presetTables["{3B4B98B0-60AC-42C2-AFA5-B58CD77FA1E5}"] =3D "\ +") }, +{ QStringLiteral("{3B4B98B0-60AC-42C2-AFA5-B58CD77FA1E5}"), QStringLiteral= ("\ \ \ \ @@ -3083,8 +3083,8 @@ presetTables["{3B4B98B0-60AC-42C2-AFA5-B58CD77FA1E5}"= ] =3D "\ \ \ \ -"; -presetTables["{0E3FDE45-AF77-4B5C-9715-49D594BDF05E}"] =3D "\ +") }, +{ QStringLiteral("{0E3FDE45-AF77-4B5C-9715-49D594BDF05E}"), QStringLiteral= ("\ \ \ \ @@ -3211,8 +3211,8 @@ presetTables["{0E3FDE45-AF77-4B5C-9715-49D594BDF05E}"= ] =3D "\ \ \ \ -"; -presetTables["{C083E6E3-FA7D-4D7B-A595-EF9225AFEA82}"] =3D "\ +") }, +{ QStringLiteral("{C083E6E3-FA7D-4D7B-A595-EF9225AFEA82}"), QStringLiteral= ("\ \ \ \ @@ -3339,8 +3339,8 @@ presetTables["{C083E6E3-FA7D-4D7B-A595-EF9225AFEA82}"= ] =3D "\ \ \ \ -"; -presetTables["{D27102A9-8310-4765-A935-A1911B00CA55}"] =3D "\ +") }, +{ QStringLiteral("{D27102A9-8310-4765-A935-A1911B00CA55}"), QStringLiteral= ("\ \ \ \ @@ -3467,8 +3467,8 @@ presetTables["{D27102A9-8310-4765-A935-A1911B00CA55}"= ] =3D "\ \ \ \ -"; -presetTables["{5FD0F851-EC5A-4D38-B0AD-8093EC10F338}"] =3D "\ +") }, +{ QStringLiteral("{5FD0F851-EC5A-4D38-B0AD-8093EC10F338}"), QStringLiteral= ("\ \ \ \ @@ -3595,8 +3595,8 @@ presetTables["{5FD0F851-EC5A-4D38-B0AD-8093EC10F338}"= ] =3D "\ \ \ \ -"; -presetTables["{68D230F3-CF80-4859-8CE7-A43EE81993B5}"] =3D "\ +") }, +{ QStringLiteral("{68D230F3-CF80-4859-8CE7-A43EE81993B5}"), QStringLiteral= ("\ \ \ \ @@ -3723,8 +3723,8 @@ presetTables["{68D230F3-CF80-4859-8CE7-A43EE81993B5}"= ] =3D "\ \ \ \ -"; -presetTables["{7E9639D4-E3E2-4D34-9284-5A2195B3D0D7}"] =3D "\ +") }, +{ QStringLiteral("{7E9639D4-E3E2-4D34-9284-5A2195B3D0D7}"), QStringLiteral= ("\ \ \ \ @@ -3860,8 +3860,8 @@ presetTables["{7E9639D4-E3E2-4D34-9284-5A2195B3D0D7}"= ] =3D "\ \ \ \ -"; -presetTables["{69012ECD-51FC-41F1-AA8D-1B2483CD663E}"] =3D "\ +") }, +{ QStringLiteral("{69012ECD-51FC-41F1-AA8D-1B2483CD663E}"), QStringLiteral= ("\ \ \ \ @@ -3997,8 +3997,8 @@ presetTables["{69012ECD-51FC-41F1-AA8D-1B2483CD663E}"= ] =3D "\ \ \ \ -"; -presetTables["{72833802-FEF1-4C79-8D5D-14CF1EAF98D9}"] =3D "\ +") }, +{ QStringLiteral("{72833802-FEF1-4C79-8D5D-14CF1EAF98D9}"), QStringLiteral= ("\ \ \ \ @@ -4134,8 +4134,8 @@ presetTables["{72833802-FEF1-4C79-8D5D-14CF1EAF98D9}"= ] =3D "\ \ \ \ -"; -presetTables["{F2DE63D5-997A-4646-A377-4702673A728D}"] =3D "\ +") }, +{ QStringLiteral("{F2DE63D5-997A-4646-A377-4702673A728D}"), QStringLiteral= ("\ \ \ \ @@ -4271,8 +4271,8 @@ presetTables["{F2DE63D5-997A-4646-A377-4702673A728D}"= ] =3D "\ \ \ \ -"; -presetTables["{17292A2E-F333-43FB-9621-5CBBE7FDCDCB}"] =3D "\ +") }, +{ QStringLiteral("{17292A2E-F333-43FB-9621-5CBBE7FDCDCB}"), QStringLiteral= ("\ \ \ \ @@ -4408,8 +4408,8 @@ presetTables["{17292A2E-F333-43FB-9621-5CBBE7FDCDCB}"= ] =3D "\ \ \ \ -"; -presetTables["{5A111915-BE36-4E01-A7E5-04B1672EAD32}"] =3D "\ +") }, +{ QStringLiteral("{5A111915-BE36-4E01-A7E5-04B1672EAD32}"), QStringLiteral= ("\ \ \ \ @@ -4545,8 +4545,8 @@ presetTables["{5A111915-BE36-4E01-A7E5-04B1672EAD32}"= ] =3D "\ \ \ \ -"; -presetTables["{912C8C85-51F0-491E-9774-3900AFEF0FD7}"] =3D "\ +") }, +{ QStringLiteral("{912C8C85-51F0-491E-9774-3900AFEF0FD7}"), QStringLiteral= ("\ \ \ \ @@ -4682,8 +4682,8 @@ presetTables["{912C8C85-51F0-491E-9774-3900AFEF0FD7}"= ] =3D "\ \ \ \ -"; -presetTables["{616DA210-FB5B-4158-B5E0-FEB733F419BA}"] =3D "\ +") }, +{ QStringLiteral("{616DA210-FB5B-4158-B5E0-FEB733F419BA}"), QStringLiteral= ("\ \ \ \ @@ -4813,8 +4813,8 @@ presetTables["{616DA210-FB5B-4158-B5E0-FEB733F419BA}"= ] =3D "\ \ \ \ -"; -presetTables["{BC89EF96-8CEA-46FF-86C4-4CE0E7609802}"] =3D "\ +") }, +{ QStringLiteral("{BC89EF96-8CEA-46FF-86C4-4CE0E7609802}"), QStringLiteral= ("\ \ \ \ @@ -4944,8 +4944,8 @@ presetTables["{BC89EF96-8CEA-46FF-86C4-4CE0E7609802}"= ] =3D "\ \ \ \ -"; -presetTables["{5DA37D80-6434-44D0-A028-1B22A696006F}"] =3D "\ +") }, +{ QStringLiteral("{5DA37D80-6434-44D0-A028-1B22A696006F}"), QStringLiteral= ("\ \ \ \ @@ -5075,8 +5075,8 @@ presetTables["{5DA37D80-6434-44D0-A028-1B22A696006F}"= ] =3D "\ \ \ \ -"; -presetTables["{8799B23B-EC83-4686-B30A-512413B5E67A}"] =3D "\ +") }, +{ QStringLiteral("{8799B23B-EC83-4686-B30A-512413B5E67A}"), QStringLiteral= ("\ \ \ \ @@ -5206,8 +5206,8 @@ presetTables["{8799B23B-EC83-4686-B30A-512413B5E67A}"= ] =3D "\ \ \ \ -"; -presetTables["{ED083AE6-46FA-4A59-8FB0-9F97EB10719F}"] =3D "\ +") }, +{ QStringLiteral("{ED083AE6-46FA-4A59-8FB0-9F97EB10719F}"), QStringLiteral= ("\ \ \ \ @@ -5337,8 +5337,8 @@ presetTables["{ED083AE6-46FA-4A59-8FB0-9F97EB10719F}"= ] =3D "\ \ \ \ -"; -presetTables["{BDBED569-4797-4DF1-A0F4-6AAB3CD982D8}"] =3D "\ +") }, +{ QStringLiteral("{BDBED569-4797-4DF1-A0F4-6AAB3CD982D8}"), QStringLiteral= ("\ \ \ \ @@ -5468,8 +5468,8 @@ presetTables["{BDBED569-4797-4DF1-A0F4-6AAB3CD982D8}"= ] =3D "\ \ \ \ -"; -presetTables["{E8B1032C-EA38-4F05-BA0D-38AFFFC7BED3}"] =3D "\ +") }, +{ QStringLiteral("{E8B1032C-EA38-4F05-BA0D-38AFFFC7BED3}"), QStringLiteral= ("\ \ \ \ @@ -5599,8 +5599,8 @@ presetTables["{E8B1032C-EA38-4F05-BA0D-38AFFFC7BED3}"= ] =3D "\ \ \ \ -"; -presetTables["{793D81CF-94F2-401A-BA57-92F5A7B2D0C5}"] =3D "\ +") }, +{ QStringLiteral("{793D81CF-94F2-401A-BA57-92F5A7B2D0C5}"), QStringLiteral= ("\ \ \ \ @@ -5731,8 +5731,8 @@ presetTables["{793D81CF-94F2-401A-BA57-92F5A7B2D0C5}"= ] =3D "\ \ \ \ -"; -presetTables["{B301B821-A1FF-4177-AEE7-76D212191A09}"] =3D "\ +") }, +{ QStringLiteral("{B301B821-A1FF-4177-AEE7-76D212191A09}"), QStringLiteral= ("\ \ \ \ @@ -5863,8 +5863,8 @@ presetTables["{B301B821-A1FF-4177-AEE7-76D212191A09}"= ] =3D "\ \ \ \ -"; -presetTables["{9DCAF9ED-07DC-4A11-8D7F-57B35C25682E}"] =3D "\ +") }, +{ QStringLiteral("{9DCAF9ED-07DC-4A11-8D7F-57B35C25682E}"), QStringLiteral= ("\ \ \ \ @@ -5995,8 +5995,8 @@ presetTables["{9DCAF9ED-07DC-4A11-8D7F-57B35C25682E}"= ] =3D "\ \ \ \ -"; -presetTables["{1FECB4D8-DB02-4DC6-A0A2-4F2EBAE1DC90}"] =3D "\ +") }, +{ QStringLiteral("{1FECB4D8-DB02-4DC6-A0A2-4F2EBAE1DC90}"), QStringLiteral= ("\ \ \ \ @@ -6127,8 +6127,8 @@ presetTables["{1FECB4D8-DB02-4DC6-A0A2-4F2EBAE1DC90}"= ] =3D "\ \ \ \ -"; -presetTables["{1E171933-4619-4E11-9A3F-F7608DF75F80}"] =3D "\ +") }, +{ QStringLiteral("{1E171933-4619-4E11-9A3F-F7608DF75F80}"), QStringLiteral= ("\ \ \ \ @@ -6259,8 +6259,8 @@ presetTables["{1E171933-4619-4E11-9A3F-F7608DF75F80}"= ] =3D "\ \ \ \ -"; -presetTables["{FABFCF23-3B69-468F-B69F-88F6DE6A72F2}"] =3D "\ +") }, +{ QStringLiteral("{FABFCF23-3B69-468F-B69F-88F6DE6A72F2}"), QStringLiteral= ("\ \ \ \ @@ -6391,8 +6391,8 @@ presetTables["{FABFCF23-3B69-468F-B69F-88F6DE6A72F2}"= ] =3D "\ \ \ \ -"; -presetTables["{10A1B5D5-9B99-4C35-A422-299274C87663}"] =3D "\ +") }, +{ QStringLiteral("{10A1B5D5-9B99-4C35-A422-299274C87663}"), QStringLiteral= ("\ \ \ \ @@ -6523,8 +6523,8 @@ presetTables["{10A1B5D5-9B99-4C35-A422-299274C87663}"= ] =3D "\ \ \ \ -"; -presetTables["{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}"] =3D "\ +") }, +{ QStringLiteral("{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}"), QStringLiteral= ("\ \ \ \ @@ -6702,8 +6702,8 @@ presetTables["{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}"= ] =3D "\ \ \ \ -"; -presetTables["{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}"] =3D "\ +") }, +{ QStringLiteral("{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}"), QStringLiteral= ("\ \ \ \ @@ -6881,8 +6881,8 @@ presetTables["{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}"= ] =3D "\ \ \ \ -"; -presetTables["{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}"] =3D "\ +") }, +{ QStringLiteral("{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}"), QStringLiteral= ("\ \ \ \ @@ -7060,8 +7060,8 @@ presetTables["{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}"= ] =3D "\ \ \ \ -"; -presetTables["{F5AB1C69-6EDB-4FF4-983F-18BD219EF322}"] =3D "\ +") }, +{ QStringLiteral("{F5AB1C69-6EDB-4FF4-983F-18BD219EF322}"), QStringLiteral= ("\ \ \ \ @@ -7239,8 +7239,8 @@ presetTables["{F5AB1C69-6EDB-4FF4-983F-18BD219EF322}"= ] =3D "\ \ \ \ -"; -presetTables["{00A15C55-8517-42AA-B614-E9B94910E393}"] =3D "\ +") }, +{ QStringLiteral("{00A15C55-8517-42AA-B614-E9B94910E393}"), QStringLiteral= ("\ \ \ \ @@ -7418,8 +7418,8 @@ presetTables["{00A15C55-8517-42AA-B614-E9B94910E393}"= ] =3D "\ \ \ \ -"; -presetTables["{7DF18680-E054-41AD-8BC1-D1AEF772440D}"] =3D "\ +") }, +{ QStringLiteral("{7DF18680-E054-41AD-8BC1-D1AEF772440D}"), QStringLiteral= ("\ \ \ \ @@ -7597,8 +7597,8 @@ presetTables["{7DF18680-E054-41AD-8BC1-D1AEF772440D}"= ] =3D "\ \ \ \ -"; -presetTables["{93296810-A885-4BE3-A3E7-6D5BEEA58F35}"] =3D "\ +") }, +{ QStringLiteral("{93296810-A885-4BE3-A3E7-6D5BEEA58F35}"), QStringLiteral= ("\ \ \ \ @@ -7776,8 +7776,8 @@ presetTables["{93296810-A885-4BE3-A3E7-6D5BEEA58F35}"= ] =3D "\ \ \ \ -"; -presetTables["{8EC20E35-A176-4012-BC5E-935CFFF8708E}"] =3D "\ +") }, +{ QStringLiteral("{8EC20E35-A176-4012-BC5E-935CFFF8708E}"), QStringLiteral= ("\ \ \ \ @@ -7951,8 +7951,8 @@ presetTables["{8EC20E35-A176-4012-BC5E-935CFFF8708E}"= ] =3D "\ \ \ \ -"; -presetTables["{6E25E649-3F16-4E02-A733-19D2CDBF48F0}"] =3D "\ +") }, +{ QStringLiteral("{6E25E649-3F16-4E02-A733-19D2CDBF48F0}"), QStringLiteral= ("\ \ \ \ @@ -8127,8 +8127,8 @@ presetTables["{6E25E649-3F16-4E02-A733-19D2CDBF48F0}"= ] =3D "\ \ \ \ -"; -presetTables["{85BE263C-DBD7-4A20-BB59-AAB30ACAA65A}"] =3D "\ +") }, +{ QStringLiteral("{85BE263C-DBD7-4A20-BB59-AAB30ACAA65A}"), QStringLiteral= ("\ \ \ \ @@ -8303,8 +8303,8 @@ presetTables["{85BE263C-DBD7-4A20-BB59-AAB30ACAA65A}"= ] =3D "\ \ \ \ -"; -presetTables["{EB344D84-9AFB-497E-A393-DC336BA19D2E}"] =3D "\ +") }, +{ QStringLiteral("{EB344D84-9AFB-497E-A393-DC336BA19D2E}"), QStringLiteral= ("\ \ \ \ @@ -8479,8 +8479,8 @@ presetTables["{EB344D84-9AFB-497E-A393-DC336BA19D2E}"= ] =3D "\ \ \ \ -"; -presetTables["{EB9631B5-78F2-41C9-869B-9F39066F8104}"] =3D "\ +") }, +{ QStringLiteral("{EB9631B5-78F2-41C9-869B-9F39066F8104}"), QStringLiteral= ("\ \ \ \ @@ -8655,8 +8655,8 @@ presetTables["{EB9631B5-78F2-41C9-869B-9F39066F8104}"= ] =3D "\ \ \ \ -"; -presetTables["{74C1A8A3-306A-4EB7-A6B1-4F7E0EB9C5D6}"] =3D "\ +") }, +{ QStringLiteral("{74C1A8A3-306A-4EB7-A6B1-4F7E0EB9C5D6}"), QStringLiteral= ("\ \ \ \ @@ -8831,8 +8831,8 @@ presetTables["{74C1A8A3-306A-4EB7-A6B1-4F7E0EB9C5D6}"= ] =3D "\ \ \ \ -"; -presetTables["{2A488322-F2BA-4B5B-9748-0D474271808F}"] =3D "\ +") }, +{ QStringLiteral("{2A488322-F2BA-4B5B-9748-0D474271808F}"), QStringLiteral= ("\ \ \ \ @@ -9007,8 +9007,8 @@ presetTables["{2A488322-F2BA-4B5B-9748-0D474271808F}"= ] =3D "\ \ \ \ -"; -presetTables["{D7AC3CCA-C797-4891-BE02-D94E43425B78}"] =3D "\ +") }, +{ QStringLiteral("{D7AC3CCA-C797-4891-BE02-D94E43425B78}"), QStringLiteral= ("\ \ \ \ @@ -9142,8 +9142,8 @@ presetTables["{D7AC3CCA-C797-4891-BE02-D94E43425B78}"= ] =3D "\ \ \ \ -"; -presetTables["{69CF1AB2-1976-4502-BF36-3FF5EA218861}"] =3D "\ +") }, +{ QStringLiteral("{69CF1AB2-1976-4502-BF36-3FF5EA218861}"), QStringLiteral= ("\ \ \ \ @@ -9277,8 +9277,8 @@ presetTables["{69CF1AB2-1976-4502-BF36-3FF5EA218861}"= ] =3D "\ \ \ \ -"; -presetTables["{8A107856-5554-42FB-B03E-39F5DBC370BA}"] =3D "\ +") }, +{ QStringLiteral("{8A107856-5554-42FB-B03E-39F5DBC370BA}"), QStringLiteral= ("\ \ \ \ @@ -9412,8 +9412,8 @@ presetTables["{8A107856-5554-42FB-B03E-39F5DBC370BA}"= ] =3D "\ \ \ \ -"; -presetTables["{0505E3EF-67EA-436B-97B2-0124C06EBD24}"] =3D "\ +") }, +{ QStringLiteral("{0505E3EF-67EA-436B-97B2-0124C06EBD24}"), QStringLiteral= ("\ \ \ \ @@ -9547,8 +9547,8 @@ presetTables["{0505E3EF-67EA-436B-97B2-0124C06EBD24}"= ] =3D "\ \ \ \ -"; -presetTables["{C4B1156A-380E-4F78-BDF5-A606A8083BF9}"] =3D "\ +") }, +{ QStringLiteral("{C4B1156A-380E-4F78-BDF5-A606A8083BF9}"), QStringLiteral= ("\ \ \ \ @@ -9682,8 +9682,8 @@ presetTables["{C4B1156A-380E-4F78-BDF5-A606A8083BF9}"= ] =3D "\ \ \ \ -"; -presetTables["{22838BEF-8BB2-4498-84A7-C5851F593DF1}"] =3D "\ +") }, +{ QStringLiteral("{22838BEF-8BB2-4498-84A7-C5851F593DF1}"), QStringLiteral= ("\ \ \ \ @@ -9817,8 +9817,8 @@ presetTables["{22838BEF-8BB2-4498-84A7-C5851F593DF1}"= ] =3D "\ \ \ \ -"; -presetTables["{16D9F66E-5EB9-4882-86FB-DCBF35E3C3E4}"] =3D "\ +") }, +{ QStringLiteral("{16D9F66E-5EB9-4882-86FB-DCBF35E3C3E4}"), QStringLiteral= ("\ \ \ \ @@ -9952,8 +9952,8 @@ presetTables["{16D9F66E-5EB9-4882-86FB-DCBF35E3C3E4}"= ] =3D "\ \ \ \ -"; -presetTables["{E8034E78-7F5D-4C2E-B375-FC64B27BC917}"] =3D "\ +") }, +{ QStringLiteral("{E8034E78-7F5D-4C2E-B375-FC64B27BC917}"), QStringLiteral= ("\ \ \ \ @@ -10155,8 +10155,8 @@ presetTables["{E8034E78-7F5D-4C2E-B375-FC64B27BC917= }"] =3D "\ \ \ \ -"; -presetTables["{125E5076-3810-47DD-B79F-674D7AD40C01}"] =3D "\ +") }, +{ QStringLiteral("{125E5076-3810-47DD-B79F-674D7AD40C01}"), QStringLiteral= ("\ \ \ \ @@ -10356,8 +10356,8 @@ presetTables["{125E5076-3810-47DD-B79F-674D7AD40C01= }"] =3D "\ \ \ \ -"; -presetTables["{37CE84F3-28C3-443E-9E96-99CF82512B78}"] =3D "\ +") }, +{ QStringLiteral("{37CE84F3-28C3-443E-9E96-99CF82512B78}"), QStringLiteral= ("\ \ \ \ @@ -10557,8 +10557,8 @@ presetTables["{37CE84F3-28C3-443E-9E96-99CF82512B78= }"] =3D "\ \ \ \ -"; -presetTables["{D03447BB-5D67-496B-8E87-E561075AD55C}"] =3D "\ +") }, +{ QStringLiteral("{D03447BB-5D67-496B-8E87-E561075AD55C}"), QStringLiteral= ("\ \ \ \ @@ -10758,8 +10758,8 @@ presetTables["{D03447BB-5D67-496B-8E87-E561075AD55C= }"] =3D "\ \ \ \ -"; -presetTables["{E929F9F4-4A8F-4326-A1B4-22849713DDAB}"] =3D "\ +") }, +{ QStringLiteral("{E929F9F4-4A8F-4326-A1B4-22849713DDAB}"), QStringLiteral= ("\ \ \ \ @@ -10959,8 +10959,8 @@ presetTables["{E929F9F4-4A8F-4326-A1B4-22849713DDAB= }"] =3D "\ \ \ \ -"; -presetTables["{8FD4443E-F989-4FC4-A0C8-D5A2AF1F390B}"] =3D "\ +") }, +{ QStringLiteral("{8FD4443E-F989-4FC4-A0C8-D5A2AF1F390B}"), QStringLiteral= ("\ \ \ \ @@ -11160,8 +11160,8 @@ presetTables["{8FD4443E-F989-4FC4-A0C8-D5A2AF1F390B= }"] =3D "\ \ \ \ -"; -presetTables["{AF606853-7671-496A-8E4F-DF71F8EC918B}"] =3D "\ +") }, +{ QStringLiteral("{AF606853-7671-496A-8E4F-DF71F8EC918B}"), QStringLiteral= ("\ \ \ \ @@ -11361,8 +11361,8 @@ presetTables["{AF606853-7671-496A-8E4F-DF71F8EC918B= }"] =3D "\ \ \ \ -"; -presetTables["{5202B0CA-FC54-4496-8BCA-5EF66A818D29}"] =3D "\ +") }, +{ QStringLiteral("{5202B0CA-FC54-4496-8BCA-5EF66A818D29}"), QStringLiteral= ("\ \ \ \ @@ -11487,8 +11487,8 @@ presetTables["{5202B0CA-FC54-4496-8BCA-5EF66A818D29= }"] =3D "\ \ \ \ -"; -presetTables["{0660B408-B3CF-4A94-85FC-2B1E0A45F4A2}"] =3D "\ +") }, +{ QStringLiteral("{0660B408-B3CF-4A94-85FC-2B1E0A45F4A2}"), QStringLiteral= ("\ \ \ \ @@ -11613,8 +11613,8 @@ presetTables["{0660B408-B3CF-4A94-85FC-2B1E0A45F4A2= }"] =3D "\ \ \ \ -"; -presetTables["{91EBBBCC-DAD2-459C-BE2E-F6DE35CF9A28}"] =3D "\ +") }, +{ QStringLiteral("{91EBBBCC-DAD2-459C-BE2E-F6DE35CF9A28}"), QStringLiteral= ("\ \ \ \ @@ -11739,8 +11739,8 @@ presetTables["{91EBBBCC-DAD2-459C-BE2E-F6DE35CF9A28= }"] =3D "\ \ \ \ -"; -presetTables["{46F890A9-2807-4EBB-B81D-B2AA78EC7F39}"] =3D "\ +") }, +{ QStringLiteral("{46F890A9-2807-4EBB-B81D-B2AA78EC7F39}"), QStringLiteral= ("\ \ \ \ @@ -11865,6 +11865,7 @@ presetTables["{46F890A9-2807-4EBB-B81D-B2AA78EC7F39= }"] =3D "\ \ \ \ -"; +") } +}; 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 = +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/P= ptxXmlSlideReader.h index ace827b623c..1f8faca1c5b 100644 --- a/filters/stage/pptx/PptxXmlSlideReader.h +++ b/filters/stage/pptx/PptxXmlSlideReader.h @@ -29,6 +29,7 @@ #include #include #include +#include = 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::r= ead_background() //! @todo support all child elements KoFilter::ConversionStatus DocxXmlDocumentReader::read_tbl() { + m_table =3D KoTable::create(); + READ_PROLOGUE = // save current state of lists processing saveState(); = - KoTable table; - m_table =3D &table; - m_table->setName(QLatin1String("Table") + QString::number(++m_currentT= ableNumber)); m_currentTableRowNumber =3D 0; m_currentTableColumnNumber =3D 0; @@ -6081,7 +6080,7 @@ KoFilter::ConversionStatus DocxXmlDocumentReader::rea= d_tc() body =3D oldBody; } else if(QUALIFIED_NAME_IS(tbl)) { - KoTable* currentTable =3D m_table; + KoTable::Ptr currentTable =3D m_table; int currentRow =3D m_currentTableRowNumber; int currentColumn =3D m_currentTableColumnNumber; MSOOXML::TableStyleProperties* currentDefaultCellStyle =3D= m_currentDefaultCellStyle; diff --git a/filters/words/docx/import/DocxXmlDocumentReader.h b/filters/wo= rds/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 #include #include +#include = //#define NO_DRAWINGML_PICTURE // disables pic:pic, etc. in MsooXmlCommonR= eader = @@ -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 m_textBorderPaddings; = - KoTable* m_table; + KoTable::Ptr m_table; QString m_currentTableStyleName; KoTblStyle::Ptr m_tableMainStyle; =