From koffice-devel Tue Mar 30 07:51:15 2010 From: jos.van.den.oever () kogmbh ! com Date: Tue, 30 Mar 2010 07:51:15 +0000 To: koffice-devel Subject: Re: Review Request: KoGenStyle(s) cleanup Message-Id: <20100330075115.1255.39817 () localhost> X-MARC-Message: https://marc.info/?l=koffice-devel&m=126993552213486 ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://reviewboard.kde.org/r/3090/#review4770 ----------------------------------------------------------- Ship it! The patch is a large. It compiles and works fine on the couple of ppt files I tested it with. Thanks for all that work. - vandenoever On 2010-03-29 22:57:28, Jaroslaw Staniek wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://reviewboard.kde.org/r/3090/ > ----------------------------------------------------------- > > (Updated 2010-03-29 22:57:28) > > > Review request for KOffice. > > > Summary > ------- > > NOTE: the patch only contains changes to KoGenStyle*.* files. Required updates for other KOffice code shall be provided after this patch is approved. > > * KoGenStyle::Type cleanup: > - renamed StyleUser to StyleParagraph > - renamed StyleAuto to StyleParagraphAuto > - move the 'Auto' to the end for the table style families > > * KoGenStyles::Flags made QFlags > > * KoGenStyles::lookup() -> KoGenStyles::insert() > > * move KoGenStyle::isEmpty() code to .cpp > > * use constFind(), constBegin(), constEnd() for iterators if possible > > * made some methods const > > * introduced KoGenStyles::StylesPlacement for saving odf and inserting raw styles. > > * insertRawStyles() replaces 4 methods. saveOdfStyles() replaces 4 other methods. > > * KoGenStyle::N_NumTypes -> KoGenStyle::N_NumPropertyTypes > > * added KoGenStyle::N_NumTypes > > * KoGenStyles: StyleArray -> QList > > * KoGenStyles: NameMap typedef removed, using just QSet is clear > > * To minimize size of the patch, I am noting down remaining possible TODOs: > > TODO 1: make KoGenStyle implicitly shared: optimizes and fixes risk of BIC changes because of m_properties > > TODO 2: add QList KoGenStyles::Private::stylesForTypes[KoGenStyle::N_NumTypes] for optimizing static QList styles(const QSet& names, KoGenStyle::Type type) > > TODO 3: replace QSet KoGenStyles::Private::styleNames with QMap KoGenStyles::Private::styles > for optimizing const KoGenStyle* KoGenStyles::style(const QString& name) const > > DONE: implement qDebug() for KoGenStyles instead of dump() > > TODO 5: implement qDebug() for KoGenStyle instead of printDebug() > > TODO 6: rename to KoOdfStyle(s) > > > Diffs > ----- > > trunk/koffice/filters/kword/msword-odf/graphicshandler.cpp 1108560 > trunk/koffice/filters/kword/msword-odf/mswordodfimport.cpp 1108560 > trunk/koffice/filters/kword/msword-odf/paragraph.cpp 1108560 > trunk/koffice/filters/kword/msword-odf/tablehandler.cpp 1108560 > trunk/koffice/filters/kword/msword-odf/texthandler.cpp 1108560 > trunk/koffice/filters/libmso/shapes.cpp 1108560 > trunk/koffice/filters/libmsooxml/KoOdfExporter.cpp 1108560 > trunk/koffice/filters/libmsooxml/MsooXmlCommonReader.cpp 1108560 > trunk/koffice/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h 1108560 > trunk/koffice/filters/kword/docx/DocxXmlDocumentReader.cpp 1108560 > trunk/koffice/filters/kword/docx/DocxXmlFontTableReader.cpp 1108560 > trunk/koffice/filters/kword/docx/DocxXmlStylesReader.cpp 1108560 > trunk/koffice/filters/kword/kword1.3/import/kword13oasisgenerator.cpp 1108560 > trunk/koffice/filters/kword/msword-odf/document.cpp 1108560 > trunk/koffice/filters/kword/docx/DocxImport.cpp 1108560 > trunk/koffice/filters/kspread/xlsx/XlsxImport.cpp 1108560 > trunk/koffice/filters/kspread/xlsx/XlsxXmlCommonReader.cpp 1108560 > trunk/koffice/filters/kspread/xlsx/XlsxXmlDocumentReader.cpp 1108560 > trunk/koffice/filters/kspread/xlsx/XlsxXmlSharedStringsReader.cpp 1108560 > trunk/koffice/filters/kspread/xlsx/XlsxXmlWorksheetReader.cpp 1108560 > trunk/koffice/filters/kspread/xlsx/NumberFormatParser.cpp 1108560 > trunk/koffice/filters/kspread/html/htmlimport.cc 1108560 > trunk/koffice/filters/kspread/xlsx/ChartExport.cpp 1108560 > trunk/koffice/filters/kspread/excel/import/excelimport.cc 1108560 > trunk/koffice/filters/kpresenter/powerpoint/globalobjectcollectors.h 1108560 > trunk/koffice/filters/kpresenter/pptx/PptxImport.cpp 1108560 > trunk/koffice/filters/kpresenter/pptx/PptxXmlSlideReader.cpp 1108560 > trunk/koffice/filters/kpresenter/powerpoint/DateTimeFormat.cpp 1108560 > trunk/koffice/filters/kpresenter/powerpoint/PptToOdp.cpp 1108560 > trunk/koffice/filters/kpresenter/kpr2odf/Filterkpr2odf.cpp 1108560 > trunk/koffice/filters/kpresenter/kpr2odf/StylesFilterkpr2odf.cpp 1108560 > trunk/koffice/karbon/common/KarbonDocument.cpp 1108560 > trunk/koffice/kchart/KChartPart.cpp 1108560 > trunk/koffice/kchart/shape/Axis.cpp 1108560 > trunk/koffice/kchart/shape/ChartDocument.cpp 1108560 > trunk/koffice/kchart/shape/ChartProxyModel.cpp 1108560 > trunk/koffice/kchart/shape/ChartShape.cpp 1108560 > trunk/koffice/kchart/shape/PlotArea.cpp 1108560 > trunk/koffice/kchart/shape/Surface.cpp 1108560 > trunk/koffice/kpresenter/part/KPrPlaceholderTextStrategy.cpp 1108786 > trunk/koffice/kpresenter/part/pagelayout/KPrPageLayout.cpp 1108786 > trunk/koffice/krita/ui/flake/kis_shape_layer.cc 1108707 > trunk/koffice/krita/ui/flake/kis_shape_selection.cpp 1108707 > trunk/koffice/kspread/Cell.cpp 1108560 > trunk/koffice/kspread/GenValidationStyle.h 1108560 > trunk/koffice/kspread/GenValidationStyle.cpp 1108560 > trunk/koffice/kspread/Map.cpp 1108560 > trunk/koffice/kspread/Sheet.cpp 1108560 > trunk/koffice/kspread/SheetPrint.cpp 1108560 > trunk/koffice/kspread/Style.cpp 1108560 > trunk/koffice/kspread/StyleManager.cpp 1108560 > trunk/koffice/kspread/part/Doc.cpp 1108560 > trunk/koffice/kspread/shape/TableShape.cpp 1108560 > trunk/koffice/kword/part/KWOdfWriter.cpp 1108786 > trunk/koffice/libs/flake/KoDrag.cpp 1108784 > trunk/koffice/libs/flake/KoPatternBackground.cpp 1108784 > trunk/koffice/libs/flake/KoShape.cpp 1108784 > trunk/koffice/libs/kopageapp/KoPADocument.cpp 1108784 > trunk/koffice/libs/kopageapp/KoPAMasterPage.cpp 1108784 > trunk/koffice/libs/kopageapp/KoPAPageBase.cpp 1108784 > trunk/koffice/libs/kotext/KoTextDrag.cpp 1108784 > trunk/koffice/libs/kotext/opendocument/KoTextWriter.cpp 1108784 > trunk/koffice/libs/kotext/opendocument/tests/TestLoading.cpp 1108784 > trunk/koffice/libs/kotext/styles/KoParagraphStyle.cpp 1108784 > trunk/koffice/libs/kotext/styles/KoStyleManager.cpp 1108784 > trunk/koffice/libs/odf/KoGenStyle.h 1108784 > trunk/koffice/libs/odf/KoGenStyle.cpp 1108784 > trunk/koffice/libs/odf/KoGenStyles.h 1108784 > trunk/koffice/libs/odf/KoGenStyles.cpp 1108784 > trunk/koffice/libs/odf/KoOdfGraphicStyles.cpp 1108784 > trunk/koffice/libs/odf/KoOdfNumberStyles.cpp 1108784 > trunk/koffice/libs/odf/KoOdfStylesReader.h 1108784 > trunk/koffice/libs/odf/KoOdfStylesReader.cpp 1108784 > trunk/koffice/libs/odf/KoPageLayout.cpp 1108784 > trunk/koffice/libs/odf/tests/TestKoGenStyles.cpp 1108784 > > Diff: http://reviewboard.kde.org/r/3090/diff > > > Testing > ------- > > builds, checked if there's no change in semantics > > > Thanks, > > Jaroslaw > > _______________________________________________ koffice-devel mailing list koffice-devel@kde.org https://mail.kde.org/mailman/listinfo/koffice-devel