From 37fd22525138556c03cf1329551012879dc21f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Tue, 16 Nov 2010 13:53:39 +0100 Subject: [PATCH 1/6] Use the new stable libwp* releases as default --- writerperfect/prj/build.lst | 2 +- .../source/filter/DocumentCollector.cxx | 804 +++++++++++++----- .../source/filter/DocumentCollector.hxx | 90 +- .../source/filter/DocumentElement.cxx | 11 +- .../source/filter/DocumentElement.hxx | 24 +- .../source/filter/DocumentHandler.cxx | 25 +- .../source/filter/DocumentHandler.hxx | 4 +- .../filter/DocumentHandlerInterface.hxx | 45 + .../source/filter/FilterInternal.hxx | 6 + writerperfect/source/filter/FontStyle.cxx | 12 +- writerperfect/source/filter/FontStyle.hxx | 9 +- writerperfect/source/filter/GraphicsStyle.cxx | 40 + writerperfect/source/filter/GraphicsStyle.hxx | 40 + .../source/filter/InternalHandler.cxx | 54 ++ .../source/filter/InternalHandler.hxx | 46 + writerperfect/source/filter/ListStyle.cxx | 61 +- writerperfect/source/filter/ListStyle.hxx | 15 +- writerperfect/source/filter/OdgExporter.cxx | 648 ++++++++++++++ writerperfect/source/filter/OdgExporter.hxx | 90 ++ writerperfect/source/filter/PageSpan.cxx | 153 +++- writerperfect/source/filter/PageSpan.hxx | 25 +- writerperfect/source/filter/SectionStyle.cxx | 8 +- writerperfect/source/filter/SectionStyle.hxx | 8 +- writerperfect/source/filter/Style.hxx | 8 +- writerperfect/source/filter/TableStyle.cxx | 37 +- writerperfect/source/filter/TableStyle.hxx | 12 +- writerperfect/source/filter/TextRunStyle.cxx | 73 +- writerperfect/source/filter/TextRunStyle.hxx | 11 +- .../source/filter/WriterProperties.hxx | 1 - writerperfect/source/filter/makefile.mk | 13 +- writerperfect/source/stream/WPXSvStream.cxx | 11 +- writerperfect/source/stream/WPXSvStream.h | 8 +- .../source/wpdimp/WordPerfectCollector.cxx | 13 +- .../source/wpdimp/WordPerfectCollector.hxx | 8 +- .../source/wpdimp/WordPerfectImportFilter.cxx | 172 +++- .../source/wpdimp/WordPerfectImportFilter.hxx | 60 ++ writerperfect/source/wpdimp/makefile.mk | 4 + .../source/wpdimp/wpft_genericfilter.cxx | 23 + .../source/wpgimp/WPGImportFilter.cxx | 22 +- writerperfect/source/wpgimp/makefile.mk | 7 - .../source/wpsimp/MSWorksCollector.cxx | 6 +- .../source/wpsimp/MSWorksCollector.hxx | 5 +- .../source/wpsimp/MSWorksImportFilter.cxx | 4 +- writerperfect/util/makefile.mk | 8 +- 44 files changed, 2227 insertions(+), 499 deletions(-) create mode 100644 writerperfect/source/filter/DocumentHandlerInterface.hxx create mode 100644 writerperfect/source/filter/GraphicsStyle.cxx create mode 100644 writerperfect/source/filter/GraphicsStyle.hxx create mode 100644 writerperfect/source/filter/InternalHandler.cxx create mode 100644 writerperfect/source/filter/InternalHandler.hxx create mode 100644 writerperfect/source/filter/OdgExporter.cxx create mode 100644 writerperfect/source/filter/OdgExporter.hxx diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst index bf7a656a1f2f..87b258ac3016 100644 --- a/writerperfect/prj/build.lst +++ b/writerperfect/prj/build.lst @@ -1,4 +1,4 @@ -wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools NULL +wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools sfx2 NULL wp writerperfect usr1 - all wp_mkout NULL wp writerperfect\source\stream nmake - all wp_stream NULL wp writerperfect\source\filter nmake - all wp_filter NULL diff --git a/writerperfect/source/filter/DocumentCollector.cxx b/writerperfect/source/filter/DocumentCollector.cxx index c410e6095584..7855d49c4a2e 100644 --- a/writerperfect/source/filter/DocumentCollector.cxx +++ b/writerperfect/source/filter/DocumentCollector.cxx @@ -40,6 +40,8 @@ #include "DocumentCollector.hxx" #include "DocumentElement.hxx" +#include "DocumentHandler.hxx" +#include "InternalHandler.hxx" #include "TextRunStyle.hxx" #include "FontStyle.hxx" #include "ListStyle.hxx" @@ -48,36 +50,51 @@ #include "TableStyle.hxx" #include "FilterInternal.hxx" #include "WriterProperties.hxx" +#include "OdgExporter.hxx" _WriterDocumentState::_WriterDocumentState() : mbFirstElement(true), + mbFirstParagraphInPageSpan(true), mbInFakeSection(false), mbListElementOpenedAtCurrentLevel(false), mbTableCellOpened(false), mbHeaderRow(false), - mbInNote(false) + mbInNote(false), + mbInTextBox(false), + mbInFrame(false) { } -DocumentCollector::DocumentCollector(WPSInputStream *pInput, DocumentHandler *pHandler) : - mpInput(pInput), - mpHandler(pHandler), - mbUsed(false), - mfSectionSpaceAfter(0.0f), - miNumListStyles(0), - mpCurrentContentElements(&mBodyElements), - mpCurrentPageSpan(NULL), - miNumPageStyles(0), +_WriterListState::_WriterListState() : mpCurrentListStyle(NULL), miCurrentListLevel(0), miLastListLevel(0), miLastListNumber(0), mbListContinueNumbering(false), - mbListElementOpened(false), - mbListElementParagraphOpened(false) + mbListElementParagraphOpened(false), + mbListElementOpened() { } +DocumentCollector::DocumentCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler) : + mpInput(pInput), + mpHandler(pHandler), + mbUsed(false), + mWriterDocumentStates(), + mWriterListStates(), + mfSectionSpaceAfter(0.0f), + miNumListStyles(0), + mpCurrentContentElements(&mBodyElements), + mpCurrentPageSpan(NULL), + miNumPageStyles(0), + miObjectNumber(0), + mbIsFlatXML(true), + mpPassword(NULL) +{ + mWriterDocumentStates.push(WriterDocumentState()); + mWriterListStates.push(WriterListState()); +} + DocumentCollector::~DocumentCollector() { } @@ -103,7 +120,7 @@ bool DocumentCollector::filter() WRITER_DEBUG_MSG(("Destroying the body elements\n")); for (std::vector::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); iterBody++) { - delete((*iterBody)); + delete (*iterBody); (*iterBody) = NULL; } @@ -116,14 +133,14 @@ bool DocumentCollector::filter() WRITER_DEBUG_MSG(("Destroying the rest of the styles elements\n")); for (std::map::iterator iterTextStyle = mTextStyleHash.begin(); iterTextStyle != mTextStyleHash.end(); iterTextStyle++) { - delete iterTextStyle->second; + delete (iterTextStyle->second); } for (std::map::iterator iterSpanStyle = mSpanStyleHash.begin(); iterSpanStyle != mSpanStyleHash.end(); iterSpanStyle++) { - delete iterSpanStyle->second; + delete(iterSpanStyle->second); } for (std::map::iterator iterFont = mFontHash.begin(); iterFont != mFontHash.end(); iterFont++) { - delete iterFont->second; + delete(iterFont->second); } for (std::vector::iterator iterListStyles = mListStyles.begin(); iterListStyles != mListStyles.end(); iterListStyles++) { @@ -133,80 +150,101 @@ bool DocumentCollector::filter() delete (*iterSectionStyles); } for (std::vector::iterator iterTableStyles = mTableStyles.begin(); iterTableStyles != mTableStyles.end(); iterTableStyles++) { - delete (*iterTableStyles); + delete((*iterTableStyles)); } for (std::vector::iterator iterPageSpans = mPageSpans.begin(); iterPageSpans != mPageSpans.end(); iterPageSpans++) { delete (*iterPageSpans); } + for (std::vector::iterator iterFrameStyles = mFrameStyles.begin(); iterFrameStyles != mFrameStyles.end(); iterFrameStyles++) { + delete(*iterFrameStyles); + } + for (std::vector::iterator iterFrameAutomaticStyles = mFrameAutomaticStyles.begin(); + iterFrameAutomaticStyles != mFrameAutomaticStyles.end(); iterFrameAutomaticStyles++) { + delete(*iterFrameAutomaticStyles); + } + for (std::vector::iterator iterMetaData = mMetaData.begin(); iterMetaData != mMetaData.end(); iterMetaData++) { + delete(*iterMetaData); + } return true; } -void DocumentCollector::_writeDefaultStyles(DocumentHandler *pHandler) +void DocumentCollector::_writeDefaultStyles(DocumentHandlerInterface *pHandler) { - TagOpenElement stylesOpenElement("office:styles"); - stylesOpenElement.write(pHandler); + TagOpenElement("office:styles").write(pHandler); TagOpenElement defaultParagraphStyleOpenElement("style:default-style"); defaultParagraphStyleOpenElement.addAttribute("style:family", "paragraph"); defaultParagraphStyleOpenElement.write(pHandler); - TagOpenElement defaultParagraphStylePropertiesOpenElement("style:properties"); - defaultParagraphStylePropertiesOpenElement.addAttribute("style:family", "paragraph"); - defaultParagraphStylePropertiesOpenElement.addAttribute("style:tab-stop-distance", "0.5inch"); + TagOpenElement defaultParagraphStylePropertiesOpenElement("style:paragraph-properties"); + defaultParagraphStylePropertiesOpenElement.addAttribute("style:tab-stop-distance", "0.5in"); defaultParagraphStylePropertiesOpenElement.write(pHandler); - TagCloseElement defaultParagraphStylePropertiesCloseElement("style:properties"); + TagCloseElement defaultParagraphStylePropertiesCloseElement("style:paragraph-properties"); defaultParagraphStylePropertiesCloseElement.write(pHandler); - TagCloseElement defaultParagraphStyleCloseElement("style:default-style"); - defaultParagraphStyleCloseElement.write(pHandler); + pHandler->endElement("style:default-style"); + + TagOpenElement defaultTableRowStyleOpenElement("style:default-style"); + defaultTableRowStyleOpenElement.addAttribute("style:family", "table-row"); + defaultTableRowStyleOpenElement.write(pHandler); + + TagOpenElement defaultTableRowPropertiesOpenElement("style:table-row-properties"); + defaultTableRowPropertiesOpenElement.addAttribute("fo:keep-together", "auto"); + defaultTableRowPropertiesOpenElement.write(pHandler); + + pHandler->endElement("style:table-row-properties"); + pHandler->endElement("style:default-style"); TagOpenElement standardStyleOpenElement("style:style"); standardStyleOpenElement.addAttribute("style:name", "Standard"); standardStyleOpenElement.addAttribute("style:family", "paragraph"); standardStyleOpenElement.addAttribute("style:class", "text"); standardStyleOpenElement.write(pHandler); - TagCloseElement standardStyleCloseElement("style:style"); - standardStyleCloseElement.write(pHandler); + + pHandler->endElement("style:style"); TagOpenElement textBodyStyleOpenElement("style:style"); - textBodyStyleOpenElement.addAttribute("style:name", "Text Body"); + textBodyStyleOpenElement.addAttribute("style:name", "Text_Body"); + textBodyStyleOpenElement.addAttribute("style:display-name", "Text Body"); textBodyStyleOpenElement.addAttribute("style:family", "paragraph"); textBodyStyleOpenElement.addAttribute("style:parent-style-name", "Standard"); textBodyStyleOpenElement.addAttribute("style:class", "text"); textBodyStyleOpenElement.write(pHandler); - TagCloseElement textBodyStyleCloseElement("style:style"); - textBodyStyleCloseElement.write(pHandler); + + pHandler->endElement("style:style"); TagOpenElement tableContentsStyleOpenElement("style:style"); - tableContentsStyleOpenElement.addAttribute("style:name", "Table Contents"); + tableContentsStyleOpenElement.addAttribute("style:name", "Table_Contents"); + tableContentsStyleOpenElement.addAttribute("style:display-name", "Table Contents"); tableContentsStyleOpenElement.addAttribute("style:family", "paragraph"); - tableContentsStyleOpenElement.addAttribute("style:parent-style-name", "Text Body"); + tableContentsStyleOpenElement.addAttribute("style:parent-style-name", "Text_Body"); tableContentsStyleOpenElement.addAttribute("style:class", "extra"); tableContentsStyleOpenElement.write(pHandler); - TagCloseElement tableContentsStyleCloseElement("style:style"); - tableContentsStyleCloseElement.write(pHandler); + + pHandler->endElement("style:style"); TagOpenElement tableHeadingStyleOpenElement("style:style"); - tableHeadingStyleOpenElement.addAttribute("style:name", "Table Heading"); + tableHeadingStyleOpenElement.addAttribute("style:name", "Table_Heading"); + tableHeadingStyleOpenElement.addAttribute("style:display-name", "Table Heading"); tableHeadingStyleOpenElement.addAttribute("style:family", "paragraph"); - tableHeadingStyleOpenElement.addAttribute("style:parent-style-name", "Table Contents"); + tableHeadingStyleOpenElement.addAttribute("style:parent-style-name", "Table_Contents"); tableHeadingStyleOpenElement.addAttribute("style:class", "extra"); tableHeadingStyleOpenElement.write(pHandler); - TagCloseElement tableHeadingStyleCloseElement("style:style"); - tableHeadingStyleCloseElement.write(pHandler); - TagCloseElement stylesCloseElement("office:styles"); - stylesCloseElement.write(pHandler); + pHandler->endElement("style:style"); + for (std::vector::const_iterator iter = mFrameStyles.begin(); + iter != mFrameStyles.end(); iter++) + (*iter)->write(pHandler); + + pHandler->endElement("office:styles"); } -void DocumentCollector::_writeMasterPages(DocumentHandler *pHandler) +void DocumentCollector::_writeMasterPages(DocumentHandlerInterface *pHandler) { - WPXPropertyList xBlankAttrList; - - pHandler->startElement("office:master-styles", xBlankAttrList); + TagOpenElement("office:master-styles").write(mpHandler); int pageNumber = 1; for (unsigned int i=0; iendElement("office:master-styles"); } -void DocumentCollector::_writePageMasters(DocumentHandler *pHandler) +void DocumentCollector::_writePageLayouts(DocumentHandlerInterface *pHandler) { for (unsigned int i=0; iwritePageMaster(i, pHandler); + mPageSpans[i]->writePageLayout(i, pHandler); } } -bool DocumentCollector::_writeTargetDocument(DocumentHandler *pHandler) +bool DocumentCollector::_writeTargetDocument(DocumentHandlerInterface *pHandler) { WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Printing out the header stuff..\n")); - WPXPropertyList xBlankAttrList; WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Start Document\n")); mpHandler->startDocument(); WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: preamble\n")); WPXPropertyList docContentPropList; - docContentPropList.insert("xmlns:office", "http://openoffice.org/2000/office"); - docContentPropList.insert("xmlns:style", "http://openoffice.org/2000/style"); - docContentPropList.insert("xmlns:text", "http://openoffice.org/2000/text"); - docContentPropList.insert("xmlns:table", "http://openoffice.org/2000/table"); - docContentPropList.insert("xmlns:draw", "http://openoffice.org/2000/draw"); - docContentPropList.insert("xmlns:fo", "http://www.w3.org/1999/XSL/Format"); + docContentPropList.insert("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0"); + docContentPropList.insert("xmlns:meta", "urn:oasis:names:tc:opendocument:xmlns:meta:1.0"); + docContentPropList.insert("xmlns:dc", "http://purl.org/dc/elements/1.1/"); + docContentPropList.insert("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"); + docContentPropList.insert("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0"); + docContentPropList.insert("xmlns:table", "urn:oasis:names:tc:opendocument:xmlns:table:1.0"); + docContentPropList.insert("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); + docContentPropList.insert("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); docContentPropList.insert("xmlns:xlink", "http://www.w3.org/1999/xlink"); docContentPropList.insert("xmlns:number", "http://openoffice.org/2000/datastyle"); - docContentPropList.insert("xmlns:svg", "http://www.w3.org/2000/svg"); - docContentPropList.insert("xmlns:chart", "http://openoffice.org/2000/chart"); - docContentPropList.insert("xmlns:dr3d", "http://openoffice.org/2000/dr3d"); + docContentPropList.insert("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); + docContentPropList.insert("xmlns:chart", "urn:oasis:names:tc:opendocument:xmlns:chart:1.0"); + docContentPropList.insert("xmlns:dr3d", "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"); docContentPropList.insert("xmlns:math", "http://www.w3.org/1998/Math/MathML"); - docContentPropList.insert("xmlns:form", "http://openoffice.org/2000/form"); - docContentPropList.insert("xmlns:script", "http://openoffice.org/2000/script"); - docContentPropList.insert("office:class", "text"); + docContentPropList.insert("xmlns:form", "urn:oasis:names:tc:opendocument:xmlns:form:1.0"); + docContentPropList.insert("xmlns:script", "urn:oasis:names:tc:opendocument:xmlns:script:1.0"); + docContentPropList.insert("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0"); docContentPropList.insert("office:version", "1.0"); - mpHandler->startElement("office:document-content", docContentPropList); + docContentPropList.insert("office:mimetype", "application/vnd.oasis.opendocument.text"); + mpHandler->startElement("office:document", docContentPropList); + + // write out the metadata + TagOpenElement("office:meta").write(mpHandler); + for (std::vector::const_iterator iterMetaData = mMetaData.begin(); iterMetaData != mMetaData.end(); iterMetaData++) { + (*iterMetaData)->write(mpHandler); + } + mpHandler->endElement("office:meta"); // write out the font styles - mpHandler->startElement("office:font-decls", xBlankAttrList); + TagOpenElement("office:font-face-decls").write(mpHandler); for (std::map::iterator iterFont = mFontHash.begin(); iterFont != mFontHash.end(); iterFont++) { iterFont->second->write(mpHandler); } - TagOpenElement symbolFontOpen("style:font-decl"); + TagOpenElement symbolFontOpen("style:font-face"); symbolFontOpen.addAttribute("style:name", "StarSymbol"); - symbolFontOpen.addAttribute("fo:font-family", "StarSymbol"); + symbolFontOpen.addAttribute("svg:font-family", "StarSymbol"); symbolFontOpen.addAttribute("style:font-charset", "x-symbol"); symbolFontOpen.write(mpHandler); - mpHandler->endElement("style:font-decl"); - - mpHandler->endElement("office:font-decls"); + mpHandler->endElement("style:font-face"); + mpHandler->endElement("office:font-face-decls"); WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Writing out the styles..\n")); // write default styles _writeDefaultStyles(mpHandler); - mpHandler->startElement("office:automatic-styles", xBlankAttrList); + TagOpenElement("office:automatic-styles").write(mpHandler); - for (std::map::iterator iterTextStyle = mTextStyleHash.begin(); + for (std::vector::const_iterator iterFrameAutomaticStyles = mFrameAutomaticStyles.begin(); + iterFrameAutomaticStyles != mFrameAutomaticStyles.end(); iterFrameAutomaticStyles++) + { + (*iterFrameAutomaticStyles)->write(pHandler); + } + + for (std::map::const_iterator iterTextStyle = mTextStyleHash.begin(); iterTextStyle != mTextStyleHash.end(); iterTextStyle++) { // writing out the paragraph styles @@ -288,29 +340,29 @@ bool DocumentCollector::_writeTargetDocument(DocumentHandler *pHandler) } // span styles.. - for (std::map::iterator iterSpanStyle = mSpanStyleHash.begin(); + for (std::map::const_iterator iterSpanStyle = mSpanStyleHash.begin(); iterSpanStyle != mSpanStyleHash.end(); iterSpanStyle++) { (iterSpanStyle->second)->write(pHandler); } // writing out the sections styles - for (std::vector::iterator iterSectionStyles = mSectionStyles.begin(); iterSectionStyles != mSectionStyles.end(); iterSectionStyles++) { + for (std::vector::const_iterator iterSectionStyles = mSectionStyles.begin(); iterSectionStyles != mSectionStyles.end(); iterSectionStyles++) { (*iterSectionStyles)->write(pHandler); } // writing out the lists styles - for (std::vector::iterator iterListStyles = mListStyles.begin(); iterListStyles != mListStyles.end(); iterListStyles++) { + for (std::vector::const_iterator iterListStyles = mListStyles.begin(); iterListStyles != mListStyles.end(); iterListStyles++) { (*iterListStyles)->write(pHandler); } // writing out the table styles - for (std::vector::iterator iterTableStyles = mTableStyles.begin(); iterTableStyles != mTableStyles.end(); iterTableStyles++) { + for (std::vector::const_iterator iterTableStyles = mTableStyles.begin(); iterTableStyles != mTableStyles.end(); iterTableStyles++) { (*iterTableStyles)->write(pHandler); } // writing out the page masters - _writePageMasters(pHandler); + _writePageLayouts(pHandler); pHandler->endElement("office:automatic-styles"); @@ -319,15 +371,17 @@ bool DocumentCollector::_writeTargetDocument(DocumentHandler *pHandler) WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Writing out the document..\n")); // writing out the document - pHandler->startElement("office:body", xBlankAttrList); + TagOpenElement("office:body").write(mpHandler); + TagOpenElement("office:text").write(mpHandler); - for (std::vector::iterator iterBodyElements = mBodyElements.begin(); iterBodyElements != mBodyElements.end(); iterBodyElements++) { + for (std::vector::const_iterator iterBodyElements = mBodyElements.begin(); iterBodyElements != mBodyElements.end(); iterBodyElements++) { (*iterBodyElements)->write(pHandler); } WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Finished writing all doc els..\n")); + pHandler->endElement("office:text"); pHandler->endElement("office:body"); - pHandler->endElement("office:document-content"); + pHandler->endElement("office:document"); pHandler->endDocument(); @@ -375,11 +429,31 @@ void DocumentCollector::_allocateFontName(const WPXString & sFontName) } } +void DocumentCollector::setDocumentMetaData(const WPXPropertyList &propList) +{ + WPXPropertyList::Iter i(propList); + for (i.rewind(); i.next(); ) + { + // filter out libwpd elements + if (strncmp(i.key(), "libwpd", 6) != 0 && strncmp(i.key(), "dcterms", 7) != 0) + { + mMetaData.push_back(new TagOpenElement(i.key())); + WPXString sStringValue(i()->getStr(), true); + mMetaData.push_back(new CharDataElement(sStringValue.cstr())); + mMetaData.push_back(new TagCloseElement(i.key())); + } + } + +} + void DocumentCollector::openPageSpan(const WPXPropertyList &propList) { PageSpan *pPageSpan = new PageSpan(propList); mPageSpans.push_back(pPageSpan); mpCurrentPageSpan = pPageSpan; + miNumPageStyles++; + + mWriterDocumentStates.top().mbFirstParagraphInPageSpan = true; } void DocumentCollector::openHeader(const WPXPropertyList &propList) @@ -419,16 +493,20 @@ void DocumentCollector::closeFooter() void DocumentCollector::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) { int iNumColumns = columns.count(); - float fSectionMarginLeft = 0.0f; - float fSectionMarginRight = 0.0f; + double fSectionMarginLeft = 0.0; + double fSectionMarginRight = 0.0; if (propList["fo:margin-left"]) - fSectionMarginLeft = propList["fo:margin-left"]->getFloat(); + fSectionMarginLeft = propList["fo:margin-left"]->getDouble(); if (propList["fo:margin-right"]) - fSectionMarginRight = propList["fo:margin-right"]->getFloat(); + fSectionMarginRight = propList["fo:margin-right"]->getDouble(); if (iNumColumns > 1 || fSectionMarginLeft != 0 || fSectionMarginRight != 0) { - mfSectionSpaceAfter = propList["fo:margin-bottom"]->getFloat(); + if (propList["fo:margin-bottom"]) + mfSectionSpaceAfter = propList["fo:margin-bottom"]->getDouble(); + else if (propList["libwpd:margin-bottom"]) + mfSectionSpaceAfter = propList["libwpd:margin-bottom"]->getDouble(); + WPXString sSectionName; sSectionName.sprintf("Section%i", mSectionStyles.size()); @@ -438,29 +516,20 @@ void DocumentCollector::openSection(const WPXPropertyList &propList, const WPXPr TagOpenElement *pSectionOpenElement = new TagOpenElement("text:section"); pSectionOpenElement->addAttribute("text:style-name", pSectionStyle->getName()); pSectionOpenElement->addAttribute("text:name", pSectionStyle->getName()); - mpCurrentContentElements->push_back(static_cast(pSectionOpenElement)); + mpCurrentContentElements->push_back(pSectionOpenElement); } else - mWriterDocumentState.mbInFakeSection = true; + mWriterDocumentStates.top().mbInFakeSection = true; } void DocumentCollector::closeSection() { - if (!mWriterDocumentState.mbInFakeSection) - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:section"))); + if (!mWriterDocumentStates.top().mbInFakeSection) + mpCurrentContentElements->push_back(new TagCloseElement("text:section")); else - mWriterDocumentState.mbInFakeSection = false; + mWriterDocumentStates.top().mbInFakeSection = false; - // open as many paragraphs as needed to simulate section space after - // WLACH_REFACTORING: disable this for now.. - #if 0 - for (float f=0.0f; f dummyTabStops; - openParagraph(WPX_PARAGRAPH_JUSTIFICATION_LEFT, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, dummyTabStops, false, false); - closeParagraph(); - } - #endif - mfSectionSpaceAfter = 0.0f; + mfSectionSpaceAfter = 0.0; } void DocumentCollector::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) @@ -471,7 +540,7 @@ void DocumentCollector::openParagraph(const WPXPropertyList &propList, const WPX WPXPropertyList *pPersistPropList = new WPXPropertyList(propList); ParagraphStyle *pStyle = NULL; - if (mWriterDocumentState.mbFirstElement && mpCurrentContentElements == &mBodyElements) + if (mWriterDocumentStates.top().mbFirstElement && mpCurrentContentElements == &mBodyElements) { // we don't have to go through the fuss of determining if the paragraph style is // unique in this case, because if we are the first document element, then we @@ -483,26 +552,36 @@ void DocumentCollector::openParagraph(const WPXPropertyList &propList, const WPX sName.sprintf("FS"); WPXString sParagraphHashKey("P|FS"); - pPersistPropList->insert("style:master-page-name", "Page Style 1"); + pPersistPropList->insert("style:master-page-name", "Page_Style_1"); pStyle = new ParagraphStyle(pPersistPropList, tabStops, sName); mTextStyleHash[sParagraphHashKey] = pStyle; - mWriterDocumentState.mbFirstElement = false; + mWriterDocumentStates.top().mbFirstElement = false; + mWriterDocumentStates.top().mbFirstParagraphInPageSpan = false; } else { - if (mWriterDocumentState.mbTableCellOpened) + if (mWriterDocumentStates.top().mbFirstParagraphInPageSpan && mpCurrentContentElements == &mBodyElements) { - if (mWriterDocumentState.mbHeaderRow) - pPersistPropList->insert("style:parent-style-name", "Table Heading"); + WPXString sPageStyleName; + sPageStyleName.sprintf("Page_Style_%i", miNumPageStyles); + pPersistPropList->insert("style:master-page-name", sPageStyleName); + mWriterDocumentStates.top().mbFirstParagraphInPageSpan = false; + } + + if (mWriterDocumentStates.top().mbTableCellOpened) + { + if (mWriterDocumentStates.top().mbHeaderRow) + pPersistPropList->insert("style:parent-style-name", "Table_Heading"); else - pPersistPropList->insert("style:parent-style-name", "Table Contents"); + pPersistPropList->insert("style:parent-style-name", "Table_Contents"); } else pPersistPropList->insert("style:parent-style-name", "Standard"); WPXString sKey = getParagraphStyleKey(*pPersistPropList, tabStops); - if (mTextStyleHash.find(sKey) == mTextStyleHash.end()) { + if (mTextStyleHash.find(sKey) == mTextStyleHash.end()) + { WPXString sName; sName.sprintf("S%i", mTextStyleHash.size()); @@ -519,12 +598,12 @@ void DocumentCollector::openParagraph(const WPXPropertyList &propList, const WPX // create a document element corresponding to the paragraph, and append it to our list of document elements TagOpenElement *pParagraphOpenElement = new TagOpenElement("text:p"); pParagraphOpenElement->addAttribute("text:style-name", pStyle->getName()); - mpCurrentContentElements->push_back(static_cast(pParagraphOpenElement)); + mpCurrentContentElements->push_back(pParagraphOpenElement); } void DocumentCollector::closeParagraph() { - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:p"))); + mpCurrentContentElements->push_back(new TagCloseElement("text:p")); } void DocumentCollector::openSpan(const WPXPropertyList &propList) @@ -552,12 +631,12 @@ void DocumentCollector::openSpan(const WPXPropertyList &propList) // create a document element corresponding to the paragraph, and append it to our list of document elements TagOpenElement *pSpanOpenElement = new TagOpenElement("text:span"); pSpanOpenElement->addAttribute("text:style-name", sName.cstr()); - mpCurrentContentElements->push_back(static_cast(pSpanOpenElement)); + mpCurrentContentElements->push_back(pSpanOpenElement); } void DocumentCollector::closeSpan() { - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:span"))); + mpCurrentContentElements->push_back(new TagCloseElement("text:span")); } void DocumentCollector::defineOrderedListLevel(const WPXPropertyList &propList) @@ -567,8 +646,8 @@ void DocumentCollector::defineOrderedListLevel(const WPXPropertyList &propList) id = propList["libwpd:id"]->getInt(); OrderedListStyle *pOrderedListStyle = NULL; - if (mpCurrentListStyle && mpCurrentListStyle->getListID() == id) - pOrderedListStyle = static_cast(mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?! + if (mWriterListStates.top().mpCurrentListStyle && mWriterListStates.top().mpCurrentListStyle->getListID() == id) + pOrderedListStyle = static_cast(mWriterListStates.top().mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?! // this rather appalling conditional makes sure we only start a new list (rather than continue an old // one) if: (1) we have no prior list OR (2) the prior list is actually definitively different @@ -576,27 +655,27 @@ void DocumentCollector::defineOrderedListLevel(const WPXPropertyList &propList) // is starting a new list at level 1 (and only level 1) if (pOrderedListStyle == NULL || pOrderedListStyle->getListID() != id || (propList["libwpd:level"] && propList["libwpd:level"]->getInt()==1 && - (propList["text:start-value"] && (unsigned int)(propList["text:start-value"]->getInt()) != (miLastListNumber+1)))) + (propList["text:start-value"] && propList["text:start-value"]->getInt() != (mWriterListStates.top().miLastListNumber+1)))) { WRITER_DEBUG_MSG(("Attempting to create a new ordered list style (listid: %i)\n", id)); WPXString sName; sName.sprintf("OL%i", miNumListStyles); miNumListStyles++; - pOrderedListStyle = new OrderedListStyle(sName.cstr(), propList["libwpd:id"]->getInt()); - mListStyles.push_back(static_cast(pOrderedListStyle)); - mpCurrentListStyle = static_cast(pOrderedListStyle); - mbListContinueNumbering = false; - miLastListNumber = 0; + pOrderedListStyle = new OrderedListStyle(sName.cstr(), id); + mListStyles.push_back(pOrderedListStyle); + mWriterListStates.top().mpCurrentListStyle = pOrderedListStyle; + mWriterListStates.top().mbListContinueNumbering = false; + mWriterListStates.top().miLastListNumber = 0; } else - mbListContinueNumbering = true; + mWriterListStates.top().mbListContinueNumbering = true; // Iterate through ALL list styles with the same WordPerfect list id and define a level if it is not already defined // This solves certain problems with lists that start and finish without reaching certain levels and then begin again // and reach those levels. See gradguide0405_PC.wpd in the regression suite for (std::vector::iterator iterOrderedListStyles = mListStyles.begin(); iterOrderedListStyles != mListStyles.end(); iterOrderedListStyles++) { - if ((* iterOrderedListStyles)->getListID() == propList["libwpd:id"]->getInt()) + if ((* iterOrderedListStyles)->getListID() == id) (* iterOrderedListStyles)->updateListLevel((propList["libwpd:level"]->getInt() - 1), propList); } } @@ -608,106 +687,114 @@ void DocumentCollector::defineUnorderedListLevel(const WPXPropertyList &propList id = propList["libwpd:id"]->getInt(); UnorderedListStyle *pUnorderedListStyle = NULL; - if (mpCurrentListStyle && mpCurrentListStyle->getListID() == id) - pUnorderedListStyle = static_cast(mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?! + if (mWriterListStates.top().mpCurrentListStyle && mWriterListStates.top().mpCurrentListStyle->getListID() == id) + pUnorderedListStyle = static_cast(mWriterListStates.top().mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?! if (pUnorderedListStyle == NULL) { WRITER_DEBUG_MSG(("Attempting to create a new unordered list style (listid: %i)\n", id)); WPXString sName; sName.sprintf("UL%i", miNumListStyles); + miNumListStyles++; pUnorderedListStyle = new UnorderedListStyle(sName.cstr(), id); - mListStyles.push_back(static_cast(pUnorderedListStyle)); - mpCurrentListStyle = static_cast(pUnorderedListStyle); + mListStyles.push_back(pUnorderedListStyle); + mWriterListStates.top().mpCurrentListStyle = pUnorderedListStyle; } // See comment in DocumentCollector::defineOrderedListLevel for (std::vector::iterator iterUnorderedListStyles = mListStyles.begin(); iterUnorderedListStyles != mListStyles.end(); iterUnorderedListStyles++) { - if ((* iterUnorderedListStyles)->getListID() == propList["libwpd:id"]->getInt()) + if ((* iterUnorderedListStyles)->getListID() == id) (* iterUnorderedListStyles)->updateListLevel((propList["libwpd:level"]->getInt() - 1), propList); } } void DocumentCollector::openOrderedListLevel(const WPXPropertyList & /* propList */) { - miCurrentListLevel++; - TagOpenElement *pListLevelOpenElement = new TagOpenElement("text:ordered-list"); + if (mWriterListStates.top().mbListElementParagraphOpened) + { + mpCurrentContentElements->push_back(new TagCloseElement("text:p")); + mWriterListStates.top().mbListElementParagraphOpened = false; + } + TagOpenElement *pListLevelOpenElement = new TagOpenElement("text:list"); _openListLevel(pListLevelOpenElement); - if (mbListContinueNumbering) { + if (mWriterListStates.top().mbListContinueNumbering) { pListLevelOpenElement->addAttribute("text:continue-numbering", "true"); } - mpCurrentContentElements->push_back(static_cast(pListLevelOpenElement)); + mpCurrentContentElements->push_back(pListLevelOpenElement); } void DocumentCollector::openUnorderedListLevel(const WPXPropertyList & /* propList */) { - miCurrentListLevel++; - TagOpenElement *pListLevelOpenElement = new TagOpenElement("text:unordered-list"); + if (mWriterListStates.top().mbListElementParagraphOpened) + { + mpCurrentContentElements->push_back(new TagCloseElement("text:p")); + mWriterListStates.top().mbListElementParagraphOpened = false; + } + TagOpenElement *pListLevelOpenElement = new TagOpenElement("text:list"); _openListLevel(pListLevelOpenElement); - mpCurrentContentElements->push_back(static_cast(pListLevelOpenElement)); + mpCurrentContentElements->push_back(pListLevelOpenElement); } void DocumentCollector::_openListLevel(TagOpenElement *pListLevelOpenElement) { - if (!mbListElementOpened && miCurrentListLevel > 1) - { - mpCurrentContentElements->push_back(static_cast(new TagOpenElement("text:list-item"))); - } - else if (mbListElementParagraphOpened) + if (!mWriterListStates.top().mbListElementOpened.empty() && + !mWriterListStates.top().mbListElementOpened.top()) { - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:p"))); - mbListElementParagraphOpened = false; + mpCurrentContentElements->push_back(new TagOpenElement("text:list-item")); + mWriterListStates.top().mbListElementOpened.top() = true; } - if (miCurrentListLevel==1) { - pListLevelOpenElement->addAttribute("text:style-name", mpCurrentListStyle->getName()); + mWriterListStates.top().mbListElementOpened.push(false); + if (mWriterListStates.top().mbListElementOpened.size() == 1) { + pListLevelOpenElement->addAttribute("text:style-name", mWriterListStates.top().mpCurrentListStyle->getName()); } - - mbListElementOpened = false; } void DocumentCollector::closeOrderedListLevel() { - _closeListLevel("ordered-list"); + _closeListLevel(); } void DocumentCollector::closeUnorderedListLevel() { - _closeListLevel("unordered-list"); + _closeListLevel(); } -void DocumentCollector::_closeListLevel(const char *szListType) +void DocumentCollector::_closeListLevel() { - if (mbListElementOpened) - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:list-item"))); + if (mWriterListStates.top().mbListElementOpened.top()) + { + mpCurrentContentElements->push_back(new TagCloseElement("text:list-item")); + mWriterListStates.top().mbListElementOpened.top() = false; + } - miCurrentListLevel--; + mpCurrentContentElements->push_back(new TagCloseElement("text:list")); - WPXString sCloseElement; - sCloseElement.sprintf("text:%s", szListType); - mpCurrentContentElements->push_back(static_cast(new TagCloseElement(sCloseElement.cstr()))); - - if (miCurrentListLevel > 0) - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:list-item"))); - mbListElementOpened = false; + if (!mWriterListStates.top().mbListElementOpened.empty()) + { + mWriterListStates.top().mbListElementOpened.pop(); + } } void DocumentCollector::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) { - miLastListLevel = miCurrentListLevel; - if (miCurrentListLevel == 1) - miLastListNumber++; + mWriterListStates.top().miLastListLevel = mWriterListStates.top().miCurrentListLevel; + if (mWriterListStates.top().miCurrentListLevel == 1) + mWriterListStates.top().miLastListNumber++; - if (mbListElementOpened) - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:list-item"))); + if (mWriterListStates.top().mbListElementOpened.top()) + { + mpCurrentContentElements->push_back(new TagCloseElement("text:list-item")); + mWriterListStates.top().mbListElementOpened.top() = false; + } ParagraphStyle *pStyle = NULL; WPXPropertyList *pPersistPropList = new WPXPropertyList(propList); - pPersistPropList->insert("style:list-style-name", mpCurrentListStyle->getName()); + pPersistPropList->insert("style:list-style-name", mWriterListStates.top().mpCurrentListStyle->getName()); pPersistPropList->insert("style:parent-style-name", "Standard"); WPXString sKey = getParagraphStyleKey(*pPersistPropList, tabStops); @@ -727,17 +814,18 @@ void DocumentCollector::openListElement(const WPXPropertyList &propList, const W delete pPersistPropList; } - TagOpenElement *pOpenListElement = new TagOpenElement("text:list-item"); + mpCurrentContentElements->push_back(new TagOpenElement("text:list-item")); + TagOpenElement *pOpenListElementParagraph = new TagOpenElement("text:p"); - pOpenListElementParagraph->addAttribute("text:style-name", pStyle->getName()); + mpCurrentContentElements->push_back(pOpenListElementParagraph); - mpCurrentContentElements->push_back(static_cast(pOpenListElement)); - mpCurrentContentElements->push_back(static_cast(pOpenListElementParagraph)); + if (mpCurrentContentElements == &mBodyElements) + mWriterDocumentStates.top().mbFirstParagraphInPageSpan = false; - mbListElementOpened = true; - mbListElementParagraphOpened = true; - mbListContinueNumbering = false; + mWriterListStates.top().mbListElementOpened.top() = true; + mWriterListStates.top().mbListElementParagraphOpened = true; + mWriterListStates.top().mbListContinueNumbering = false; } void DocumentCollector::closeListElement() @@ -746,69 +834,100 @@ void DocumentCollector::closeListElement() // could contain another list level in OOo's implementation of lists). that is done in the closeListLevel // code (or when we open another list element) - if (mbListElementParagraphOpened) + if (mWriterListStates.top().mbListElementParagraphOpened) { - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:p"))); - mbListElementParagraphOpened = false; + mpCurrentContentElements->push_back(new TagCloseElement("text:p")); + mWriterListStates.top().mbListElementParagraphOpened = false; } } void DocumentCollector::openFootnote(const WPXPropertyList &propList) { - TagOpenElement *pOpenFootNote = new TagOpenElement("text:footnote"); + mWriterListStates.push(WriterListState()); + TagOpenElement *pOpenFootNote = new TagOpenElement("text:note"); + pOpenFootNote->addAttribute("text:note-class", "footnote"); if (propList["libwpd:number"]) { WPXString tmpString("ftn"); tmpString.append(propList["libwpd:number"]->getStr()); pOpenFootNote->addAttribute("text:id", tmpString); } - mpCurrentContentElements->push_back(static_cast(pOpenFootNote)); + mpCurrentContentElements->push_back(pOpenFootNote); - mpCurrentContentElements->push_back(static_cast(new TagOpenElement("text:footnote-citation"))); + mpCurrentContentElements->push_back(new TagOpenElement("text:note-citation")); if (propList["libwpd:number"]) - mpCurrentContentElements->push_back(static_cast(new CharDataElement(propList["libwpd:number"]->getStr().cstr()))); - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:footnote-citation"))); + mpCurrentContentElements->push_back(new CharDataElement(propList["libwpd:number"]->getStr().cstr())); + mpCurrentContentElements->push_back(new TagCloseElement("text:note-citation")); - mpCurrentContentElements->push_back(static_cast(new TagOpenElement("text:footnote-body"))); + mpCurrentContentElements->push_back(new TagOpenElement("text:note-body")); - mWriterDocumentState.mbInNote = true; + mWriterDocumentStates.top().mbInNote = true; } void DocumentCollector::closeFootnote() { - mWriterDocumentState.mbInNote = false; + mWriterDocumentStates.top().mbInNote = false; + if (mWriterListStates.size() > 1) + mWriterListStates.pop(); - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:footnote-body"))); - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:footnote"))); + mpCurrentContentElements->push_back(new TagCloseElement("text:note-body")); + mpCurrentContentElements->push_back(new TagCloseElement("text:note")); } void DocumentCollector::openEndnote(const WPXPropertyList &propList) { - TagOpenElement *pOpenEndNote = new TagOpenElement("text:endnote"); + mWriterListStates.push(WriterListState()); + TagOpenElement *pOpenEndNote = new TagOpenElement("text:note"); + pOpenEndNote->addAttribute("text:note-class", "endnote"); if (propList["libwpd:number"]) { WPXString tmpString("edn"); tmpString.append(propList["libwpd:number"]->getStr()); pOpenEndNote->addAttribute("text:id", tmpString); } - mpCurrentContentElements->push_back(static_cast(pOpenEndNote)); + mpCurrentContentElements->push_back(pOpenEndNote); - mpCurrentContentElements->push_back(static_cast(new TagOpenElement("text:endnote-citation"))); + mpCurrentContentElements->push_back(new TagOpenElement("text:note-citation")); if (propList["libwpd:number"]) - mpCurrentContentElements->push_back(static_cast(new CharDataElement(propList["libwpd:number"]->getStr().cstr()))); - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:endnote-citation"))); + mpCurrentContentElements->push_back(new CharDataElement(propList["libwpd:number"]->getStr().cstr())); + mpCurrentContentElements->push_back(new TagCloseElement("text:note-citation")); - mpCurrentContentElements->push_back(static_cast(new TagOpenElement("text:endnote-body"))); + mpCurrentContentElements->push_back(new TagOpenElement("text:note-body")); + mWriterDocumentStates.top().mbInNote = true; } + void DocumentCollector::closeEndnote() { - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:endnote-body"))); - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:endnote"))); + mWriterDocumentStates.top().mbInNote = false; + if (mWriterListStates.size() > 1) + mWriterListStates.pop(); + + mpCurrentContentElements->push_back(new TagCloseElement("text:note-body")); + mpCurrentContentElements->push_back(new TagCloseElement("text:note")); +} + +void DocumentCollector::openComment(const WPXPropertyList & /*propList*/) +{ + mWriterListStates.push(WriterListState()); + mpCurrentContentElements->push_back(new TagOpenElement("office:annotation")); + + mWriterDocumentStates.top().mbInNote = true; +} + +void DocumentCollector::closeComment() +{ + mWriterDocumentStates.top().mbInNote = false; + if (mWriterListStates.size() > 1) + mWriterListStates.pop(); + + mpCurrentContentElements->push_back(new TagCloseElement("office:annotation")); } void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) { + if (!mWriterDocumentStates.top().mbInNote) + { WPXString sTableName; sTableName.sprintf("Table%i", mTableStyles.size()); @@ -817,11 +936,11 @@ void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXProp // WLACH_REFACTORING: characterize this behaviour, probably should nip it at the bud within libwpd TableStyle *pTableStyle = new TableStyle(propList, columns, sTableName.cstr()); - if (mWriterDocumentState.mbFirstElement && mpCurrentContentElements == &mBodyElements) + if (mWriterDocumentStates.top().mbFirstElement && mpCurrentContentElements == &mBodyElements) { - WPXString sMasterPageName("Page Style 1"); + WPXString sMasterPageName("Page_Style_1"); pTableStyle->setMasterPageName(sMasterPageName); - mWriterDocumentState.mbFirstElement = false; + mWriterDocumentStates.top().mbFirstElement = false; } mTableStyles.push_back(pTableStyle); @@ -832,7 +951,7 @@ void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXProp pTableOpenElement->addAttribute("table:name", sTableName.cstr()); pTableOpenElement->addAttribute("table:style-name", sTableName.cstr()); - mpCurrentContentElements->push_back(static_cast(pTableOpenElement)); + mpCurrentContentElements->push_back(pTableOpenElement); for (int i=0; igetNumColumns(); i++) { @@ -846,13 +965,16 @@ void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXProp mpCurrentContentElements->push_back(pTableColumnCloseElement); } } +} void DocumentCollector::openTableRow(const WPXPropertyList &propList) { + if (!mWriterDocumentStates.top().mbInNote) + { if (propList["libwpd:is-header-row"] && (propList["libwpd:is-header-row"]->getInt())) { - mpCurrentContentElements->push_back(static_cast(new TagOpenElement("table:table-header-rows"))); - mWriterDocumentState.mbHeaderRow = true; + mpCurrentContentElements->push_back(new TagOpenElement("table:table-header-rows")); + mWriterDocumentStates.top().mbHeaderRow = true; } WPXString sTableRowStyleName; @@ -862,21 +984,27 @@ void DocumentCollector::openTableRow(const WPXPropertyList &propList) TagOpenElement *pTableRowOpenElement = new TagOpenElement("table:table-row"); pTableRowOpenElement->addAttribute("table:style-name", sTableRowStyleName); - mpCurrentContentElements->push_back(static_cast(pTableRowOpenElement)); + mpCurrentContentElements->push_back(pTableRowOpenElement); + } } void DocumentCollector::closeTableRow() { - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("table:table-row"))); - if (mWriterDocumentState.mbHeaderRow) + if (!mWriterDocumentStates.top().mbInNote) { - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("table:table-header-rows"))); - mWriterDocumentState.mbHeaderRow = false; + mpCurrentContentElements->push_back(new TagCloseElement("table:table-row")); + if (mWriterDocumentStates.top().mbHeaderRow) + { + mpCurrentContentElements->push_back(new TagCloseElement("table:table-header-rows")); + mWriterDocumentStates.top().mbHeaderRow = false; + } } } void DocumentCollector::openTableCell(const WPXPropertyList &propList) { + if (!mWriterDocumentStates.top().mbInNote) + { WPXString sTableCellStyleName; sTableCellStyleName.sprintf( "%s.Cell%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableCellStyles()); TableCellStyle *pTableCellStyle = new TableCellStyle(propList, sTableCellStyleName.cstr()); @@ -890,39 +1018,72 @@ void DocumentCollector::openTableCell(const WPXPropertyList &propList) if (propList["table:number-rows-spanned"]) pTableCellOpenElement->addAttribute("table:number-rows-spanned", propList["table:number-rows-spanned"]->getStr().cstr()); - pTableCellOpenElement->addAttribute("table:value-type", "string"); - mpCurrentContentElements->push_back(static_cast(pTableCellOpenElement)); + // pTableCellOpenElement->addAttribute("table:value-type", "string"); + mpCurrentContentElements->push_back(pTableCellOpenElement); - mWriterDocumentState.mbTableCellOpened = true; + mWriterDocumentStates.top().mbTableCellOpened = true; + } } void DocumentCollector::closeTableCell() { - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("table:table-cell"))); - mWriterDocumentState.mbTableCellOpened = false; + if (!mWriterDocumentStates.top().mbInNote) + { + mpCurrentContentElements->push_back(new TagCloseElement("table:table-cell")); + mWriterDocumentStates.top().mbTableCellOpened = false; + } } void DocumentCollector::insertCoveredTableCell(const WPXPropertyList & /* propList */) { - mpCurrentContentElements->push_back(static_cast(new TagOpenElement("table:covered-table-cell"))); - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("table:covered-table-cell"))); + if (!mWriterDocumentStates.top().mbInNote) + { + mpCurrentContentElements->push_back(new TagOpenElement("table:covered-table-cell")); + mpCurrentContentElements->push_back(new TagCloseElement("table:covered-table-cell")); + } } void DocumentCollector::closeTable() { - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("table:table"))); + if (!mWriterDocumentStates.top().mbInNote) + { + mpCurrentContentElements->push_back(new TagCloseElement("table:table")); + } } + void DocumentCollector::insertTab() { - mpCurrentContentElements->push_back(static_cast(new TagOpenElement("text:tab-stop"))); - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:tab-stop"))); + mpCurrentContentElements->push_back(new TagOpenElement("text:tab")); + mpCurrentContentElements->push_back(new TagCloseElement("text:tab")); +} + +void DocumentCollector::insertSpace() +{ + mpCurrentContentElements->push_back(new TagOpenElement("text:s")); + mpCurrentContentElements->push_back(new TagCloseElement("text:s")); } void DocumentCollector::insertLineBreak() { - mpCurrentContentElements->push_back(static_cast(new TagOpenElement("text:line-break"))); - mpCurrentContentElements->push_back(static_cast(new TagCloseElement("text:line-break"))); + mpCurrentContentElements->push_back(new TagOpenElement("text:line-break")); + mpCurrentContentElements->push_back(new TagCloseElement("text:line-break")); +} + +void DocumentCollector::insertField(const WPXString &type, const WPXPropertyList &propList) +{ + if (!type.len()) + return; + + TagOpenElement *openElement = new TagOpenElement(type.cstr()); + if (type == "text:page-number") + openElement->addAttribute("text:select-page", "current"); + + if (propList["style:num-format"]) + openElement->addAttribute("style:num-format", propList["style:num-format"]->getStr()); + + mpCurrentContentElements->push_back(openElement); + mpCurrentContentElements->push_back(new TagCloseElement(type.cstr())); } void DocumentCollector::insertText(const WPXString &text) @@ -931,4 +1092,221 @@ void DocumentCollector::insertText(const WPXString &text) mpCurrentContentElements->push_back(pText); } +void DocumentCollector::openFrame(const WPXPropertyList &propList) +{ + mWriterListStates.push(WriterListState()); + + // First, let's create a Frame Style for this box + TagOpenElement *frameStyleOpenElement = new TagOpenElement("style:style"); + WPXString frameStyleName; + frameStyleName.sprintf("GraphicFrame_%i", miObjectNumber); + frameStyleOpenElement->addAttribute("style:name", frameStyleName); + frameStyleOpenElement->addAttribute("style:family", "graphic"); + + mFrameStyles.push_back(frameStyleOpenElement); + + TagOpenElement *frameStylePropertiesOpenElement = new TagOpenElement("style:graphic-properties"); + + if (propList["text:anchor-type"]) + frameStylePropertiesOpenElement->addAttribute("text:anchor-type", propList["text:anchor-type"]->getStr()); + else + frameStylePropertiesOpenElement->addAttribute("text:anchor-type","paragraph"); + + if (propList["text:anchor-page-number"]) + frameStylePropertiesOpenElement->addAttribute("text:anchor-page-number", propList["text:anchor-page-number"]->getStr()); + + if (propList["svg:x"]) + frameStylePropertiesOpenElement->addAttribute("svg:x", propList["svg:x"]->getStr()); + + if (propList["svg:y"]) + frameStylePropertiesOpenElement->addAttribute("svg:y", propList["svg:y"]->getStr()); + + if (propList["svg:width"]) + frameStylePropertiesOpenElement->addAttribute("svg:width", propList["svg:width"]->getStr()); + + if (propList["svg:height"]) + frameStylePropertiesOpenElement->addAttribute("svg:height", propList["svg:height"]->getStr()); + + if (propList["style:rel-width"]) + frameStylePropertiesOpenElement->addAttribute("style:rel-width", propList["style:rel-width"]->getStr()); + + if (propList["style:rel-height"]) + frameStylePropertiesOpenElement->addAttribute("style:rel-height", propList["style:rel-height"]->getStr()); + + if (propList["fo:max-width"]) + frameStylePropertiesOpenElement->addAttribute("fo:max-width", propList["fo:max-width"]->getStr()); + + if (propList["fo:max-height"]) + frameStylePropertiesOpenElement->addAttribute("fo:max-height", propList["fo:max-height"]->getStr()); + + if (propList["style:wrap"]) + frameStylePropertiesOpenElement->addAttribute("style:wrap", propList["style:wrap"]->getStr()); + + mFrameStyles.push_back(frameStylePropertiesOpenElement); + + mFrameStyles.push_back(new TagCloseElement("style:graphic-properties")); + + mFrameStyles.push_back(new TagCloseElement("style:style")); + + // Now, let's create an automatic style for this frame + TagOpenElement *frameAutomaticStyleElement = new TagOpenElement("style:style"); + WPXString frameAutomaticStyleName; + frameAutomaticStyleName.sprintf("fr%i", miObjectNumber); + frameAutomaticStyleElement->addAttribute("style:name", frameAutomaticStyleName); + frameAutomaticStyleElement->addAttribute("style:family", "graphic"); + frameAutomaticStyleElement->addAttribute("style:parent-style-name", frameStyleName); + + mFrameAutomaticStyles.push_back(frameAutomaticStyleElement); + + TagOpenElement *frameAutomaticStylePropertiesElement = new TagOpenElement("style:graphic-properties"); + if (propList["style:horizontal-pos"]) + frameAutomaticStylePropertiesElement->addAttribute("style:horizontal-pos", propList["style:horizontal-pos"]->getStr()); + else + frameAutomaticStylePropertiesElement->addAttribute("style:horizontal-pos", "left"); + + if (propList["style:horizontal-rel"]) + frameAutomaticStylePropertiesElement->addAttribute("style:horizontal-rel", propList["style:horizontal-rel"]->getStr()); + else + frameAutomaticStylePropertiesElement->addAttribute("style:horizontal-rel", "paragraph"); + + if (propList["style:vertical-pos"]) + frameAutomaticStylePropertiesElement->addAttribute("style:vertical-pos", propList["style:vertical-pos"]->getStr()); + else + frameAutomaticStylePropertiesElement->addAttribute("style:vertical-pos", "top"); + + if (propList["style:vertical-rel"]) + frameAutomaticStylePropertiesElement->addAttribute("style:vertical-rel", propList["style:vertical-rel"]->getStr()); + else + frameAutomaticStylePropertiesElement->addAttribute("style:vertical-rel", "page-content"); + + if (propList["fo:max-width"]) + frameAutomaticStylePropertiesElement->addAttribute("fo:max-width", propList["fo:max-width"]->getStr()); + + if (propList["fo:max-height"]) + frameAutomaticStylePropertiesElement->addAttribute("fo:max-height", propList["fo:max-height"]->getStr()); + + frameAutomaticStylePropertiesElement->addAttribute("draw:ole-draw-aspect", "1"); + + mFrameAutomaticStyles.push_back(frameAutomaticStylePropertiesElement); + + mFrameAutomaticStyles.push_back(new TagCloseElement("style:graphic-properties")); + + mFrameAutomaticStyles.push_back(new TagCloseElement("style:style")); + + // And write the frame itself + TagOpenElement *drawFrameOpenElement = new TagOpenElement("draw:frame"); + + drawFrameOpenElement->addAttribute("draw:style-name", frameAutomaticStyleName); + WPXString objectName; + objectName.sprintf("Object%i", miObjectNumber++); + drawFrameOpenElement->addAttribute("draw:name", objectName); + if (propList["text:anchor-type"]) + drawFrameOpenElement->addAttribute("text:anchor-type", propList["text:anchor-type"]->getStr()); + else + drawFrameOpenElement->addAttribute("text:anchor-type","paragraph"); + + if (propList["text:anchor-page-number"]) + drawFrameOpenElement->addAttribute("text:anchor-page-number", propList["text:anchor-page-number"]->getStr()); + + if (propList["svg:x"]) + drawFrameOpenElement->addAttribute("svg:x", propList["svg:x"]->getStr()); + + if (propList["svg:y"]) + drawFrameOpenElement->addAttribute("svg:y", propList["svg:y"]->getStr()); + + if (propList["svg:width"]) + drawFrameOpenElement->addAttribute("svg:width", propList["svg:width"]->getStr()); + + if (propList["svg:height"]) + drawFrameOpenElement->addAttribute("svg:height", propList["svg:height"]->getStr()); + + if (propList["style:rel-width"]) + drawFrameOpenElement->addAttribute("style:rel-width", propList["style:rel-width"]->getStr()); + + if (propList["style:rel-height"]) + drawFrameOpenElement->addAttribute("style:rel-height", propList["style:rel-height"]->getStr()); + + mpCurrentContentElements->push_back(drawFrameOpenElement); + + mWriterDocumentStates.top().mbInFrame = true; +} + +void DocumentCollector::closeFrame() +{ + if (mWriterListStates.size() > 1) + mWriterListStates.pop(); + + mpCurrentContentElements->push_back(new TagCloseElement("draw:frame")); + + mWriterDocumentStates.top().mbInFrame = false; +} + +void DocumentCollector::insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) +{ + if (!data.size()) + return; + if (!mWriterDocumentStates.top().mbInFrame) // Embedded objects without a frame simply don't make sense for us + return; + if (!propList["libwpd:mimetype"]) + return; + + if (propList["libwpd:mimetype"]->getStr() == "image/x-wpg") + { + std::vector tmpContentElements; + InternalHandler tmpHandler(&tmpContentElements); + OdgExporter exporter(&tmpHandler); + + libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT; + + if (!libwpg::WPGraphics::isSupported(const_cast(data.getDataStream()))) + fileFormat = libwpg::WPG_WPG1; + + if (libwpg::WPGraphics::parse(const_cast(data.getDataStream()), &exporter, fileFormat) && !tmpContentElements.empty()) + { + mpCurrentContentElements->push_back(new TagOpenElement("draw:object")); + for (std::vector::const_iterator iter = tmpContentElements.begin(); iter != tmpContentElements.end(); iter++) + mpCurrentContentElements->push_back(*iter); + mpCurrentContentElements->push_back(new TagCloseElement("draw:object")); + } + } + else + { + mpCurrentContentElements->push_back(new TagOpenElement("draw:image")); + + mpCurrentContentElements->push_back(new TagOpenElement("office:binary-data")); + + WPXString binaryBase64Data = data.getBase64Data(); + + mpCurrentContentElements->push_back(new CharDataElement(binaryBase64Data.cstr())); + + mpCurrentContentElements->push_back(new TagCloseElement("office:binary-data")); + + mpCurrentContentElements->push_back(new TagCloseElement("draw:image")); + } +} + +void DocumentCollector::openTextBox(const WPXPropertyList & /*propList*/) +{ + if (!mWriterDocumentStates.top().mbInFrame) // Text box without a frame simply doesn't make sense for us + return; + mWriterListStates.push(WriterListState()); + mWriterDocumentStates.push(WriterDocumentState()); + mpCurrentContentElements->push_back(new TagOpenElement("draw:text-box")); + mWriterDocumentStates.top().mbInTextBox = true; + mWriterDocumentStates.top().mbFirstElement = false; +} + +void DocumentCollector::closeTextBox() +{ + if (!mWriterDocumentStates.top().mbInTextBox) + return; + if (mWriterListStates.size() > 1) + mWriterListStates.pop(); + if (mWriterDocumentStates.size() > 1) + mWriterDocumentStates.pop(); + + mpCurrentContentElements->push_back(new TagCloseElement("draw:text-box")); +} + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/filter/DocumentCollector.hxx b/writerperfect/source/filter/DocumentCollector.hxx index 218cc686a3bf..619bc1de603d 100644 --- a/writerperfect/source/filter/DocumentCollector.hxx +++ b/writerperfect/source/filter/DocumentCollector.hxx @@ -46,8 +46,9 @@ #include #include +#include "DocumentHandlerInterface.hxx" + class DocumentElement; -class DocumentHandler; class TagOpenElement; class FontStyle; class ListStyle; @@ -64,11 +65,29 @@ struct _WriterDocumentState _WriterDocumentState(); bool mbFirstElement; + bool mbFirstParagraphInPageSpan; bool mbInFakeSection; bool mbListElementOpenedAtCurrentLevel; bool mbTableCellOpened; bool mbHeaderRow; bool mbInNote; + bool mbInTextBox; + bool mbInFrame; +}; + +// list state +typedef struct _WriterListState WriterListState; +struct _WriterListState +{ + _WriterListState(); + + ListStyle *mpCurrentListStyle; + unsigned int miCurrentListLevel; + unsigned int miLastListLevel; + unsigned int miLastListNumber; + bool mbListContinueNumbering; + bool mbListElementParagraphOpened; + std::stack mbListElementOpened; }; enum WriterListType { unordered, ordered }; @@ -81,20 +100,23 @@ struct ltstr } }; -class DocumentCollector : public WPXHLListenerImpl +class DocumentCollector : public WPXDocumentInterface { public: - DocumentCollector(WPSInputStream *pInput, DocumentHandler *pHandler); + DocumentCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler); virtual ~DocumentCollector(); bool filter(); - virtual void setDocumentMetaData(const WPXPropertyList & /* propList */) {} + // WPXDocumentInterface's callbacks + virtual void setDocumentMetaData(const WPXPropertyList &propList); virtual void startDocument() {} virtual void endDocument() {} + virtual void definePageStyle(const WPXPropertyList&) {} virtual void openPageSpan(const WPXPropertyList &propList); virtual void closePageSpan() {} + virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns); virtual void closeSection(); @@ -103,16 +125,19 @@ public: virtual void openFooter(const WPXPropertyList &propList); virtual void closeFooter(); + virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); virtual void closeParagraph(); + virtual void defineCharacterStyle(const WPXPropertyList&) {} virtual void openSpan(const WPXPropertyList &propList); virtual void closeSpan(); - virtual void insertTab(); + virtual void insertSpace(); virtual void insertText(const WPXString &text); virtual void insertLineBreak(); + virtual void insertField(const WPXString &type, const WPXPropertyList &propList); virtual void defineOrderedListLevel(const WPXPropertyList &propList); virtual void defineUnorderedListLevel(const WPXPropertyList &propList); @@ -127,6 +152,10 @@ public: virtual void closeFootnote(); virtual void openEndnote(const WPXPropertyList &propList); virtual void closeEndnote(); + virtual void openComment(const WPXPropertyList &propList); + virtual void closeComment(); + virtual void openTextBox(const WPXPropertyList &propList); + virtual void closeTextBox(); virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns); virtual void openTableRow(const WPXPropertyList &propList); @@ -135,25 +164,34 @@ public: virtual void closeTableCell(); virtual void insertCoveredTableCell(const WPXPropertyList &propList); virtual void closeTable(); - virtual bool parseSourceDocument(WPSInputStream &input) = 0; + + virtual void openFrame(const WPXPropertyList & propList); + virtual void closeFrame(); + + virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data); + virtual void insertEquation(const WPXPropertyList & /* propList */, const WPXString & /* data */) {} + + virtual bool parseSourceDocument(WPXInputStream &input) = 0; protected: void _resetDocumentState(); - bool _writeTargetDocument(DocumentHandler *pHandler); - void _writeDefaultStyles(DocumentHandler *pHandler); - void _writeMasterPages(DocumentHandler *pHandler); - void _writePageMasters(DocumentHandler *pHandler); + bool _writeTargetDocument(DocumentHandlerInterface *pHandler); + void _writeDefaultStyles(DocumentHandlerInterface *pHandler); + void _writeMasterPages(DocumentHandlerInterface *pHandler); + void _writePageLayouts(DocumentHandlerInterface *pHandler); void _allocateFontName(const WPXString &); private: void _openListLevel(TagOpenElement *pListLevelOpenElement); - void _closeListLevel(const char *szListType); + void _closeListLevel(); - WPSInputStream *mpInput; - DocumentHandler *mpHandler; + WPXInputStream *mpInput; + DocumentHandlerInterface *mpHandler; bool mbUsed; // whether or not it has been before (you can only use me once!) - WriterDocumentState mWriterDocumentState; + std::stack mWriterDocumentStates; + + std::stack mWriterListStates; // paragraph styles std::map mTextStyleHash; @@ -171,6 +209,14 @@ private: // table styles std::vector mTableStyles; + // frame styles + std::vector mFrameStyles; + + std::vector mFrameAutomaticStyles; + + // metadata + std::vector mMetaData; + // list styles unsigned int miNumListStyles; @@ -186,18 +232,18 @@ private: PageSpan *mpCurrentPageSpan; int miNumPageStyles; - // list styles / state - ListStyle *mpCurrentListStyle; - unsigned int miCurrentListLevel; - unsigned int miLastListLevel; - unsigned int miLastListNumber; + // list styles std::vector mListStyles; - bool mbListContinueNumbering; - bool mbListElementOpened; - bool mbListElementParagraphOpened; + + // object state + unsigned miObjectNumber; // table state TableStyle *mpCurrentTableStyle; + + const bool mbIsFlatXML; + + const char * mpPassword; }; #endif diff --git a/writerperfect/source/filter/DocumentElement.cxx b/writerperfect/source/filter/DocumentElement.cxx index 2a92d488ec43..f330ab0ace47 100644 --- a/writerperfect/source/filter/DocumentElement.cxx +++ b/writerperfect/source/filter/DocumentElement.cxx @@ -27,6 +27,7 @@ */ #include "DocumentElement.hxx" +#include "DocumentHandler.hxx" #include "FilterInternal.hxx" #include @@ -37,7 +38,7 @@ void TagElement::print() const WRITER_DEBUG_MSG(("%s\n", msTagName.cstr())); } -void TagOpenElement::write(DocumentHandler *pHandler) const +void TagOpenElement::write(DocumentHandlerInterface *pHandler) const { pHandler->startElement(getTagName().cstr(), maAttrList); } @@ -52,14 +53,14 @@ void TagOpenElement::addAttribute(const char *szAttributeName, const WPXString & maAttrList.insert(szAttributeName, sAttributeValue); } -void TagCloseElement::write(DocumentHandler *pHandler) const +void TagCloseElement::write(DocumentHandlerInterface *pHandler) const { WRITER_DEBUG_MSG(("TagCloseElement: write (%s)\n", getTagName().cstr())); pHandler->endElement(getTagName().cstr()); } -void CharDataElement::write(DocumentHandler *pHandler) const +void CharDataElement::write(DocumentHandlerInterface *pHandler) const { WRITER_DEBUG_MSG(("TextElement: write\n")); pHandler->characters(msData); @@ -72,8 +73,10 @@ TextElement::TextElement(const WPXString & sTextBuf) : // write: writes a text run, appropriately converting spaces to // elements -void TextElement::write(DocumentHandler *pHandler) const +void TextElement::write(DocumentHandlerInterface *pHandler) const { + if (msTextBuf.len() <= 0) + return; WPXPropertyList xBlankAttrList; WPXString sTemp; diff --git a/writerperfect/source/filter/DocumentElement.hxx b/writerperfect/source/filter/DocumentElement.hxx index 3481359278c2..cb84777a278a 100644 --- a/writerperfect/source/filter/DocumentElement.hxx +++ b/writerperfect/source/filter/DocumentElement.hxx @@ -28,30 +28,25 @@ #ifndef _DOCUMENTELEMENT_H #define _DOCUMENTELEMENT_H -#if defined _MSC_VER -#pragma warning( push, 1 ) -#endif #include #include #include -#if defined _MSC_VER -#pragma warning( pop ) -#endif #include -#include "DocumentHandler.hxx" +#include "DocumentHandlerInterface.hxx" class DocumentElement { public: virtual ~DocumentElement() {} - virtual void write(DocumentHandler *pHandler) const = 0; + virtual void write(DocumentHandlerInterface *pHandler) const = 0; virtual void print() const {} }; class TagElement : public DocumentElement { public: + virtual ~TagElement() {} TagElement(const char *szTagName) : msTagName(szTagName) {} const WPXString & getTagName() const { return msTagName; } virtual void print() const; @@ -63,9 +58,9 @@ class TagOpenElement : public TagElement { public: TagOpenElement(const char *szTagName) : TagElement(szTagName) {} - ~TagOpenElement() {} + virtual ~TagOpenElement() {} void addAttribute(const char *szAttributeName, const WPXString &sAttributeValue); - virtual void write(DocumentHandler *pHandler) const; + virtual void write(DocumentHandlerInterface *pHandler) const; virtual void print () const; private: WPXPropertyList maAttrList; @@ -75,14 +70,16 @@ class TagCloseElement : public TagElement { public: TagCloseElement(const char *szTagName) : TagElement(szTagName) {} - virtual void write(DocumentHandler *pHandler) const; + virtual ~TagCloseElement() {} + virtual void write(DocumentHandlerInterface *pHandler) const; }; class CharDataElement : public DocumentElement { public: CharDataElement(const char *sData) : DocumentElement(), msData(sData) {} - virtual void write(DocumentHandler *pHandler) const; + virtual ~CharDataElement() {} + virtual void write(DocumentHandlerInterface *pHandler) const; private: WPXString msData; }; @@ -91,7 +88,8 @@ class TextElement : public DocumentElement { public: TextElement(const WPXString & sTextBuf); - virtual void write(DocumentHandler *pHandler) const; + virtual ~TextElement() {} + virtual void write(DocumentHandlerInterface *pHandler) const; private: WPXString msTextBuf; diff --git a/writerperfect/source/filter/DocumentHandler.cxx b/writerperfect/source/filter/DocumentHandler.cxx index 8d4cc9b820a7..c61ffc0c19c5 100644 --- a/writerperfect/source/filter/DocumentHandler.cxx +++ b/writerperfect/source/filter/DocumentHandler.cxx @@ -29,6 +29,8 @@ #include +// #define DEBUG_XML 1 + using namespace ::rtl; using rtl::OUString; @@ -41,19 +43,19 @@ DocumentHandler::DocumentHandler(Reference < XDocumentHandler > &xHandler) : void DocumentHandler::startDocument() { - WRITER_DEBUG_MSG(("DocumentHandler::startDocument\n")); mxHandler->startDocument(); } void DocumentHandler::endDocument() { - WRITER_DEBUG_MSG(("DocumentHandler::endDocument\n")); mxHandler->endDocument(); } void DocumentHandler::startElement(const char *psName, const WPXPropertyList &xPropList) { - WRITER_DEBUG_MSG(("DocumentHandler::startElement\n")); +#ifdef DEBUG_XML + printf("<%s", psName); +#endif SvXMLAttributeList *pAttrList = new SvXMLAttributeList(); Reference < XAttributeList > xAttrList(pAttrList); WPXPropertyList::Iter i(xPropList); @@ -61,23 +63,36 @@ void DocumentHandler::startElement(const char *psName, const WPXPropertyList &xP { // filter out libwpd elements if (strncmp(i.key(), "libwpd", 6) != 0) + { pAttrList->AddAttribute(OUString::createFromAscii(i.key()), OUString::createFromAscii(i()->getStr().cstr())); +#ifdef DEBUG_XML + printf(" %s=\"%s\"", i.key(), i()->getStr().cstr()); +#endif } + } +#ifdef DEBUG_XML + printf(">"); +#endif mxHandler->startElement(OUString::createFromAscii(psName), xAttrList); } void DocumentHandler::endElement(const char *psName) { - WRITER_DEBUG_MSG(("DocumentHandler::endElement\n")); +#ifdef DEBUG_XML + printf("", psName); +#endif mxHandler->endElement(OUString::createFromAscii(psName)); } void DocumentHandler::characters(const WPXString &sCharacters) { - WRITER_DEBUG_MSG(("DocumentHandler::characters\n")); OUString sCharU16(sCharacters.cstr(), strlen(sCharacters.cstr()), RTL_TEXTENCODING_UTF8); +#ifdef DEBUG_XML + WPXString sEscapedCharacters(sCharacters, true); + printf("%s", sEscapedCharacters.cstr()); +#endif mxHandler->characters(sCharU16); } diff --git a/writerperfect/source/filter/DocumentHandler.hxx b/writerperfect/source/filter/DocumentHandler.hxx index 82a82132fec8..249f64ff4e7b 100644 --- a/writerperfect/source/filter/DocumentHandler.hxx +++ b/writerperfect/source/filter/DocumentHandler.hxx @@ -12,10 +12,12 @@ #pragma warning( pop ) #endif +#include "DocumentHandlerInterface.hxx" + using com::sun::star::uno::Reference; using com::sun::star::xml::sax::XDocumentHandler; -class DocumentHandler +class DocumentHandler: public DocumentHandlerInterface { public: DocumentHandler(Reference < XDocumentHandler > &xHandler); diff --git a/writerperfect/source/filter/DocumentHandlerInterface.hxx b/writerperfect/source/filter/DocumentHandlerInterface.hxx new file mode 100644 index 000000000000..73ced7d39650 --- /dev/null +++ b/writerperfect/source/filter/DocumentHandlerInterface.hxx @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2004 William Lachance (wlach@interlog.com) + * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + * + * Contributor(s): Martin Gallwey (gallwey@sun.com) + * + */ + +/* "This product is not manufactured, approved, or supported by + * Corel Corporation or Corel Corporation Limited." + */ +#ifndef _DOCUMENTHANDLERINTERFACE_H +#define _DOCUMENTHANDLERINTERFACE_H +#include +#include +#include + +class DocumentHandlerInterface +{ +public: + DocumentHandlerInterface() {}; + virtual ~DocumentHandlerInterface() {}; + + virtual void startDocument() = 0; + virtual void endDocument() = 0; + virtual void startElement(const char *psName, const WPXPropertyList &xPropList) = 0; + virtual void endElement(const char *psName) = 0; + virtual void characters(const WPXString &sCharacters) = 0; +}; +#endif diff --git a/writerperfect/source/filter/FilterInternal.hxx b/writerperfect/source/filter/FilterInternal.hxx index 1275f7d13091..c53e83ec5d35 100644 --- a/writerperfect/source/filter/FilterInternal.hxx +++ b/writerperfect/source/filter/FilterInternal.hxx @@ -20,6 +20,10 @@ * For further information visit http://libwpd.sourceforge.net * */ + +#ifndef _FILTERINTERNAL_HXX +#define _FILTERINTERNAL_HXX + #include #ifdef DEBUG #define WRITER_DEBUG_MSG(M) printf M @@ -31,4 +35,6 @@ const float fDefaultSideMargin = 1.0f; // inches const float fDefaultPageWidth = 8.5f; // inches (OOo required default: we will handle this later) const float fDefaultPageHeight = 11.0f; // inches +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/filter/FontStyle.cxx b/writerperfect/source/filter/FontStyle.cxx index 69195f0f41c0..e15c6651edd9 100644 --- a/writerperfect/source/filter/FontStyle.cxx +++ b/writerperfect/source/filter/FontStyle.cxx @@ -30,7 +30,7 @@ #include "DocumentElement.hxx" FontStyle::FontStyle(const char *psName, const char *psFontFamily) : Style(psName), - msFontFamily(psFontFamily), + msFontFamily(psFontFamily, true), msFontPitch(IMP_DEFAULT_FONT_PITCH) { } @@ -39,14 +39,14 @@ FontStyle::~FontStyle() { } -void FontStyle::write(DocumentHandler *pHandler) const +void FontStyle::write(DocumentHandlerInterface *pHandler) const { - TagOpenElement styleOpen("style:font-decl"); + TagOpenElement styleOpen("style:font-face"); styleOpen.addAttribute("style:name", getName()); - styleOpen.addAttribute("fo:font-family", msFontFamily); - styleOpen.addAttribute("style:font-pitch", msFontPitch); + styleOpen.addAttribute("svg:font-family", msFontFamily); +// styleOpen.addAttribute("style:font-pitch", msFontPitch); styleOpen.write(pHandler); - TagCloseElement styleClose("style:font-decl"); + TagCloseElement styleClose("style:font-face"); styleClose.write(pHandler); } diff --git a/writerperfect/source/filter/FontStyle.hxx b/writerperfect/source/filter/FontStyle.hxx index 8d16b13c41ba..aec430dbd43e 100644 --- a/writerperfect/source/filter/FontStyle.hxx +++ b/writerperfect/source/filter/FontStyle.hxx @@ -27,23 +27,18 @@ */ #ifndef _FONTSTYLE_H #define _FONTSTYLE_H -#if defined _MSC_VER -#pragma warning( push, 1 ) -#endif #include -#if defined _MSC_VER -#pragma warning( pop ) -#endif #include "Style.hxx" #include "WriterProperties.hxx" +#include "DocumentHandlerInterface.hxx" class FontStyle : public Style { public: FontStyle(const char *psName, const char *psFontFamily); ~FontStyle(); - virtual void write(DocumentHandler *pHandler) const; + virtual void write(DocumentHandlerInterface *pHandler) const; const WPXString &getFontFamily() const { return msFontFamily; } private: diff --git a/writerperfect/source/filter/GraphicsStyle.cxx b/writerperfect/source/filter/GraphicsStyle.cxx new file mode 100644 index 000000000000..4067f55baf46 --- /dev/null +++ b/writerperfect/source/filter/GraphicsStyle.cxx @@ -0,0 +1,40 @@ +/* GraphicsStyle: + * + * Copyright (C) 2007 Fridrich Strba .strba@bluewin.ch) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * For further information visit http://libwpd.sourceforge.net + * + */ + +/* "This product is not manufactured, approved, or supported by + * Corel Corporation or Corel Corporation Limited." + */ +#include "GraphicsStyle.hxx" +#include "WriterProperties.hxx" +#include "DocumentElement.hxx" + +GraphicsStyle::GraphicsStyle(const char *psName) : Style(psName) +{ +} + +GraphicsStyle::~GraphicsStyle() +{ +} + +void GraphicsStyle::write(DocumentHandlerInterface * /* pHandler */) const +{ +} diff --git a/writerperfect/source/filter/GraphicsStyle.hxx b/writerperfect/source/filter/GraphicsStyle.hxx new file mode 100644 index 000000000000..b6ee0c66da88 --- /dev/null +++ b/writerperfect/source/filter/GraphicsStyle.hxx @@ -0,0 +1,40 @@ +/* GraphicsStyle: + * + * Copyright (C) 2007 Fridrich Strba .strba@bluewin.ch) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * For further information visit http://libwpd.sourceforge.net + * + */ + +/* "This product is not manufactured, approved, or supported by + * Corel Corporation or Corel Corporation Limited." + */ +#ifndef _GRAPHICSSTYLE_H +#define _GRAPHICSSTYLE_H + +#include "Style.hxx" +#include "WriterProperties.hxx" +#include "DocumentHandlerInterface.hxx" + +class GraphicsStyle : public Style +{ +public: + GraphicsStyle(const char *psName); + ~GraphicsStyle(); + virtual void write(DocumentHandlerInterface *pHandler) const; +}; +#endif diff --git a/writerperfect/source/filter/InternalHandler.cxx b/writerperfect/source/filter/InternalHandler.cxx new file mode 100644 index 000000000000..82479bd2221a --- /dev/null +++ b/writerperfect/source/filter/InternalHandler.cxx @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2007 Fridrich Strba .strba@bluewin.ch) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +/* "This product is not manufactured, approved, or supported by + * Corel Corporation or Corel Corporation Limited." + */ + +#include "InternalHandler.hxx" + +#include + +InternalHandler::InternalHandler(std::vector *elements): + mpElements(elements) +{ +} + +void InternalHandler::startElement(const char *psName, const WPXPropertyList &xPropList) +{ + TagOpenElement *element = new TagOpenElement(psName); + WPXPropertyList::Iter i(xPropList); + for (i.rewind(); i.next(); ) + { + // filter out libwpd elements + if (strncmp(i.key(), "libwpd", 6) != 0) + element->addAttribute(i.key(), i()->getStr()); + } + mpElements->push_back(element); +} + +void InternalHandler::endElement(const char *psName) +{ + mpElements->push_back(new TagCloseElement(psName)); +} + +void InternalHandler::characters(const WPXString &sCharacters) +{ + mpElements->push_back(new CharDataElement(sCharacters.cstr())); +} diff --git a/writerperfect/source/filter/InternalHandler.hxx b/writerperfect/source/filter/InternalHandler.hxx new file mode 100644 index 000000000000..9913ac803652 --- /dev/null +++ b/writerperfect/source/filter/InternalHandler.hxx @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2007 Fridrich Strba .strba@bluewin.ch) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +/* "This product is not manufactured, approved, or supported by + * Corel Corporation or Corel Corporation Limited." + */ + +#ifndef _INTERNALHANDLER_H +#define _INTERNALHANDLER_H +#include +#include +#include +#include "DocumentElement.hxx" +#include "DocumentHandlerInterface.hxx" + +class InternalHandler : public DocumentHandlerInterface +{ +public: + InternalHandler(std::vector *elements); + ~InternalHandler() {}; + + void startDocument() {}; + void endDocument() {}; + void startElement(const char *psName, const WPXPropertyList &xPropList); + void endElement(const char *psName); + void characters(const WPXString &sCharacters); +private: + std::vector *mpElements; +}; +#endif diff --git a/writerperfect/source/filter/ListStyle.cxx b/writerperfect/source/filter/ListStyle.cxx index 3373d316dea1..c7fdc0d0a835 100644 --- a/writerperfect/source/filter/ListStyle.cxx +++ b/writerperfect/source/filter/ListStyle.cxx @@ -42,34 +42,46 @@ void OrderedListStyle::updateListLevel(const int iLevel, const WPXPropertyList & setListLevel(iLevel, new OrderedListLevelStyle(xPropList)); } -void OrderedListLevelStyle::write(DocumentHandler *pHandler, int iLevel) const +void OrderedListLevelStyle::write(DocumentHandlerInterface *pHandler, int iLevel) const { WPXString sLevel; sLevel.sprintf("%i", (iLevel+1)); TagOpenElement listLevelStyleOpen("text:list-level-style-number"); listLevelStyleOpen.addAttribute("text:level", sLevel); - listLevelStyleOpen.addAttribute("text:style-name", "Numbering Symbols"); + listLevelStyleOpen.addAttribute("text:style-name", "Numbering_Symbols"); if (mPropList["style:num-prefix"]) - listLevelStyleOpen.addAttribute("style:num-prefix", mPropList["style:num-prefix"]->getStr()); + { + WPXString sEscapedString(mPropList["style:num-prefix"]->getStr(), true); + listLevelStyleOpen.addAttribute("style:num-prefix", sEscapedString); + } if (mPropList["style:num-suffix"]) - listLevelStyleOpen.addAttribute("style:num-suffix", mPropList["style:num-suffix"]->getStr()); + { + WPXString sEscapedString(mPropList["style:num-suffix"]->getStr(), true); + listLevelStyleOpen.addAttribute("style:num-suffix", sEscapedString); + } if (mPropList["style:num-format"]) listLevelStyleOpen.addAttribute("style:num-format", mPropList["style:num-format"]->getStr()); if (mPropList["text:start-value"]) + { + // odf as to the version 1.1 does require the text:start-value to be a positive integer, means > 0 + if (mPropList["text:start-value"]->getInt() > 0) listLevelStyleOpen.addAttribute("text:start-value", mPropList["text:start-value"]->getStr()); + else + listLevelStyleOpen.addAttribute("text:start-value", "1"); + } listLevelStyleOpen.write(pHandler); - TagOpenElement stylePropertiesOpen("style:properties"); - if (mPropList["text:space-before"]) + TagOpenElement stylePropertiesOpen("style:list-level-properties"); + if (mPropList["text:space-before"] && mPropList["text:space-before"]->getDouble() > 0.0f) stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); - if (mPropList["text:min-label-width"]) + if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getDouble() > 0.0f) stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr()); - if (mPropList["text:min-label-distance"]) + if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getDouble() > 0.0f) stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr()); stylePropertiesOpen.write(pHandler); - pHandler->endElement("style:properties"); + pHandler->endElement("style:list-level-properties"); pHandler->endElement("text:list-level-style-number"); } @@ -86,29 +98,38 @@ void UnorderedListStyle::updateListLevel(const int iLevel, const WPXPropertyList setListLevel(iLevel, new UnorderedListLevelStyle(xPropList)); } -void UnorderedListLevelStyle::write(DocumentHandler *pHandler, int iLevel) const +void UnorderedListLevelStyle::write(DocumentHandlerInterface *pHandler, int iLevel) const { WPXString sLevel; sLevel.sprintf("%i", (iLevel+1)); TagOpenElement listLevelStyleOpen("text:list-level-style-bullet"); listLevelStyleOpen.addAttribute("text:level", sLevel); - listLevelStyleOpen.addAttribute("text:style-name", "Bullet Symbols"); - listLevelStyleOpen.addAttribute("style:num-suffice", "."); - if (mPropList["text:bullet-char"]) - listLevelStyleOpen.addAttribute("text:bullet-char", mPropList["text:bullet-char"]->getStr()); + listLevelStyleOpen.addAttribute("text:style-name", "Bullet_Symbols"); + if (mPropList["text:bullet-char"] && (mPropList["text:bullet-char"]->getStr().len())) + { + // The following is needed because the odf format does not accept bullet chars longer than one character + WPXString::Iter i(mPropList["text:bullet-char"]->getStr()); i.rewind(); + WPXString sEscapedString("."); + if (i.next()) + sEscapedString = WPXString(i(), true); + listLevelStyleOpen.addAttribute("text:bullet-char", sEscapedString); + + } + else + listLevelStyleOpen.addAttribute("text:bullet-char", "."); listLevelStyleOpen.write(pHandler); - TagOpenElement stylePropertiesOpen("style:properties"); - if (mPropList["text:space-before"]) + TagOpenElement stylePropertiesOpen("style:list-level-properties"); + if (mPropList["text:space-before"] && mPropList["text:space-before"]->getDouble() > 0.0f) stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); - if (mPropList["text:min-label-width"]) + if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getDouble() > 0.0f) stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr()); - if (mPropList["text:min-label-distance"]) + if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getDouble() > 0.0f) stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr()); stylePropertiesOpen.addAttribute("style:font-name", "OpenSymbol"); stylePropertiesOpen.write(pHandler); - pHandler->endElement("style:properties"); + pHandler->endElement("style:list-level-properties"); pHandler->endElement("text:list-level-style-bullet"); } @@ -147,7 +168,7 @@ void ListStyle::setListLevel(int iLevel, ListLevelStyle *iListLevelStyle) mppListLevels[iLevel] = iListLevelStyle; } -void ListStyle::write(DocumentHandler *pHandler) const +void ListStyle::write(DocumentHandlerInterface *pHandler) const { TagOpenElement listStyleOpenElement("text:list-style"); listStyleOpenElement.addAttribute("style:name", getName()); diff --git a/writerperfect/source/filter/ListStyle.hxx b/writerperfect/source/filter/ListStyle.hxx index c3549344a682..cbba20a8352e 100644 --- a/writerperfect/source/filter/ListStyle.hxx +++ b/writerperfect/source/filter/ListStyle.hxx @@ -27,18 +27,13 @@ */ #ifndef _LISTSTYLE_H #define _LISTSTYLE_H -#if defined _MSC_VER -#pragma warning( push, 1 ) -#endif #include -#if defined _MSC_VER -#pragma warning( pop ) -#endif #define WP6_NUM_LIST_LEVELS 8 // see WP6FileStructure.h (we shouldn't need to reference this) #include "Style.hxx" #include "WriterProperties.hxx" +#include "DocumentHandlerInterface.hxx" class DocumentElement; @@ -46,14 +41,14 @@ class ListLevelStyle { public: virtual ~ListLevelStyle() {}; - virtual void write(DocumentHandler *pHandler, int iLevel) const = 0; + virtual void write(DocumentHandlerInterface *pHandler, int iLevel) const = 0; }; class OrderedListLevelStyle : public ListLevelStyle { public: OrderedListLevelStyle(const WPXPropertyList &xPropList); - void write(DocumentHandler *pHandler, int iLevel) const; + void write(DocumentHandlerInterface *pHandler, int iLevel) const; private: WPXPropertyList mPropList; }; @@ -62,7 +57,7 @@ class UnorderedListLevelStyle : public ListLevelStyle { public: UnorderedListLevelStyle(const WPXPropertyList &xPropList); - void write(DocumentHandler *pHandler, int iLevel) const; + void write(DocumentHandlerInterface *pHandler, int iLevel) const; private: WPXPropertyList mPropList; }; @@ -73,7 +68,7 @@ public: ListStyle(const char *psName, const int iListID); virtual ~ListStyle(); virtual void updateListLevel(const int iLevel, const WPXPropertyList &xPropList) = 0; - virtual void write(DocumentHandler *pHandler) const; + virtual void write(DocumentHandlerInterface *pHandler) const; int getListID() const { return miListID; } bool isListLevelDefined(int iLevel) const; diff --git a/writerperfect/source/filter/OdgExporter.cxx b/writerperfect/source/filter/OdgExporter.cxx new file mode 100644 index 000000000000..429fc8d10dd1 --- /dev/null +++ b/writerperfect/source/filter/OdgExporter.cxx @@ -0,0 +1,648 @@ +/* libwpg + * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) + * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301 USA + * + * For further information visit http://libwpg.sourceforge.net + */ + +/* "This product is not manufactured, approved, or supported by + * Corel Corporation or Corel Corporation Limited." + */ + +#include "OdgExporter.hxx" +#include "DocumentElement.hxx" +#include "DocumentHandler.hxx" +#include +#include +#include + +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + +OdgExporter::OdgExporter(DocumentHandlerInterface *pHandler): + mpHandler(pHandler), + miGradientIndex(1), + miDashIndex(1), + miGraphicsStyleIndex(1), + mfWidth(0.0), + mfHeight(0.0) +{ +} + +OdgExporter::~OdgExporter() +{ + + for (std::vector::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); iterBody++) + { + delete (*iterBody); + (*iterBody) = NULL; + } + + for (std::vector::iterator iterGraphicsAutomaticStyles = mGraphicsAutomaticStyles.begin(); + iterGraphicsAutomaticStyles != mGraphicsAutomaticStyles.end(); iterGraphicsAutomaticStyles++) + { + delete((*iterGraphicsAutomaticStyles)); + } + + for (std::vector::iterator iterGraphicsStrokeDashStyles = mGraphicsStrokeDashStyles.begin(); + iterGraphicsStrokeDashStyles != mGraphicsStrokeDashStyles.end(); iterGraphicsStrokeDashStyles++) + { + delete((*iterGraphicsStrokeDashStyles)); + } + + for (std::vector::iterator iterGraphicsGradientStyles = mGraphicsGradientStyles.begin(); + iterGraphicsGradientStyles != mGraphicsGradientStyles.end(); iterGraphicsGradientStyles++) + { + delete((*iterGraphicsGradientStyles)); + } +} + +void OdgExporter::startGraphics(const ::WPXPropertyList &propList) +{ + miGradientIndex = 1; + miDashIndex = 1; + miGraphicsStyleIndex = 1; + mfWidth = 0.0; + mfHeight = 0.0; + + if (propList["svg:width"]) + mfWidth = propList["svg:width"]->getDouble(); + + if (propList["svg:height"]) + mfHeight = propList["svg:height"]->getDouble(); + + mpHandler->startDocument(); + TagOpenElement tmpOfficeDocumentContent("office:document"); + tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0"); + tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0"); + tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0"); + tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); + tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/"); + tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); + tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); + tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"); + tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office"); + tmpOfficeDocumentContent.addAttribute("office:version", "1.0"); + tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/vnd.oasis.opendocument.graphics"); + tmpOfficeDocumentContent.write(mpHandler); + + TagOpenElement("office:settings").write(mpHandler); + + TagOpenElement configItemSetOpenElement("config:config-item-set"); + configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings"); + configItemSetOpenElement.write(mpHandler); + + TagOpenElement configItemOpenElement("config:config-item"); + + configItemOpenElement.addAttribute("config:name", "VisibleAreaTop"); + configItemOpenElement.addAttribute("config:type", "int"); + configItemOpenElement.write(mpHandler); + mpHandler->characters("0"); + mpHandler->endElement("config:config-item"); + + configItemOpenElement.addAttribute("config:name", "VisibleAreaLeft"); + configItemOpenElement.addAttribute("config:type", "int"); + configItemOpenElement.write(mpHandler); + mpHandler->characters("0"); + mpHandler->endElement("config:config-item"); + + configItemOpenElement.addAttribute("config:name", "VisibleAreaWidth"); + configItemOpenElement.addAttribute("config:type", "int"); + configItemOpenElement.write(mpHandler); + WPXString sWidth; sWidth.sprintf("%li", (unsigned long)(2540 * mfWidth)); + mpHandler->characters(sWidth); + mpHandler->endElement("config:config-item"); + + configItemOpenElement.addAttribute("config:name", "VisibleAreaHeight"); + configItemOpenElement.addAttribute("config:type", "int"); + configItemOpenElement.write(mpHandler); + WPXString sHeight; sHeight.sprintf("%li", (unsigned long)(2540 * mfHeight)); + mpHandler->characters(sHeight); + mpHandler->endElement("config:config-item"); + + mpHandler->endElement("config:config-item-set"); + + mpHandler->endElement("office:settings"); +} + +void OdgExporter::endGraphics() +{ + TagOpenElement("office:styles").write(mpHandler); + + for (std::vector::const_iterator iterGraphicsStrokeDashStyles = mGraphicsStrokeDashStyles.begin(); + iterGraphicsStrokeDashStyles != mGraphicsStrokeDashStyles.end(); iterGraphicsStrokeDashStyles++) + { + (*iterGraphicsStrokeDashStyles)->write(mpHandler); + } + + for (std::vector::const_iterator iterGraphicsGradientStyles = mGraphicsGradientStyles.begin(); + iterGraphicsGradientStyles != mGraphicsGradientStyles.end(); iterGraphicsGradientStyles++) + { + (*iterGraphicsGradientStyles)->write(mpHandler); + } + + mpHandler->endElement("office:styles"); + + TagOpenElement("office:automatic-styles").write(mpHandler); + + // writing out the graphics automatic styles + for (std::vector::iterator iterGraphicsAutomaticStyles = mGraphicsAutomaticStyles.begin(); + iterGraphicsAutomaticStyles != mGraphicsAutomaticStyles.end(); iterGraphicsAutomaticStyles++) + { + (*iterGraphicsAutomaticStyles)->write(mpHandler); + } + + TagOpenElement tmpStylePageLayoutOpenElement("style:page-layout"); + tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0"); + tmpStylePageLayoutOpenElement.write(mpHandler); + + TagOpenElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties"); + tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in"); + tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in"); + tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in"); + tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in"); + WPXString sValue; + sValue = doubleToString(mfWidth); sValue.append("in"); + tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", sValue); + sValue = doubleToString(mfHeight); sValue.append("in"); + tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", sValue); + tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait"); + tmpStylePageLayoutPropertiesOpenElement.write(mpHandler); + + mpHandler->endElement("style:page-layout-properties"); + + mpHandler->endElement("style:page-layout"); + + TagOpenElement tmpStyleStyleOpenElement("style:style"); + tmpStyleStyleOpenElement.addAttribute("style:name", "dp1"); + tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page"); + tmpStyleStyleOpenElement.write(mpHandler); + + TagOpenElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties"); + // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border"); + tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none"); + tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler); + + mpHandler->endElement("style:drawing-page-properties"); + + mpHandler->endElement("style:style"); + + mpHandler->endElement("office:automatic-styles"); + + TagOpenElement("office:master-styles").write(mpHandler); + + TagOpenElement tmpStyleMasterPageOpenElement("style:master-page"); + tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default"); + tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0"); + tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1"); + tmpStyleMasterPageOpenElement.write(mpHandler); + + mpHandler->endElement("style:master-page"); + + mpHandler->endElement("office:master-styles"); + + TagOpenElement("office:body").write(mpHandler); + + TagOpenElement("office:drawing").write(mpHandler); + + TagOpenElement tmpDrawPageOpenElement("draw:page"); + tmpDrawPageOpenElement.addAttribute("draw:name", "page1"); + tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1"); + tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default"); + tmpDrawPageOpenElement.write(mpHandler); + + for (std::vector::const_iterator bodyIter = mBodyElements.begin(); + bodyIter != mBodyElements.end(); bodyIter++) + { + (*bodyIter)->write(mpHandler); + } + + mpHandler->endElement("draw:page"); + mpHandler->endElement("office:drawing"); + mpHandler->endElement("office:body"); + + mpHandler->endElement("office:document"); + + mpHandler->endDocument(); +} + +void OdgExporter::setStyle(const ::WPXPropertyList & propList, const ::WPXPropertyListVector& gradient) +{ + mxStyle = propList; + mxGradient = gradient; +} + +void OdgExporter::startLayer(const ::WPXPropertyList & /* propList */) +{ +} + +void OdgExporter::endLayer() +{ +} + +void OdgExporter::drawRectangle(const ::WPXPropertyList &propList) +{ + writeGraphicsStyle(); + TagOpenElement *pDrawRectElement = new TagOpenElement("draw:rect"); + WPXString sValue; + sValue.sprintf("gr%i", miGraphicsStyleIndex-1); + pDrawRectElement->addAttribute("draw:style-name", sValue); + pDrawRectElement->addAttribute("svg:x", propList["svg:x"]->getStr()); + pDrawRectElement->addAttribute("svg:y", propList["svg:y"]->getStr()); + pDrawRectElement->addAttribute("svg:width", propList["svg:width"]->getStr()); + pDrawRectElement->addAttribute("svg:height", propList["svg:height"]->getStr()); + // FIXME: what to do when rx != ry ? + if (propList["svg:rx"]) + pDrawRectElement->addAttribute("draw:corner-radius", propList["svg:rx"]->getStr()); + else + pDrawRectElement->addAttribute("draw:corner-radius", "0.0000in"); + mBodyElements.push_back(pDrawRectElement); + mBodyElements.push_back(new TagCloseElement("draw:rect")); +} + +void OdgExporter::drawEllipse(const ::WPXPropertyList &propList) +{ + writeGraphicsStyle(); + TagOpenElement *pDrawEllipseElement = new TagOpenElement("draw:ellipse"); + WPXString sValue; + sValue.sprintf("gr%i", miGraphicsStyleIndex-1); + pDrawEllipseElement->addAttribute("draw:style-name", sValue); + sValue = doubleToString(2 * propList["svg:rx"]->getDouble()); sValue.append("in"); + pDrawEllipseElement->addAttribute("svg:width", sValue); + sValue = doubleToString(2 * propList["svg:ry"]->getDouble()); sValue.append("in"); + pDrawEllipseElement->addAttribute("svg:height", sValue); + if (propList["libwpg:rotate"] && propList["libwpg:rotate"]->getDouble() != 0.0) + { + double rotation = propList["libwpg:rotate"]->getDouble(); + while(rotation < -180) + rotation += 360; + while(rotation > 180) + rotation -= 360; + double radrotation = rotation*M_PI/180.0; + double deltax = sqrt(pow(propList["svg:rx"]->getDouble(), 2.0) + + pow(propList["svg:ry"]->getDouble(), 2.0))*cos(atan(propList["svg:ry"]->getDouble()/propList["svg:rx"]->getDouble()) + - radrotation ) - propList["svg:rx"]->getDouble(); + double deltay = sqrt(pow(propList["svg:rx"]->getDouble(), 2.0) + + pow(propList["svg:ry"]->getDouble(), 2.0))*sin(atan(propList["svg:ry"]->getDouble()/propList["svg:rx"]->getDouble()) + - radrotation ) - propList["svg:ry"]->getDouble(); + sValue = "rotate("; sValue.append(doubleToString(radrotation)); sValue.append(") "); + sValue.append("translate("); sValue.append(doubleToString(propList["svg:cx"]->getDouble() - propList["svg:rx"]->getDouble() - deltax)); + sValue.append("in, "); + sValue.append(doubleToString(propList["svg:cy"]->getDouble() - propList["svg:ry"]->getDouble() - deltay)); sValue.append("in)"); + pDrawEllipseElement->addAttribute("draw:transform", sValue); + } + else + { + sValue = doubleToString(propList["svg:cx"]->getDouble()-propList["svg:rx"]->getDouble()); sValue.append("in"); + pDrawEllipseElement->addAttribute("svg:x", sValue); + sValue = doubleToString(propList["svg:cy"]->getDouble()-propList["svg:ry"]->getDouble()); sValue.append("in"); + pDrawEllipseElement->addAttribute("svg:y", sValue); + } + mBodyElements.push_back(pDrawEllipseElement); + mBodyElements.push_back(new TagCloseElement("draw:ellipse")); +} + +void OdgExporter::drawPolyline(const ::WPXPropertyListVector& vertices) +{ + drawPolySomething(vertices, false); +} + +void OdgExporter::drawPolygon(const ::WPXPropertyListVector& vertices) +{ + drawPolySomething(vertices, true); +} + +void OdgExporter::drawPolySomething(const ::WPXPropertyListVector& vertices, bool isClosed) +{ + if(vertices.count() < 2) + return; + + if(vertices.count() == 2) + { + writeGraphicsStyle(); + TagOpenElement *pDrawLineElement = new TagOpenElement("draw:line"); + WPXString sValue; + sValue.sprintf("gr%i", miGraphicsStyleIndex-1); + pDrawLineElement->addAttribute("draw:style-name", sValue); + pDrawLineElement->addAttribute("draw:text-style-name", "P1"); + pDrawLineElement->addAttribute("draw:layer", "layout"); + pDrawLineElement->addAttribute("svg:x1", vertices[0]["svg:x"]->getStr()); + pDrawLineElement->addAttribute("svg:y1", vertices[0]["svg:y"]->getStr()); + pDrawLineElement->addAttribute("svg:x2", vertices[1]["svg:x"]->getStr()); + pDrawLineElement->addAttribute("svg:y2", vertices[1]["svg:y"]->getStr()); + mBodyElements.push_back(pDrawLineElement); + mBodyElements.push_back(new TagCloseElement("draw:line")); + } + else + { + ::WPXPropertyListVector path; + ::WPXPropertyList element; + + for (unsigned long ii = 0; ii < vertices.count(); ii++) + { + element = vertices[ii]; + if (ii == 0) + element.insert("libwpg:path-action", "M"); + else + element.insert("libwpg:path-action", "L"); + path.append(element); + element.clear(); + } + if (isClosed) + { + element.insert("libwpg:path-action", "Z"); + path.append(element); + } + drawPath(path); + } +} + +void OdgExporter::drawPath(const WPXPropertyListVector& path) +{ + if(path.count() == 0) + return; + + // try to find the bounding box + // this is simple convex hull technique, the bounding box might not be + // accurate but that should be enough for this purpose + double px = path[0]["svg:x"]->getDouble(); + double py = path[0]["svg:y"]->getDouble(); + double qx = path[0]["svg:x"]->getDouble(); + double qy = path[0]["svg:y"]->getDouble(); + for(unsigned k = 0; k < path.count(); k++) + { + if (!path[k]["svg:x"] || !path[k]["svg:y"]) + continue; + px = (px > path[k]["svg:x"]->getDouble()) ? path[k]["svg:x"]->getDouble() : px; + py = (py > path[k]["svg:y"]->getDouble()) ? path[k]["svg:y"]->getDouble() : py; + qx = (qx < path[k]["svg:x"]->getDouble()) ? path[k]["svg:x"]->getDouble() : qx; + qy = (qy < path[k]["svg:y"]->getDouble()) ? path[k]["svg:y"]->getDouble() : qy; + if(path[k]["libwpg:path-action"]->getStr() == "C") + { + px = (px > path[k]["svg:x1"]->getDouble()) ? path[k]["svg:x1"]->getDouble() : px; + py = (py > path[k]["svg:y1"]->getDouble()) ? path[k]["svg:y1"]->getDouble() : py; + qx = (qx < path[k]["svg:x1"]->getDouble()) ? path[k]["svg:x1"]->getDouble() : qx; + qy = (qy < path[k]["svg:y1"]->getDouble()) ? path[k]["svg:y1"]->getDouble() : qy; + px = (px > path[k]["svg:x2"]->getDouble()) ? path[k]["svg:x2"]->getDouble() : px; + py = (py > path[k]["svg:y2"]->getDouble()) ? path[k]["svg:y2"]->getDouble() : py; + qx = (qx < path[k]["svg:x2"]->getDouble()) ? path[k]["svg:x2"]->getDouble() : qx; + qy = (qy < path[k]["svg:y2"]->getDouble()) ? path[k]["svg:y2"]->getDouble() : qy; + } + if(path[k]["libwpg:path-action"]->getStr() == "A") + { + px = (px > path[k]["svg:x"]->getDouble()-2*path[k]["svg:rx"]->getDouble()) ? path[k]["svg:x"]->getDouble()-2*path[k]["svg:rx"]->getDouble() : px; + py = (py > path[k]["svg:y"]->getDouble()-2*path[k]["svg:ry"]->getDouble()) ? path[k]["svg:y"]->getDouble()-2*path[k]["svg:ry"]->getDouble() : py; + qx = (qx < path[k]["svg:x"]->getDouble()+2*path[k]["svg:rx"]->getDouble()) ? path[k]["svg:x"]->getDouble()+2*path[k]["svg:rx"]->getDouble() : qx; + qy = (qy < path[k]["svg:y"]->getDouble()+2*path[k]["svg:ry"]->getDouble()) ? path[k]["svg:y"]->getDouble()+2*path[k]["svg:ry"]->getDouble() : qy; + } + } + double vw = qx - px; + double vh = qy - py; + + writeGraphicsStyle(); + + TagOpenElement *pDrawPathElement = new TagOpenElement("draw:path"); + WPXString sValue; + sValue.sprintf("gr%i", miGraphicsStyleIndex-1); + pDrawPathElement->addAttribute("draw:style-name", sValue); + pDrawPathElement->addAttribute("draw:text-style-name", "P1"); + pDrawPathElement->addAttribute("draw:layer", "layout"); + sValue = doubleToString(px); sValue.append("in"); + pDrawPathElement->addAttribute("svg:x", sValue); + sValue = doubleToString(py); sValue.append("in"); + pDrawPathElement->addAttribute("svg:y", sValue); + sValue = doubleToString(vw); sValue.append("in"); + pDrawPathElement->addAttribute("svg:width", sValue); + sValue = doubleToString(vh); sValue.append("in"); + pDrawPathElement->addAttribute("svg:height", sValue); + sValue.sprintf("%i %i %i %i", 0, 0, (unsigned)(vw*2540), (unsigned)(vh*2540)); + pDrawPathElement->addAttribute("svg:viewBox", sValue); + + sValue.clear(); + for(unsigned i = 0; i < path.count(); i++) + { + WPXString sElement; + if (path[i]["libwpg:path-action"]->getStr() == "M") + { + // 2540 is 2.54*1000, 2.54 in = 1 inch + sElement.sprintf("M%i %i", (unsigned)((path[i]["svg:x"]->getDouble()-px)*2540), + (unsigned)((path[i]["svg:y"]->getDouble()-py)*2540)); + sValue.append(sElement); + } + else if (path[i]["libwpg:path-action"]->getStr() == "L") + { + sElement.sprintf("L%i %i", (unsigned)((path[i]["svg:x"]->getDouble()-px)*2540), + (unsigned)((path[i]["svg:y"]->getDouble()-py)*2540)); + sValue.append(sElement); + } + else if (path[i]["libwpg:path-action"]->getStr() == "C") + { + sElement.sprintf("C%i %i %i %i %i %i", (unsigned)((path[i]["svg:x1"]->getDouble()-px)*2540), + (int)((path[i]["svg:y1"]->getDouble()-py)*2540), (unsigned)((path[i]["svg:x2"]->getDouble()-px)*2540), + (int)((path[i]["svg:y2"]->getDouble()-py)*2540), (unsigned)((path[i]["svg:x"]->getDouble()-px)*2540), + (unsigned)((path[i]["svg:y"]->getDouble()-py)*2540)); + sValue.append(sElement); + } + else if (path[i]["libwpg:path-action"]->getStr() == "A") + { + sElement.sprintf("A%i %i %i %i %i %i %i", (unsigned)((path[i]["svg:rx"]->getDouble())*2540), + (int)((path[i]["svg:ry"]->getDouble())*2540), (path[i]["libwpg:rotate"] ? path[i]["libwpg:rotate"]->getInt() : 0), + 0, 0, (unsigned)((path[i]["svg:x"]->getDouble()-px)*2540), (unsigned)((path[i]["svg:y"]->getDouble()-py)*2540)); + sValue.append(sElement); + } + else if (path[i]["libwpg:path-action"]->getStr() == "Z" && i >= (path.count() - 1)) + sValue.append(" Z"); + } + pDrawPathElement->addAttribute("svg:d", sValue); + mBodyElements.push_back(pDrawPathElement); + mBodyElements.push_back(new TagCloseElement("draw:path")); +} + +void OdgExporter::drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData) +{ + if (!propList["libwpg:mime-type"] && propList["libwpg:mime-type"]->getStr().len() <= 0) + return; + TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame"); + + + WPXString sValue; + if (propList["svg:x"]) + pDrawFrameElement->addAttribute("svg:x", propList["svg:x"]->getStr()); + if (propList["svg:y"]) + pDrawFrameElement->addAttribute("svg:y", propList["svg:y"]->getStr()); + if (propList["svg:height"]) + pDrawFrameElement->addAttribute("svg:height", propList["svg:height"]->getStr()); + if (propList["svg:width"]) + pDrawFrameElement->addAttribute("svg:width", propList["svg:width"]->getStr()); + mBodyElements.push_back(pDrawFrameElement); + + mBodyElements.push_back(new TagOpenElement("draw:image")); + + mBodyElements.push_back(new TagOpenElement("office:binary-data")); + + ::WPXString base64Binary = binaryData.getBase64Data(); + mBodyElements.push_back(new CharDataElement(base64Binary.cstr())); + + mBodyElements.push_back(new TagCloseElement("office:binary-data")); + + mBodyElements.push_back(new TagCloseElement("draw:image")); + + mBodyElements.push_back(new TagCloseElement("draw:frame")); +} + +void OdgExporter::writeGraphicsStyle() +{ +#if 0 + if(mxStyle["libwpg:stroke-solid"] && !mxStyle["libwpg:stroke-solid"]->getInt() && (mxDashArray.count() >=2 ) ) + { + // ODG only supports dashes with the same length of spaces inbetween + // here we take the first space and assume everything else the same + // note that dash length is written in percentage ????????????????? + double distance = mxDashArray.at(1); + TagOpenElement *pDrawStrokeDashElement = new TagOpenElement("draw:stroke-dash"); + pDrawStrokeDashElement->addAttribute("draw:style", "rect"); + WPXString sValue; + sValue.sprintf("Dash_%i", miDashIndex++); + pDrawStrokeDashElement->addAttribute("draw:name", sValue); + sValue = doubleToString(distance); sValue.append("in"); + pDrawStrokeDashElement->addAttribute("draw:distance", sValue); + WPXString sName; + // We have to find out how to do this intelligently, since the ODF is allowing only + // two pairs draw:dots1 draw:dots1-length and draw:dots2 draw:dots2-length + for(unsigned i = 0; i < mxDashArray.count()/2 && i < 2; i++) + { + sName.sprintf("draw:dots%i", i+1); + pDrawStrokeDashElement->addAttribute(sName.cstr(), "1"); + sName.sprintf("draw:dots%i-length", i+1); + sValue = doubleToString(mxDashArray.at(i*2)); sValue.append("in"); + pDrawStrokeDashElement->addAttribute(sName.cstr(), sValue); + } + mGraphicsStrokeDashStyles.push_back(pDrawStrokeDashElement); + mGraphicsStrokeDashStyles.push_back(new TagCloseElement("draw:stroke-dash")); + } +#endif + if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "gradient" && mxGradient.count() >= 2) + { + TagOpenElement *pDrawGradientElement = new TagOpenElement("draw:gradient"); + pDrawGradientElement->addAttribute("draw:style", "linear"); + WPXString sValue; + sValue.sprintf("Gradient_%i", miGradientIndex++); + pDrawGradientElement->addAttribute("draw:name", sValue); + + // ODG angle unit is 0.1 degree + double angle = mxStyle["draw:angle"] ? -mxStyle["draw:angle"]->getDouble() : 0.0; + while(angle < 0) + angle += 360; + while(angle > 360) + angle -= 360; + + sValue.sprintf("%i", (unsigned)(angle*10)); + pDrawGradientElement->addAttribute("draw:angle", sValue); + + pDrawGradientElement->addAttribute("draw:start-color", mxGradient[0]["svg:stop-color"]->getStr().cstr()); + pDrawGradientElement->addAttribute("draw:end-color", mxGradient[1]["svg:stop-color"]->getStr().cstr()); + pDrawGradientElement->addAttribute("draw:start-intensity", "100%"); + pDrawGradientElement->addAttribute("draw:end-intensity", "100%"); + pDrawGradientElement->addAttribute("draw:border", "0%"); + mGraphicsGradientStyles.push_back(pDrawGradientElement); + mGraphicsGradientStyles.push_back(new TagCloseElement("draw:gradient")); + } + + TagOpenElement *pStyleStyleElement = new TagOpenElement("style:style"); + WPXString sValue; + sValue.sprintf("gr%i", miGraphicsStyleIndex); + pStyleStyleElement->addAttribute("style:name", sValue); + pStyleStyleElement->addAttribute("style:family", "graphic"); + pStyleStyleElement->addAttribute("style:parent-style-name", "standard"); + mGraphicsAutomaticStyles.push_back(pStyleStyleElement); + + TagOpenElement *pStyleGraphicsPropertiesElement = new TagOpenElement("style:graphic-properties"); + + if(!(mxStyle["draw:stroke"] && mxStyle["draw:stroke"]->getStr() == "none") && mxStyle["svg:stroke-width"] && mxStyle["svg:stroke-width"]->getDouble() > 0.0) + { + if (mxStyle["svg:stroke-width"]) + pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-width", mxStyle["svg:stroke-width"]->getStr()); + + if (mxStyle["svg:stroke-color"]) + pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-color", mxStyle["svg:stroke-color"]->getStr()); + if (mxStyle["svg:stroke-opacity"] && mxStyle["svg:stroke-opacity"]->getDouble() != 1.0) + pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-opacity", mxStyle["svg:stroke-opacity"]->getStr()); + + + if(mxStyle["libwpg:stroke-solid"] && mxStyle["libwpg:stroke-solid"]->getInt()) + pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "solid"); +#if 0 + else + { + pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "dash"); + sValue.sprintf("Dash_%i", miDashIndex-1); + pStyleGraphicsPropertiesElement->addAttribute("draw:stroke-dash", sValue); + } +#endif + } + else + pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "none"); + + if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "none") + pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "none"); + + if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "solid") + { + pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "solid"); + if (mxStyle["draw:fill-color"]) + pStyleGraphicsPropertiesElement->addAttribute("draw:fill-color", mxStyle["draw:fill-color"]->getStr()); + if (mxStyle["draw:opacity"] && mxStyle["draw:opacity"]->getDouble() != 1.0) + pStyleGraphicsPropertiesElement->addAttribute("draw:opacity", mxStyle["draw:opacity"]->getStr()); + } + + if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "gradient") + { + if (mxGradient.count() >= 2) + { + pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "gradient"); + sValue.sprintf("Gradient_%i", miGradientIndex-1); + pStyleGraphicsPropertiesElement->addAttribute("draw:fill-gradient-name", sValue); + } + else + pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "none"); + } + + mGraphicsAutomaticStyles.push_back(pStyleGraphicsPropertiesElement); + mGraphicsAutomaticStyles.push_back(new TagCloseElement("style:graphic-properties")); + + mGraphicsAutomaticStyles.push_back(new TagCloseElement("style:style")); + miGraphicsStyleIndex++; +} + +WPXString OdgExporter::doubleToString(const double value) +{ + WPXString tempString; + tempString.sprintf("%.4f", value); + std::string decimalPoint(localeconv()->decimal_point); + if ((decimalPoint.size() == 0) || (decimalPoint == ".")) + return tempString; + std::string stringValue(tempString.cstr()); + if (!stringValue.empty()) + { + std::string::size_type pos; + while ((pos = stringValue.find(decimalPoint)) != std::string::npos) + stringValue.replace(pos,decimalPoint.size(),"."); + } + return WPXString(stringValue.c_str()); +} diff --git a/writerperfect/source/filter/OdgExporter.hxx b/writerperfect/source/filter/OdgExporter.hxx new file mode 100644 index 000000000000..948d3b87374c --- /dev/null +++ b/writerperfect/source/filter/OdgExporter.hxx @@ -0,0 +1,90 @@ +/* libwpg + * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301 USA + * + * For further information visit http://libwpg.sourceforge.net + */ + +/* "This product is not manufactured, approved, or supported by + * Corel Corporation or Corel Corporation Limited." + */ +#ifndef __ODGEXPORTER_HXX__ +#define __ODGEXPORTER_HXX__ + +#include +#include +#include + +#include +#include +#include "DocumentElement.hxx" +#include "DocumentHandler.hxx" +#include "FilterInternal.hxx" + +class OdgExporter : public libwpg::WPGPaintInterface { +public: + OdgExporter(DocumentHandlerInterface *pHandler); + ~OdgExporter(); + + void startGraphics(const ::WPXPropertyList &propList); + void endGraphics(); + void startLayer(const ::WPXPropertyList &propList); + void endLayer(); + void startEmbeddedGraphics(const ::WPXPropertyList& /*propList*/) {} + void endEmbeddedGraphics() {} + + void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector& gradient); + + void drawRectangle(const ::WPXPropertyList &propList); + void drawEllipse(const ::WPXPropertyList &propList); + void drawPolyline(const ::WPXPropertyListVector& vertices); + void drawPolygon(const ::WPXPropertyListVector& vertices); + void drawPath(const ::WPXPropertyListVector& path); + void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData); + void startTextObject(const ::WPXPropertyList & /*propList*/, const ::WPXPropertyListVector &/*path*/) {} + void endTextObject() {} + void startTextLine(const ::WPXPropertyList & /*propList*/) {} + void endTextLine() {} + void startTextSpan(const ::WPXPropertyList & /*propList*/) {} + void endTextSpan() {} + void insertText(const ::WPXString & /*str*/) {} + +private: + void writeGraphicsStyle(); + WPXString doubleToString(const double value); + void drawPolySomething(const ::WPXPropertyListVector& vertices, bool isClosed); + + // body elements + std::vector mBodyElements; + + // graphics styles + std::vector mGraphicsStrokeDashStyles; + std::vector mGraphicsGradientStyles; + std::vector mGraphicsAutomaticStyles; + + DocumentHandlerInterface *mpHandler; + + ::WPXPropertyList mxStyle; + ::WPXPropertyListVector mxGradient; + int miGradientIndex; + int miDashIndex; + int miGraphicsStyleIndex; + double mfWidth; + double mfHeight; +}; + +#endif // __ODGEXPORTER_HXX__ diff --git a/writerperfect/source/filter/PageSpan.cxx b/writerperfect/source/filter/PageSpan.cxx index e3fab42eed7e..a3bfb1341467 100644 --- a/writerperfect/source/filter/PageSpan.cxx +++ b/writerperfect/source/filter/PageSpan.cxx @@ -29,6 +29,7 @@ #include "FilterInternal.hxx" #include "PageSpan.hxx" #include "DocumentElement.hxx" +#include "DocumentHandler.hxx" PageSpan::PageSpan(const WPXPropertyList &xPropList) : mxPropList(xPropList), @@ -39,10 +40,12 @@ PageSpan::PageSpan(const WPXPropertyList &xPropList) : { } +namespace { + typedef std::vector::iterator DEVIter; +} + PageSpan::~PageSpan() { - typedef std::vector::iterator DEVIter; - if (mpHeaderContent) { for (DEVIter iterHeaderContent = mpHeaderContent->begin(); @@ -88,39 +91,110 @@ int PageSpan::getSpan() const return 0; // should never happen } -void PageSpan::writePageMaster(const int iNum, DocumentHandler *pHandler) const +double PageSpan::getMarginLeft() const +{ + if (mxPropList["fo:margin-left"]) + return mxPropList["fo:margin-left"]->getDouble(); + + return 0.0; +} + +double PageSpan::getMarginRight() const +{ + if (mxPropList["fo:margin-right"]) + return mxPropList["fo:margin-right"]->getDouble(); + + return 0.0; +} + +void PageSpan::setHeaderContent(std::vector * pHeaderContent) +{ + if (mpHeaderContent) + { + for (DEVIter iterHeaderContent = mpHeaderContent->begin(); + iterHeaderContent != mpHeaderContent->end(); + iterHeaderContent++) + delete(*iterHeaderContent); + delete mpHeaderContent; + } + + mpHeaderContent = pHeaderContent; +} + +void PageSpan::setFooterContent(std::vector * pFooterContent) +{ + if (mpFooterContent) + { + for (DEVIter iterFooterContent = mpFooterContent->begin(); + iterFooterContent != mpFooterContent->end(); + iterFooterContent++) + delete(*iterFooterContent); + delete mpFooterContent; + } + + mpFooterContent = pFooterContent; +} + +void PageSpan::setHeaderLeftContent(std::vector * pHeaderContent) +{ + if (mpHeaderLeftContent) + { + for (DEVIter iterHeaderLeftContent = mpHeaderLeftContent->begin(); + iterHeaderLeftContent != mpHeaderLeftContent->end(); + iterHeaderLeftContent++) + delete(*iterHeaderLeftContent); + delete mpHeaderLeftContent; + } + + mpHeaderLeftContent = pHeaderContent; +} + +void PageSpan::setFooterLeftContent(std::vector * pFooterContent) +{ + if (mpFooterLeftContent) + { + for (DEVIter iterFooterLeftContent = mpFooterLeftContent->begin(); + iterFooterLeftContent != mpFooterLeftContent->end(); + iterFooterLeftContent++) + delete(*iterFooterLeftContent); + delete mpFooterLeftContent; + } + + mpFooterLeftContent = pFooterContent; +} + +void PageSpan::writePageLayout(const int iNum, DocumentHandlerInterface *pHandler) const { WPXPropertyList propList; - WPXString sPageMasterName; - sPageMasterName.sprintf("PM%i", iNum /* +2 */); - propList.insert("style:name", sPageMasterName); - - pHandler->startElement("style:page-master", propList); + WPXString sPageLayoutName; + sPageLayoutName.sprintf("PM%i", iNum+2); + propList.insert("style:name", sPageLayoutName); + pHandler->startElement("style:page-layout", propList); WPXPropertyList tempPropList = mxPropList; if (!tempPropList["style:writing-mode"]) tempPropList.insert("style:writing-mode", WPXString("lr-tb")); if (!tempPropList["style:footnote-max-height"]) - tempPropList.insert("style:footnote-max-height", WPXString("0inch")); - pHandler->startElement("style:properties", tempPropList); + tempPropList.insert("style:footnote-max-height", WPXString("0in")); + pHandler->startElement("style:page-layout-properties", tempPropList); WPXPropertyList footnoteSepPropList; - footnoteSepPropList.insert("style:width", WPXString("0.0071inch")); - footnoteSepPropList.insert("style:distance-before-sep", WPXString("0.0398inch")); - footnoteSepPropList.insert("style:distance-after-sep", WPXString("0.0398inch")); + footnoteSepPropList.insert("style:width", WPXString("0.0071in")); + footnoteSepPropList.insert("style:distance-before-sep", WPXString("0.0398in")); + footnoteSepPropList.insert("style:distance-after-sep", WPXString("0.0398in")); footnoteSepPropList.insert("style:adjustment", WPXString("left")); footnoteSepPropList.insert("style:rel-width", WPXString("25%")); footnoteSepPropList.insert("style:color", WPXString("#000000")); pHandler->startElement("style:footnote-sep", footnoteSepPropList); pHandler->endElement("style:footnote-sep"); - pHandler->endElement("style:properties"); - pHandler->endElement("style:page-master"); + pHandler->endElement("style:page-layout-properties"); + pHandler->endElement("style:page-layout"); } -void PageSpan::writeMasterPages(const int iStartingNum, const int iPageMasterNum, const bool bLastPageSpan, - DocumentHandler *pHandler) const +void PageSpan::writeMasterPages(const int iStartingNum, const int iPageLayoutNum, const bool bLastPageSpan, + DocumentHandlerInterface *pHandler) const { int iSpan = 0; (bLastPageSpan) ? iSpan = 1 : iSpan = getSpan(); @@ -128,29 +202,58 @@ void PageSpan::writeMasterPages(const int iStartingNum, const int iPageMasterNum for (int i=iStartingNum; i<(iStartingNum+iSpan); i++) { TagOpenElement masterPageOpen("style:master-page"); - WPXString sMasterPageName; - sMasterPageName.sprintf("Page Style %i", i); - WPXString sPageMasterName; - sPageMasterName.sprintf("PM%i", iPageMasterNum /* +2 */); + WPXString sMasterPageName, sMasterPageDisplayName; + sMasterPageName.sprintf("Page_Style_%i", i); + sMasterPageDisplayName.sprintf("Page Style %i", i); + WPXString sPageLayoutName; WPXPropertyList propList; + sPageLayoutName.sprintf("PM%i", iPageLayoutNum+2); propList.insert("style:name", sMasterPageName); - propList.insert("style:page-master-name", sPageMasterName); + propList.insert("style:display-name", sMasterPageDisplayName); + propList.insert("style:page-layout-name", sPageLayoutName); if (!bLastPageSpan) { WPXString sNextMasterPageName; - sNextMasterPageName.sprintf("Page Style %i", (i+1)); + sNextMasterPageName.sprintf("Page_Style_%i", (i+1)); propList.insert("style:next-style-name", sNextMasterPageName); } pHandler->startElement("style:master-page", propList); if (mpHeaderContent) + { _writeHeaderFooter("style:header", *mpHeaderContent, pHandler); + pHandler->endElement("style:header"); if (mpHeaderLeftContent) + { _writeHeaderFooter("style:header-left", *mpHeaderLeftContent, pHandler); + pHandler->endElement("style:header-left"); + } + } + else if (mpHeaderLeftContent) + { + TagOpenElement("style:header").write(pHandler); + pHandler->endElement("style:header"); + _writeHeaderFooter("style:header-left", *mpHeaderLeftContent, pHandler); + pHandler->endElement("style:header-left"); + } + if (mpFooterContent) + { _writeHeaderFooter("style:footer", *mpFooterContent, pHandler); + pHandler->endElement("style:footer"); if (mpFooterLeftContent) + { _writeHeaderFooter("style:footer-left", *mpFooterLeftContent, pHandler); + pHandler->endElement("style:footer-left"); + } + } + else if (mpFooterLeftContent) + { + TagOpenElement("style:footer").write(pHandler); + pHandler->endElement("style:footer"); + _writeHeaderFooter("style:footer-left", *mpFooterLeftContent, pHandler); + pHandler->endElement("style:footer-left"); + } pHandler->endElement("style:master-page"); } @@ -159,7 +262,7 @@ void PageSpan::writeMasterPages(const int iStartingNum, const int iPageMasterNum void PageSpan::_writeHeaderFooter(const char *headerFooterTagName, const std::vector & headerFooterContent, - DocumentHandler *pHandler) const + DocumentHandlerInterface *pHandler) const { TagOpenElement headerFooterOpen(headerFooterTagName); headerFooterOpen.write(pHandler); @@ -168,8 +271,6 @@ void PageSpan::_writeHeaderFooter(const char *headerFooterTagName, iter++) { (*iter)->write(pHandler); } - TagCloseElement headerFooterClose(headerFooterTagName); - headerFooterClose.write(pHandler); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/filter/PageSpan.hxx b/writerperfect/source/filter/PageSpan.hxx index f2165d4062f4..92eba26fe4a4 100644 --- a/writerperfect/source/filter/PageSpan.hxx +++ b/writerperfect/source/filter/PageSpan.hxx @@ -27,35 +27,30 @@ */ #ifndef _PAGESPAN_H #define _PAGESPAN_H -#if defined _MSC_VER -#pragma warning( push, 1 ) -#endif #include -#if defined _MSC_VER -#pragma warning( pop ) -#endif #include class DocumentElement; -class DocumentHandler; +class DocumentHandlerInterface; class PageSpan { public: PageSpan(const WPXPropertyList &xPropList); virtual ~PageSpan(); - void writePageMaster(const int iNum, DocumentHandler *pHandler) const; - void writeMasterPages(const int iStartingNum, const int iPageMasterNum, const bool bLastPageSpan, DocumentHandler *pHandler) const; + void writePageLayout(const int iNum, DocumentHandlerInterface *pHandler) const; + void writeMasterPages(const int iStartingNum, const int iPageLayoutNum, const bool bLastPageSpan, DocumentHandlerInterface *pHandler) const; int getSpan() const; + double getMarginLeft() const; + double getMarginRight() const; - const std::vector * getHeaderContent() const { return mpHeaderContent; } - void setHeaderContent(std::vector * pHeaderContent) { mpHeaderContent = pHeaderContent; } - void setFooterContent(std::vector * pFooterContent) { mpFooterContent = pFooterContent; } - void setHeaderLeftContent(std::vector * pHeaderContent) { mpHeaderLeftContent = pHeaderContent; } - void setFooterLeftContent(std::vector * pFooterContent) { mpFooterLeftContent = pFooterContent; } + void setHeaderContent(std::vector * pHeaderContent); + void setFooterContent(std::vector * pFooterContent); + void setHeaderLeftContent(std::vector * pHeaderContent); + void setFooterLeftContent(std::vector * pFooterContent); protected: void _writeHeaderFooter(const char *headerFooterTagName, const std::vector & headerFooterContent, - DocumentHandler *pHandler) const; + DocumentHandlerInterface *pHandler) const; private: WPXPropertyList mxPropList; std::vector * mpHeaderContent; diff --git a/writerperfect/source/filter/SectionStyle.cxx b/writerperfect/source/filter/SectionStyle.cxx index 73c5984fd53e..1b65fc7eae38 100644 --- a/writerperfect/source/filter/SectionStyle.cxx +++ b/writerperfect/source/filter/SectionStyle.cxx @@ -34,7 +34,7 @@ #ifdef _MSC_VER double rint(double x); -#endif /* _MSC_VER */ +#endif /* _WIN32 */ SectionStyle::SectionStyle(const WPXPropertyList &xPropList, const WPXPropertyListVector &xColumns, @@ -45,7 +45,7 @@ SectionStyle::SectionStyle(const WPXPropertyList &xPropList, { } -void SectionStyle::write(DocumentHandler *pHandler) const +void SectionStyle::write(DocumentHandlerInterface *pHandler) const { TagOpenElement styleOpen("style:style"); styleOpen.addAttribute("style:name", getName()); @@ -54,7 +54,7 @@ void SectionStyle::write(DocumentHandler *pHandler) const // if the number of columns is <= 1, we will never come here. This is only an additional check // style properties - pHandler->startElement("style:properties", mPropList); + pHandler->startElement("style:section-properties", mPropList); // column properties WPXPropertyList columnProps; @@ -81,7 +81,7 @@ void SectionStyle::write(DocumentHandler *pHandler) const pHandler->endElement("style:columns"); - pHandler->endElement("style:properties"); + pHandler->endElement("style:section-properties"); pHandler->endElement("style:style"); } diff --git a/writerperfect/source/filter/SectionStyle.hxx b/writerperfect/source/filter/SectionStyle.hxx index eaf4410a497e..ee7a003fffae 100644 --- a/writerperfect/source/filter/SectionStyle.hxx +++ b/writerperfect/source/filter/SectionStyle.hxx @@ -27,14 +27,8 @@ */ #ifndef _SECTIONSTYLE_H #define _SECTIONSTYLE_H -#if defined _MSC_VER -#pragma warning( push, 1 ) -#endif #include #include -#if defined _MSC_VER -#pragma warning( pop ) -#endif #include "Style.hxx" #include "WriterProperties.hxx" @@ -44,7 +38,7 @@ class SectionStyle : public Style { public: SectionStyle(const WPXPropertyList &xPropList, const WPXPropertyListVector &xColumns, const char *psName); - virtual void write(DocumentHandler *pHandler) const; + virtual void write(DocumentHandlerInterface *pHandler) const; private: WPXPropertyList mPropList; diff --git a/writerperfect/source/filter/Style.hxx b/writerperfect/source/filter/Style.hxx index 7232a028a69b..282041542017 100644 --- a/writerperfect/source/filter/Style.hxx +++ b/writerperfect/source/filter/Style.hxx @@ -28,13 +28,7 @@ #ifndef _STYLE_H #define _STYLE_H -#if defined _MSC_VER -#pragma warning( push, 1 ) -#endif #include -#if defined _MSC_VER -#pragma warning( pop ) -#endif #include "DocumentElement.hxx" class TopLevelElementStyle @@ -55,7 +49,7 @@ class Style Style(const WPXString &psName) : msName(psName) {} virtual ~Style() {} - virtual void write(DocumentHandler * /* pHandler */) const {}; + virtual void write(DocumentHandlerInterface * /* pHandler */) const {}; const WPXString &getName() const { return msName; } private: diff --git a/writerperfect/source/filter/TableStyle.cxx b/writerperfect/source/filter/TableStyle.cxx index 1b00c35e3de4..2fc66ed04841 100644 --- a/writerperfect/source/filter/TableStyle.cxx +++ b/writerperfect/source/filter/TableStyle.cxx @@ -28,7 +28,6 @@ * Corel Corporation or Corel Corporation Limited." */ #include -#include #include "FilterInternal.hxx" #include "TableStyle.hxx" #include "DocumentElement.hxx" @@ -37,13 +36,15 @@ #include #endif +#include + TableCellStyle::TableCellStyle(const WPXPropertyList &xPropList, const char *psName) : Style(psName), mPropList(xPropList) { } -void TableCellStyle::write(DocumentHandler *pHandler) const +void TableCellStyle::write(DocumentHandlerInterface *pHandler) const { TagOpenElement styleOpen("style:style"); styleOpen.addAttribute("style:name", getName()); @@ -59,9 +60,9 @@ void TableCellStyle::write(DocumentHandler *pHandler) const if (strlen(i.key()) > 2 && strncmp(i.key(), "fo", 2) == 0) stylePropList.insert(i.key(), i()->clone()); } - stylePropList.insert("fo:padding", "0.0382inch"); - pHandler->startElement("style:properties", stylePropList); - pHandler->endElement("style:properties"); + stylePropList.insert("fo:padding", "0.0382in"); + pHandler->startElement("style:table-cell-properties", stylePropList); + pHandler->endElement("style:table-cell-properties"); pHandler->endElement("style:style"); } @@ -72,20 +73,21 @@ TableRowStyle::TableRowStyle(const WPXPropertyList &propList, const char *psName { } -void TableRowStyle::write(DocumentHandler *pHandler) const +void TableRowStyle::write(DocumentHandlerInterface *pHandler) const { TagOpenElement styleOpen("style:style"); styleOpen.addAttribute("style:name", getName()); styleOpen.addAttribute("style:family", "table-row"); styleOpen.write(pHandler); - TagOpenElement stylePropertiesOpen("style:properties"); + TagOpenElement stylePropertiesOpen("style:table-row-properties"); if (mPropList["style:min-row-height"]) stylePropertiesOpen.addAttribute("style:min-row-height", mPropList["style:min-row-height"]->getStr()); else if (mPropList["style:row-height"]) stylePropertiesOpen.addAttribute("style:row-height", mPropList["style:row-height"]->getStr()); + stylePropertiesOpen.addAttribute("fo:keep-together", "auto"); stylePropertiesOpen.write(pHandler); - pHandler->endElement("style:properties"); + pHandler->endElement("style:table-row-properties"); pHandler->endElement("style:style"); } @@ -106,10 +108,9 @@ TableStyle::~TableStyle() delete(*iterTableCellStyles); for (TRSVIter iterTableRowStyles = mTableRowStyles.begin() ; iterTableRowStyles != mTableRowStyles.end(); iterTableRowStyles++) delete(*iterTableRowStyles); - } -void TableStyle::write(DocumentHandler *pHandler) const +void TableStyle::write(DocumentHandlerInterface *pHandler) const { TagOpenElement styleOpen("style:style"); styleOpen.addAttribute("style:name", getName()); @@ -118,7 +119,7 @@ void TableStyle::write(DocumentHandler *pHandler) const styleOpen.addAttribute("style:master-page-name", getMasterPageName()->cstr()); styleOpen.write(pHandler); - TagOpenElement stylePropertiesOpen("style:properties"); + TagOpenElement stylePropertiesOpen("style:table-properties"); if (mPropList["table:align"]) stylePropertiesOpen.addAttribute("table:align", mPropList["table:align"]->getStr()); if (mPropList["fo:margin-left"]) @@ -131,7 +132,7 @@ void TableStyle::write(DocumentHandler *pHandler) const stylePropertiesOpen.addAttribute("fo:break-before", mPropList["fo:break-before"]->getStr()); stylePropertiesOpen.write(pHandler); - pHandler->endElement("style:properties"); + pHandler->endElement("style:table-properties"); pHandler->endElement("style:style"); @@ -139,15 +140,15 @@ void TableStyle::write(DocumentHandler *pHandler) const WPXPropertyListVector::Iter j(mColumns); for (j.rewind(); j.next();) { - TagOpenElement styleNestedOpen("style:style"); + TagOpenElement styleOpen2("style:style"); WPXString sColumnName; sColumnName.sprintf("%s.Column%i", getName().cstr(), i); - styleNestedOpen.addAttribute("style:name", sColumnName); - styleNestedOpen.addAttribute("style:family", "table-column"); - styleNestedOpen.write(pHandler); + styleOpen2.addAttribute("style:name", sColumnName); + styleOpen2.addAttribute("style:family", "table-column"); + styleOpen2.write(pHandler); - pHandler->startElement("style:properties", j()); - pHandler->endElement("style:properties"); + pHandler->startElement("style:table-column-properties", j()); + pHandler->endElement("style:table-column-properties"); pHandler->endElement("style:style"); diff --git a/writerperfect/source/filter/TableStyle.hxx b/writerperfect/source/filter/TableStyle.hxx index eee08706c22d..95c30892faf5 100644 --- a/writerperfect/source/filter/TableStyle.hxx +++ b/writerperfect/source/filter/TableStyle.hxx @@ -39,15 +39,16 @@ #include "Style.hxx" #include "WriterProperties.hxx" +#include "DocumentHandlerInterface.hxx" class DocumentElement; -class DocumentHandler; class TableCellStyle : public Style { public: + virtual ~TableCellStyle() {}; TableCellStyle(const WPXPropertyList &xPropList, const char *psName); - virtual void write(DocumentHandler *pHandler) const; + virtual void write(DocumentHandlerInterface *pHandler) const; private: WPXPropertyList mPropList; }; @@ -55,8 +56,9 @@ private: class TableRowStyle : public Style { public: + virtual ~TableRowStyle() {}; TableRowStyle(const WPXPropertyList &propList, const char *psName); - virtual void write(DocumentHandler *pHandler) const; + virtual void write(DocumentHandlerInterface *pHandler) const; private: WPXPropertyList mPropList; }; @@ -65,8 +67,8 @@ class TableStyle : public Style, public TopLevelElementStyle { public: TableStyle(const WPXPropertyList &xPropList, const WPXPropertyListVector &columns, const char *psName); - ~TableStyle(); - virtual void write(DocumentHandler *pHandler) const; + virtual ~TableStyle(); + virtual void write(DocumentHandlerInterface *pHandler) const; int getNumColumns() const { return mColumns.count(); } void addTableCellStyle(TableCellStyle *pTableCellStyle) { mTableCellStyles.push_back(pTableCellStyle); } int getNumTableCellStyles() { return mTableCellStyles.size(); } diff --git a/writerperfect/source/filter/TextRunStyle.cxx b/writerperfect/source/filter/TextRunStyle.cxx index 7e37d6def3b8..9b3bc9825fd9 100644 --- a/writerperfect/source/filter/TextRunStyle.cxx +++ b/writerperfect/source/filter/TextRunStyle.cxx @@ -51,7 +51,7 @@ ParagraphStyle::~ParagraphStyle() delete mpPropList; } -void ParagraphStyle::write(DocumentHandler *pHandler) const +void ParagraphStyle::write(DocumentHandlerInterface *pHandler) const { WRITER_DEBUG_MSG(("Writing a paragraph style..\n")); @@ -64,49 +64,53 @@ void ParagraphStyle::write(DocumentHandler *pHandler) const pHandler->startElement("style:style", propList); propList.clear(); - WPXPropertyList::Iter k((*mpPropList)); - for (k.rewind(); k.next(); ) + WPXPropertyList::Iter i((*mpPropList)); + for (i.rewind(); i.next(); ) { - if (strcmp(k.key(), "style:list-style-name") == 0) - propList.insert("style:list-style-name", k()->getStr()); - if (strcmp(k.key(), "fo:margin-left") == 0) - propList.insert("fo:margin-left", k()->getStr()); - if (strcmp(k.key(), "fo:margin-right") == 0) - propList.insert("fo:margin-right", k()->getStr()); - if (strcmp(k.key(), "fo:text-indent") == 0) - propList.insert("fo:text-indent", k()->getStr()); - if (strcmp(k.key(), "fo:margin-top") == 0) - propList.insert("fo:margin-top", k()->getStr()); - if (strcmp(k.key(), "fo:margin-bottom") == 0) +#if 0 + if (strcmp(i.key(), "style:list-style-name") == 0) + propList.insert("style:list-style-name", i()->getStr()); +#endif + if (strcmp(i.key(), "fo:margin-left") == 0) + propList.insert("fo:margin-left", i()->getStr()); + if (strcmp(i.key(), "fo:margin-right") == 0) + propList.insert("fo:margin-right", i()->getStr()); + if (strcmp(i.key(), "fo:text-indent") == 0) + propList.insert("fo:text-indent", i()->getStr()); + if (strcmp(i.key(), "fo:margin-top") == 0) + propList.insert("fo:margin-top", i()->getStr()); + if (strcmp(i.key(), "fo:margin-bottom") == 0) { - if (k()->getFloat() > 0.0f) - propList.insert("fo:margin-bottom", k()->getStr()); + if (i()->getDouble() > 0.0f) + propList.insert("fo:margin-bottom", i()->getStr()); else propList.insert("fo:margin-bottom", 0.0f); } - if (strcmp(k.key(), "fo:line-height") == 0) - propList.insert("fo:line-height", k()->getStr()); - if (strcmp(k.key(), "fo:break-before") == 0) - propList.insert("fo:break-before", k()->getStr()); - if (strcmp(k.key(), "fo:text-align") == 0) - propList.insert("fo:text-align", k()->getStr()); - if (strcmp(k.key(), "fo:text-align-last") == 0) - propList.insert("fo:text-align-last", k()->getStr()); + if (strcmp(i.key(), "fo:line-height") == 0) + propList.insert("fo:line-height", i()->getStr()); + if (strcmp(i.key(), "fo:break-before") == 0) + propList.insert("fo:break-before", i()->getStr()); + if (strcmp(i.key(), "fo:text-align") == 0) + propList.insert("fo:text-align", i()->getStr()); + if (strcmp(i.key(), "fo:text-align-last") == 0) + propList.insert("fo:text-align-last", i()->getStr()); } propList.insert("style:justify-single-word", "false"); - pHandler->startElement("style:properties", propList); + pHandler->startElement("style:paragraph-properties", propList); if (mxTabStops.count() > 0) { TagOpenElement tabListOpen("style:tab-stops"); tabListOpen.write(pHandler); - WPXPropertyListVector::Iter i(mxTabStops); - for (i.rewind(); i.next();) + WPXPropertyListVector::Iter i2(mxTabStops); + for (i2.rewind(); i2.next();) { + if (i2()["style:position"] && i2()["style:position"]->getDouble() < 0) + continue; TagOpenElement tabStopOpen("style:tab-stop"); - WPXPropertyList::Iter j(i()); + WPXPropertyList::Iter j(i2()); for (j.rewind(); j.next(); ) { tabStopOpen.addAttribute(j.key(), j()->getStr().cstr()); @@ -117,7 +121,7 @@ void ParagraphStyle::write(DocumentHandler *pHandler) const pHandler->endElement("style:tab-stops"); } - pHandler->endElement("style:properties"); + pHandler->endElement("style:paragraph-properties"); pHandler->endElement("style:style"); } @@ -127,7 +131,7 @@ SpanStyle::SpanStyle(const char *psName, const WPXPropertyList &xPropList) : { } -void SpanStyle::write(DocumentHandler *pHandler) const +void SpanStyle::write(DocumentHandlerInterface *pHandler) const { WRITER_DEBUG_MSG(("Writing a span style..\n")); WPXPropertyList styleOpenList; @@ -145,9 +149,14 @@ void SpanStyle::write(DocumentHandler *pHandler) const if (mPropList["fo:font-size"]) { + if (mPropList["fo:font-size"]->getDouble() > 0.0f) + { propList.insert("style:font-size-asian", mPropList["fo:font-size"]->getStr()); propList.insert("style:font-size-complex", mPropList["fo:font-size"]->getStr()); } + else + propList.remove("fo:font-size"); + } if (mPropList["fo:font-weight"]) { @@ -161,9 +170,9 @@ void SpanStyle::write(DocumentHandler *pHandler) const propList.insert("style:font-style-complex", mPropList["fo:font-style"]->getStr()); } - pHandler->startElement("style:properties", propList); + pHandler->startElement("style:text-properties", propList); - pHandler->endElement("style:properties"); + pHandler->endElement("style:text-properties"); pHandler->endElement("style:style"); } diff --git a/writerperfect/source/filter/TextRunStyle.hxx b/writerperfect/source/filter/TextRunStyle.hxx index 2bc29ed84be4..492132cfc54d 100644 --- a/writerperfect/source/filter/TextRunStyle.hxx +++ b/writerperfect/source/filter/TextRunStyle.hxx @@ -30,26 +30,19 @@ #ifndef _TEXTRUNSTYLE_H #define _TEXTRUNSTYLE_H -#if defined _MSC_VER -#pragma warning( push, 1 ) -#endif #include -#if defined _MSC_VER -#pragma warning( pop ) -#endif #include "Style.hxx" class TagOpenElement; class DocumentElement; -class DocumentHandler; class ParagraphStyle { public: ParagraphStyle(WPXPropertyList *propList, const WPXPropertyListVector &tabStops, const WPXString &sName); virtual ~ParagraphStyle(); - virtual void write(DocumentHandler *pHandler) const; + virtual void write(DocumentHandlerInterface *pHandler) const; WPXString getName() const { return msName; } private: WPXPropertyList *mpPropList; @@ -62,7 +55,7 @@ class SpanStyle : public Style { public: SpanStyle(const char *psName, const WPXPropertyList &xPropList); - virtual void write(DocumentHandler *pHandler) const; + virtual void write(DocumentHandlerInterface *pHandler) const; private: WPXPropertyList mPropList; diff --git a/writerperfect/source/filter/WriterProperties.hxx b/writerperfect/source/filter/WriterProperties.hxx index ea539125fe57..757807ef3977 100644 --- a/writerperfect/source/filter/WriterProperties.hxx +++ b/writerperfect/source/filter/WriterProperties.hxx @@ -33,7 +33,6 @@ #define IMP_DEFAULT_FONT_NAME "Times New Roman" #define IMP_DEFAULT_FONT_SIZE 12.0f #define IMP_DEFAULT_FONT_PITCH "variable" -#define IMP_DEFAULT_FONT_COLOR (new RGBSColor(0x00,0x00,0x00,0x64)) #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/filter/makefile.mk b/writerperfect/source/filter/makefile.mk index a092ce27db2e..f211101f706e 100644 --- a/writerperfect/source/filter/makefile.mk +++ b/writerperfect/source/filter/makefile.mk @@ -10,6 +10,10 @@ ENABLE_EXCEPTIONS=true INCPRE+=$(LIBWPD_CFLAGS) .ENDIF +.IF "$(SYSTEM_LIBWPG)" == "YES" +INCPRE+=$(LIBWPG_CFLAGS) +.ENDIF + .IF "$(SYSTEM_LIBWPS)" == "YES" INCPRE+=$(LIBWPS_CFLAGS) .ENDIF @@ -18,14 +22,17 @@ INCPRE+=$(LIBWPS_CFLAGS) INCPRE+= -I.. SLOFILES= \ + $(SLO)$/DocumentCollector.obj \ $(SLO)$/DocumentElement.obj \ + $(SLO)$/DocumentHandler.obj \ $(SLO)$/FontStyle.obj \ + $(SLO)$/GraphicsStyle.obj \ + $(SLO)$/InternalHandler.obj \ $(SLO)$/ListStyle.obj \ - $(SLO)$/DocumentHandler.obj \ + $(SLO)$/OdgExporter.obj \ $(SLO)$/PageSpan.obj \ $(SLO)$/SectionStyle.obj \ $(SLO)$/TableStyle.obj \ - $(SLO)$/TextRunStyle.obj \ - $(SLO)$/DocumentCollector.obj + $(SLO)$/TextRunStyle.obj .INCLUDE : target.mk diff --git a/writerperfect/source/stream/WPXSvStream.cxx b/writerperfect/source/stream/WPXSvStream.cxx index 4485eb8f726c..fd7d98604a07 100644 --- a/writerperfect/source/stream/WPXSvStream.cxx +++ b/writerperfect/source/stream/WPXSvStream.cxx @@ -10,7 +10,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; WPXSvInputStream::WPXSvInputStream( Reference< XInputStream > xStream ) : - WPSInputStream(), + WPXInputStream(), mxChildStorage(), mxChildStream(), mxStream(xStream), @@ -42,7 +42,7 @@ WPXSvInputStream::~WPXSvInputStream() { } -const uint8_t * WPXSvInputStream::read(size_t numBytes, size_t &numBytesRead) +const unsigned char * WPXSvInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) { numBytesRead = 0; @@ -53,7 +53,7 @@ const uint8_t * WPXSvInputStream::read(size_t numBytes, size_t &numBytesRead) if (numBytesRead == 0) return 0; - return (const uint8_t *)maData.getConstArray(); + return (const unsigned char *)maData.getConstArray(); } long WPXSvInputStream::tell() @@ -169,9 +169,4 @@ WPXInputStream * WPXSvInputStream::getDocumentOLEStream(const char * name) return 0; } -WPXInputStream * WPXSvInputStream::getDocumentOLEStream() -{ - return getDocumentOLEStream( "PerfectOffice_MAIN" ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/stream/WPXSvStream.h b/writerperfect/source/stream/WPXSvStream.h index edc010df3010..37d905adcc41 100644 --- a/writerperfect/source/stream/WPXSvStream.h +++ b/writerperfect/source/stream/WPXSvStream.h @@ -13,13 +13,12 @@ #if defined _MSC_VER #pragma warning( push, 1 ) #endif -#include -#include +#include #if defined _MSC_VER #pragma warning( pop ) #endif -class WPXSvInputStream : public WPSInputStream +class WPXSvInputStream : public WPXInputStream { public: WPXSvInputStream( ::com::sun::star::uno::Reference< @@ -27,10 +26,9 @@ public: virtual ~WPXSvInputStream(); virtual bool isOLEStream(); - virtual WPXInputStream * getDocumentOLEStream(); virtual WPXInputStream * getDocumentOLEStream(const char *name); - virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); + virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); virtual int seek(long offset, WPX_SEEK_TYPE seekType); virtual long tell(); virtual bool atEOS(); diff --git a/writerperfect/source/wpdimp/WordPerfectCollector.cxx b/writerperfect/source/wpdimp/WordPerfectCollector.cxx index a5b57181af78..83fdec5ff9cd 100644 --- a/writerperfect/source/wpdimp/WordPerfectCollector.cxx +++ b/writerperfect/source/wpdimp/WordPerfectCollector.cxx @@ -36,8 +36,9 @@ #pragma warning( pop ) #endif -WordPerfectCollector::WordPerfectCollector(WPSInputStream *pInput, DocumentHandler *pHandler) : - DocumentCollector(pInput, pHandler) +WordPerfectCollector::WordPerfectCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler, const rtl::OString& password) : + DocumentCollector(pInput, pHandler), + maUtf8Password(password) { } @@ -45,9 +46,13 @@ WordPerfectCollector::~WordPerfectCollector() { } -bool WordPerfectCollector::parseSourceDocument(WPSInputStream &input) +bool WordPerfectCollector::parseSourceDocument(WPXInputStream &input) { - WPDResult result = WPDocument::parse(&input, static_cast(this)); + WPDResult result; + if (maUtf8Password.getLength()) + result = WPDocument::parse(&input, static_cast(this), maUtf8Password.getStr()); + else + result = WPDocument::parse(&input, static_cast(this), NULL); if (result != WPD_OK) return false; diff --git a/writerperfect/source/wpdimp/WordPerfectCollector.hxx b/writerperfect/source/wpdimp/WordPerfectCollector.hxx index b38cba0646b3..fce25691e951 100644 --- a/writerperfect/source/wpdimp/WordPerfectCollector.hxx +++ b/writerperfect/source/wpdimp/WordPerfectCollector.hxx @@ -31,13 +31,17 @@ #define _WORDPERFECTCOLLECTOR_HXX #include "filter/DocumentCollector.hxx" +#include "filter/DocumentHandlerInterface.hxx" +#include class WordPerfectCollector : public DocumentCollector { public: - WordPerfectCollector(WPSInputStream *pInput, DocumentHandler *pHandler); + WordPerfectCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler, const rtl::OString& password); virtual ~WordPerfectCollector(); - bool parseSourceDocument(WPSInputStream &pInput); + bool parseSourceDocument(WPXInputStream &pInput); +private: + rtl::OString maUtf8Password; }; #endif diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx index 560940814838..606b6160f686 100644 --- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx +++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx @@ -1,7 +1,5 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* WordPerfectImportFilter: Sets up the filter, and calls DocumentCollector - * to do the actual filtering - * +/* * Copyright (C) 2000 by Sun Microsystems, Inc. * Copyright (C) 2002-2004 William Lachance (wlach@interlog.com) * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com) @@ -32,16 +30,16 @@ #include #include #include -#include #include #include #include #include - +#include #include #include #include +#include #include "filter/FilterInternal.hxx" #include "filter/DocumentHandler.hxx" @@ -107,11 +105,38 @@ sal_Bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::su OSL_ASSERT( 0 ); return sal_False; } - OString sFileName; - sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII); + + WPXSvInputStream input( xInputStream ); + + OString aUtf8Passwd; + +#if 1 + WPDConfidence confidence = WPDocument::isFileFormatSupported(&input); + + if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence) + { + int unsuccessfulAttempts = 0; + while (true ) + { + SfxPasswordDialog aPasswdDlg( 0 ); + aPasswdDlg.SetMinLen(0); + if(!aPasswdDlg.Execute()) + return sal_False; + String aPasswd = aPasswdDlg.GetPassword(); + OUString aUniPasswd(aPasswd.GetBuffer() /*, aPasswd.Len(), RTL_TEXTENCODING_UCS2 */); + aUtf8Passwd = OUStringToOString(aUniPasswd, RTL_TEXTENCODING_UTF8); + if (WPD_PASSWORD_MATCH_OK == WPDocument::verifyPassword(&input, aUtf8Passwd.getStr())) + break; + else + unsuccessfulAttempts++; + if (unsuccessfulAttempts == 3) // timeout after 3 password atempts + return sal_False; + } + } +#endif // An XML import service: what we push sax messages to.. - OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLImporter" ) ); + OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLOasisImporter" ) ); uno::Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY ); // The XImporter sets up an empty target document for XDocumentHandler to write to.. @@ -122,9 +147,7 @@ sal_Bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::su // writes to in-memory target doc DocumentHandler xHandler(xInternalHandler); - WPXSvInputStream input( xInputStream ); - - WordPerfectCollector collector(&input, &xHandler); + WordPerfectCollector collector(&input, &xHandler, aUtf8Passwd); collector.filter(); return true; @@ -196,9 +219,9 @@ OUString SAL_CALL WordPerfectImportFilter::detect( com::sun::star::uno::Sequence if (input.atEOS()) return ::rtl::OUString(); - confidence = WPDocument::isFileFormatSupported(&input, false); + confidence = WPDocument::isFileFormatSupported(&input); - if (confidence == WPD_CONFIDENCE_EXCELLENT) + if (confidence == WPD_CONFIDENCE_EXCELLENT || confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION) sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_WordPerfect_Document" ) ); if (sTypeName.getLength()) @@ -255,7 +278,6 @@ Sequence< OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames( throw (RuntimeException) { Sequence < OUString > aRet(2); -// Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) ); pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); @@ -287,4 +309,126 @@ Sequence< OUString > SAL_CALL WordPerfectImportFilter::getSupportedServiceNames( return WordPerfectImportFilter_getSupportedServiceNames(); } + +WordPerfectImportFilterDialog::WordPerfectImportFilterDialog(const ::com::sun::star::uno::Reference &r ) : + mxMSF( r ) {} + +WordPerfectImportFilterDialog::~WordPerfectImportFilterDialog() +{ +} + +void SAL_CALL WordPerfectImportFilterDialog::setTitle( const ::rtl::OUString& ) + throw (::com::sun::star::uno::RuntimeException) +{ +} + +sal_Int16 SAL_CALL WordPerfectImportFilterDialog::execute() + throw (::com::sun::star::uno::RuntimeException) +{ + WPXSvInputStream input( mxInputStream ); + + OString aUtf8Passwd; + + WPDConfidence confidence = WPDocument::isFileFormatSupported(&input); + + if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence) + { + int unsuccessfulAttempts = 0; + while (true ) + { + SfxPasswordDialog aPasswdDlg(0); + aPasswdDlg.SetMinLen(0); + if(!aPasswdDlg.Execute()) + return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL; + msPassword = ::rtl::OUString(aPasswdDlg.GetPassword().GetBuffer()); + aUtf8Passwd = OUStringToOString(msPassword, RTL_TEXTENCODING_UTF8); + if (WPD_PASSWORD_MATCH_OK == WPDocument::verifyPassword(&input, aUtf8Passwd.getStr())) + break; + else + unsuccessfulAttempts++; + if (unsuccessfulAttempts == 3) // timeout after 3 password atempts + return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL; + } + } + return com::sun::star::ui::dialogs::ExecutableDialogResults::OK; +} + +uno::Sequence SAL_CALL WordPerfectImportFilterDialog::getPropertyValues() throw(uno::RuntimeException) +{ + uno::Sequence aRet(1); + beans::PropertyValue* pArray = aRet.getArray(); + + pArray[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Password") ); + pArray[0].Value <<= msPassword; + + return aRet; +} + +void SAL_CALL WordPerfectImportFilterDialog::setPropertyValues( const uno::Sequence& aProps) + throw(beans::UnknownPropertyException, beans::PropertyVetoException, + lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +{ + const beans::PropertyValue* pPropArray = aProps.getConstArray(); + long nPropCount = aProps.getLength(); + for (long i = 0; i < nPropCount; i++) + { + const beans::PropertyValue& rProp = pPropArray[i]; + ::rtl::OUString aPropName = rProp.Name; + + if ( aPropName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password")) ) + rProp.Value >>= msPassword; + else if ( aPropName.equalsAscii( "InputStream" ) ) + rProp.Value >>= mxInputStream; + } +} + + +// XServiceInfo +OUString SAL_CALL WordPerfectImportFilterDialog::getImplementationName( ) + throw (RuntimeException) +{ + return WordPerfectImportFilterDialog_getImplementationName(); +} + +sal_Bool SAL_CALL WordPerfectImportFilterDialog::supportsService( const OUString& rServiceName ) + throw (RuntimeException) +{ + return WordPerfectImportFilterDialog_supportsService( rServiceName ); +} + +Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog::getSupportedServiceNames( ) + throw (RuntimeException) +{ + return WordPerfectImportFilterDialog_getSupportedServiceNames(); +} + +OUString WordPerfectImportFilterDialog_getImplementationName () + throw (RuntimeException) +{ + return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.WordPerfectImportFilterDialog" ) ); +} + +#define SERVICE_NAME "com.sun.star.ui.dialogs.FilterOptionsDialog" +sal_Bool SAL_CALL WordPerfectImportFilterDialog_supportsService( const OUString& ServiceName ) + throw (RuntimeException) +{ + return ( ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) ) ); +} + +Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog_getSupportedServiceNames( ) + throw (RuntimeException) +{ + Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + return aRet; +} +#undef SERVICE_NAME + +uno::Reference< XInterface > SAL_CALL WordPerfectImportFilterDialog_createInstance( const uno::Reference< XMultiServiceFactory > & rSMgr) + throw( Exception ) +{ + return (cppu::OWeakObject*) new WordPerfectImportFilterDialog( rSMgr ); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx index 2a4cc666cdca..50b995ff70bf 100644 --- a/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx +++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx @@ -33,9 +33,13 @@ #include #include #include +#include +#include #include #include #include +#include +#include #include enum FilterType @@ -113,6 +117,62 @@ sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const ::rtl::OUString SAL_CALL WordPerfectImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw ( ::com::sun::star::uno::Exception ); + +class WordPerfectImportFilterDialog : public cppu::WeakImplHelper3 < + com::sun::star::ui::dialogs::XExecutableDialog, + com::sun::star::lang::XServiceInfo, + com::sun::star::beans::XPropertyAccess +> +{ + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; + ::rtl::OUString msPassword; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > mxInputStream; + + ~WordPerfectImportFilterDialog(); + + // XExecutableDialog + virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int16 SAL_CALL execute() + throw (::com::sun::star::uno::RuntimeException); + + // XServiceInfo + virtual ::rtl::OUString SAL_CALL getImplementationName( ) + throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + throw (::com::sun::star::uno::RuntimeException); + + // XPropertyAccess + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > + SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::PropertyValue >& aProps ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::beans::PropertyVetoException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + +public: + WordPerfectImportFilterDialog(const ::com::sun::star::uno::Reference &r ); + +}; + +::rtl::OUString WordPerfectImportFilterDialog_getImplementationName() + throw ( ::com::sun::star::uno::RuntimeException ); + +sal_Bool SAL_CALL WordPerfectImportFilterDialog_supportsService( const ::rtl::OUString& ServiceName ) + throw ( ::com::sun::star::uno::RuntimeException ); + +::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WordPerfectImportFilterDialog_getSupportedServiceNames( ) + throw ( ::com::sun::star::uno::RuntimeException ); + +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > +SAL_CALL WordPerfectImportFilterDialog_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) + throw ( ::com::sun::star::uno::Exception ); + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/wpdimp/makefile.mk b/writerperfect/source/wpdimp/makefile.mk index 745887eb8588..e2dd8d746546 100644 --- a/writerperfect/source/wpdimp/makefile.mk +++ b/writerperfect/source/wpdimp/makefile.mk @@ -10,6 +10,10 @@ ENABLE_EXCEPTIONS=true INCPRE+=$(LIBWPD_CFLAGS) .ENDIF +.IF "$(SYSTEM_LIBWPG)" == "YES" +INCPRE+=$(LIBWPG_CFLAGS) +.ENDIF + .IF "$(SYSTEM_LIBWPS)" == "YES" INCPRE+=$(LIBWPS_CFLAGS) .ENDIF diff --git a/writerperfect/source/wpdimp/wpft_genericfilter.cxx b/writerperfect/source/wpdimp/wpft_genericfilter.cxx index 36378097ed35..216753640352 100644 --- a/writerperfect/source/wpdimp/wpft_genericfilter.cxx +++ b/writerperfect/source/wpdimp/wpft_genericfilter.cxx @@ -63,7 +63,15 @@ sal_Bool SAL_CALL component_writeInfo( const OUString * pArray = rSNL.getConstArray(); for ( nPos = rSNL.getLength(); nPos--; ) xNewKey->createKey( pArray[nPos] ); +#if 0 + xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WordPerfectImportFilterDialog_getImplementationName() ); + xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); + const Sequence< OUString > & rSNL2 = WordPerfectImportFilterDialog_getSupportedServiceNames(); + pArray = rSNL2.getConstArray(); + for ( nPos = rSNL2.getLength(); nPos--; ) + xNewKey->createKey( pArray[nPos] ); +#endif return sal_True; } catch (InvalidRegistryException &) @@ -93,6 +101,21 @@ void * SAL_CALL component_getFactory( pRet = xFactory.get(); } } +#if 0 + else if ( pServiceManager && implName.equals(WordPerfectImportFilterDialog_getImplementationName()) ) + { + Reference< XSingleServiceFactory > xFactory( createSingleFactory( + reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + OUString::createFromAscii( pImplName ), + WordPerfectImportFilterDialog_createInstance, WordPerfectImportFilterDialog_getSupportedServiceNames() ) ); + + if (xFactory.is()) + { + xFactory->acquire(); + pRet = xFactory.get(); + } + } +#endif return pRet; } diff --git a/writerperfect/source/wpgimp/WPGImportFilter.cxx b/writerperfect/source/wpgimp/WPGImportFilter.cxx index 75283cf4fb73..b494e730fea4 100644 --- a/writerperfect/source/wpgimp/WPGImportFilter.cxx +++ b/writerperfect/source/wpgimp/WPGImportFilter.cxx @@ -47,7 +47,7 @@ #include #include "filter/DocumentHandler.hxx" -#include "OdgExporter.hxx" +#include "filter/OdgExporter.hxx" #include "WPGImportFilter.hxx" #include "stream/WPXSvStream.h" @@ -120,16 +120,6 @@ sal_Bool SAL_CALL WPGImportFilter::filter( const Sequence< ::com::sun::star::bea WPXInputStream* input = new WPXSvInputStream( xInputStream ); - if (input->isOLEStream()) - { - WPXInputStream* olestream = input->getDocumentOLEStream(); - if (olestream) - { - delete input; - input = olestream; - } - } - OdgExporter exporter(&xHandler); bool tmpParseResult = libwpg::WPGraphics::parse(input, &exporter); if (input) @@ -179,16 +169,6 @@ OUString SAL_CALL WPGImportFilter::detect( com::sun::star::uno::Sequence< Proper WPXInputStream* input = new WPXSvInputStream( xInputStream ); - if (input->isOLEStream()) - { - WPXInputStream* olestream = input->getDocumentOLEStream(); - if (olestream) - { - delete input; - input = olestream; - } - } - if (libwpg::WPGraphics::isSupported(input)) sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_WordPerfect_Graphics" ) ); diff --git a/writerperfect/source/wpgimp/makefile.mk b/writerperfect/source/wpgimp/makefile.mk index 3bb58c112af4..f2440469c6a9 100644 --- a/writerperfect/source/wpgimp/makefile.mk +++ b/writerperfect/source/wpgimp/makefile.mk @@ -12,12 +12,6 @@ INCPRE+=$(LIBWPD_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd .ENDIF -.IF "$(SYSTEM_LIBWPS)" == "YES" -INCPRE+=$(LIBWPS_CFLAGS) -.ELSE -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwps -.ENDIF - .IF "$(SYSTEM_LIBWPG)" == "YES" INCPRE+=$(LIBWPG_CFLAGS) .ELSE @@ -28,7 +22,6 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg INCPRE+= -I.. SLOFILES= \ - $(SLO)$/OdgExporter.obj \ $(SLO)$/WPGImportFilter.obj \ $(SLO)$/wpgimport_genericfilter.obj diff --git a/writerperfect/source/wpsimp/MSWorksCollector.cxx b/writerperfect/source/wpsimp/MSWorksCollector.cxx index 20934c2ba69e..bed21d8bed73 100644 --- a/writerperfect/source/wpsimp/MSWorksCollector.cxx +++ b/writerperfect/source/wpsimp/MSWorksCollector.cxx @@ -30,7 +30,7 @@ #include "MSWorksCollector.hxx" #include -MSWorksCollector::MSWorksCollector(WPSInputStream *pInput, DocumentHandler *pHandler) : +MSWorksCollector::MSWorksCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler) : DocumentCollector(pInput, pHandler) { } @@ -39,9 +39,9 @@ MSWorksCollector::~MSWorksCollector() { } -bool MSWorksCollector::parseSourceDocument(WPSInputStream &input) +bool MSWorksCollector::parseSourceDocument(WPXInputStream &input) { - WPSResult result = WPSDocument::parse(&input, static_cast(this)); + WPSResult result = WPSDocument::parse(&input, static_cast(this)); if (result != WPS_OK) return false; diff --git a/writerperfect/source/wpsimp/MSWorksCollector.hxx b/writerperfect/source/wpsimp/MSWorksCollector.hxx index b2a767b37525..9db02532a5f1 100644 --- a/writerperfect/source/wpsimp/MSWorksCollector.hxx +++ b/writerperfect/source/wpsimp/MSWorksCollector.hxx @@ -31,13 +31,14 @@ #define _MSWORKSCOLLECTOR_HXX #include "filter/DocumentCollector.hxx" +#include "filter/DocumentHandlerInterface.hxx" class MSWorksCollector : public DocumentCollector { public: - MSWorksCollector(WPSInputStream *pInput, DocumentHandler *pHandler); + MSWorksCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler); virtual ~MSWorksCollector(); - bool parseSourceDocument(WPSInputStream &input); + bool parseSourceDocument(WPXInputStream &input); }; #endif diff --git a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx index b8818dc548d2..9a4488da825d 100644 --- a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx +++ b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx @@ -102,7 +102,7 @@ sal_Bool SAL_CALL MSWorksImportFilter::importImpl( const Sequence< ::com::sun::s sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII); // An XML import service: what we push sax messages to.. - OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLImporter" ) ); + OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLOasisImporter" ) ); Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY ); // The XImporter sets up an empty target document for XDocumentHandler to write to.. @@ -187,7 +187,7 @@ OUString SAL_CALL MSWorksImportFilter::detect( com::sun::star::uno::Sequence< Pr if (input.atEOS()) return ::rtl::OUString(); - confidence = WPSDocument::isFileFormatSupported(&input, false); + confidence = WPSDocument::isFileFormatSupported(&input); if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence == WPS_CONFIDENCE_GOOD)) sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_MS_Works_Document" ) ); diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk index 35daf5e9b3bf..9ac9e4c35cda 100644 --- a/writerperfect/util/makefile.mk +++ b/writerperfect/util/makefile.mk @@ -42,6 +42,8 @@ SHL1LIBS=$(LIB1TARGET) SHL1STDLIBS+= \ $(SOTLIB) \ $(SO2LIB) \ + $(SFXLIB) \ + $(VCLLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ $(UCBHELPERLIB) \ @@ -49,6 +51,7 @@ SHL1STDLIBS+= \ $(CPPULIB) \ $(SALLIB) \ $(XMLOFFLIB) \ + $(LIBWPG) \ $(LIBWPD) SHL1TARGET = wpft$(DLLPOSTFIX) @@ -78,6 +81,7 @@ SHL2STDLIBS+= \ $(SALLIB) \ $(XMLOFFLIB) \ $(LIBWPS) \ + $(LIBWPG) \ $(LIBWPD) SHL2TARGET = msworks$(DLLPOSTFIX) @@ -105,8 +109,8 @@ SHL3STDLIBS+= \ $(CPPULIB) \ $(SALLIB) \ $(XMLOFFLIB) \ - $(LIBWPD) \ - $(LIBWPG) + $(LIBWPG) \ + $(LIBWPD) SHL3TARGET = wpgimport$(DLLPOSTFIX) SHL3IMPLIB = i$(SHL3TARGET) From 03a4326ac0a694327b6a1bd0150d917b5a5c6e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Wed, 17 Nov 2010 15:35:38 +0100 Subject: [PATCH 2/6] some writerperfect cleanup --- writerperfect/source/wpgimp/OdgExporter.cxx | 513 -------------------- writerperfect/source/wpgimp/OdgExporter.hxx | 81 ---- writerperfect/source/wpgimp/makefile.mk | 4 - 3 files changed, 598 deletions(-) delete mode 100644 writerperfect/source/wpgimp/OdgExporter.cxx delete mode 100644 writerperfect/source/wpgimp/OdgExporter.hxx diff --git a/writerperfect/source/wpgimp/OdgExporter.cxx b/writerperfect/source/wpgimp/OdgExporter.cxx deleted file mode 100644 index 36d13948ae8f..000000000000 --- a/writerperfect/source/wpgimp/OdgExporter.cxx +++ /dev/null @@ -1,513 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* libwpg - * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) - * Copyright (C) 2006-2007 Fridrich Strba (fridrich.strba@bluewin.ch) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301 USA - * - * For further information visit http://libwpg.sourceforge.net - */ - -/* "This product is not manufactured, approved, or supported by - * Corel Corporation or Corel Corporation Limited." - */ - -#include "OdgExporter.hxx" -#include "filter/DocumentElement.hxx" -#include "filter/DocumentHandler.hxx" -#include - - -OdgExporter::OdgExporter(DocumentHandler *pHandler): - mpHandler(pHandler), - m_fillRule(AlternatingFill), - m_gradientIndex(1), - m_dashIndex(1), - m_styleIndex(1) -{ -} - -OdgExporter::~OdgExporter() -{ -} - -void OdgExporter::startDocument(double width, double height) -{ - m_gradientIndex = 1; - m_dashIndex = 1; - m_styleIndex = 1; - - mpHandler->startDocument(); - TagOpenElement tmpOfficeDocumentContent("office:document"); - tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0"); - tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0"); - tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0"); - tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); - tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/"); - tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); - tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); - tmpOfficeDocumentContent.addAttribute("office:version", "1.0"); - tmpOfficeDocumentContent.write(mpHandler); - - TagOpenElement("office:styles").write(mpHandler); - TagCloseElement("office:styles").write(mpHandler); - - TagOpenElement("office:automatic-styles").write(mpHandler); - - TagOpenElement tmpStylePageLayoutOpenElement("style:page-layout"); - tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0"); - tmpStylePageLayoutOpenElement.write(mpHandler); - - TagOpenElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties"); - tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0cm"); - tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0cm"); - tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0cm"); - tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0cm"); - WPXString sValue; - sValue = doubleToString(2.54 * width); sValue.append("cm"); - tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", sValue); - sValue = doubleToString(2.54 * height); sValue.append("cm"); - tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", sValue); - tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait"); - tmpStylePageLayoutPropertiesOpenElement.write(mpHandler); - - TagCloseElement("style:page-layout-properties").write(mpHandler); - - TagCloseElement("style:page-layout").write(mpHandler); - - TagOpenElement tmpStyleStyleOpenElement("style:style"); - tmpStyleStyleOpenElement.addAttribute("style:name", "dp1"); - tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page"); - tmpStyleStyleOpenElement.write(mpHandler); - - TagOpenElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties"); - tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border"); - tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none"); - tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler); - - TagCloseElement("style:drawing-page-properties").write(mpHandler); - - TagCloseElement("style:style").write(mpHandler); -} - -void OdgExporter::endDocument() -{ - TagCloseElement("office:automatic-styles").write(mpHandler); - - TagOpenElement("office:master-styles").write(mpHandler); - - TagOpenElement tmpStyleMasterPageOpenElement("style:master-page"); - tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default"); - tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0"); - tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1"); - tmpStyleMasterPageOpenElement.write(mpHandler); - - TagCloseElement("style:master-page").write(mpHandler); - - TagCloseElement("office:master-styles").write(mpHandler); - - TagOpenElement("office:body").write(mpHandler); - - TagOpenElement("office:drawing").write(mpHandler); - - TagOpenElement tmpDrawPageOpenElement("draw:page"); - tmpDrawPageOpenElement.addAttribute("draw:name", "page1"); - tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1"); - tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default"); - tmpDrawPageOpenElement.write(mpHandler); - - for (std::vector::const_iterator bodyIter = mpBodyElements.begin(); - bodyIter != mpBodyElements.end(); bodyIter++) - { - (*bodyIter)->write(mpHandler); - } - - TagCloseElement("draw:page").write(mpHandler); - TagCloseElement("office:drawing").write(mpHandler); - TagCloseElement("office:body").write(mpHandler); - TagCloseElement("office:document").write(mpHandler); - - mpHandler->endDocument(); -} - -void OdgExporter::setPen(const libwpg::WPGPen& pen) -{ - m_pen = pen; -} - -void OdgExporter::setBrush(const libwpg::WPGBrush& brush) -{ - m_brush = brush; -} - -void OdgExporter::setFillRule(FillRule rule) -{ - m_fillRule = rule; -} - -void OdgExporter::startLayer(unsigned int /* id */) -{ -} - -void OdgExporter::endLayer(unsigned int) -{ -} - -void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double /* ry */) -{ - writeStyle(); - TagOpenElement *pDrawRectElement = new TagOpenElement("draw:rect"); - WPXString sValue; - sValue.sprintf("gr%i", m_styleIndex-1); - pDrawRectElement->addAttribute("draw:style-name", sValue); - sValue = doubleToString(2.54 * rect.x1); sValue.append("cm"); - pDrawRectElement->addAttribute("svg:x", sValue); - sValue = doubleToString(2.54 * rect.y1); sValue.append("cm"); - pDrawRectElement->addAttribute("svg:y", sValue); - sValue = doubleToString(2.54 * (rect.x2-rect.x1)); sValue.append("cm"); - pDrawRectElement->addAttribute("svg:width", sValue); - sValue = doubleToString(2.54 * (rect.y2-rect.y1)); sValue.append("cm"); - pDrawRectElement->addAttribute("svg:height", sValue); - sValue = doubleToString(2.54 * rx); sValue.append("cm"); - // FIXME: what to do when rx != ry ? - pDrawRectElement->addAttribute("draw:corner-radius", sValue); - mpBodyElements.push_back(static_cast(pDrawRectElement)); - mpBodyElements.push_back(static_cast(new TagCloseElement("draw:rect"))); -} - -void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry) -{ - writeStyle(); - TagOpenElement *pDrawEllipseElement = new TagOpenElement("draw:ellipse"); - WPXString sValue; - sValue.sprintf("gr%i", m_styleIndex-1); - pDrawEllipseElement->addAttribute("draw:style-name", sValue); - sValue = doubleToString(2.54 * (center.x-rx)); sValue.append("cm"); - pDrawEllipseElement->addAttribute("svg:x", sValue); - sValue = doubleToString(2.54 * (center.y-ry)); sValue.append("cm"); - pDrawEllipseElement->addAttribute("svg:y", sValue); - sValue = doubleToString(2 * 2.54 * rx); sValue.append("cm"); - pDrawEllipseElement->addAttribute("svg:width", sValue); - sValue = doubleToString(2 * 2.54 * ry); sValue.append("cm"); - pDrawEllipseElement->addAttribute("svg:height", sValue); - mpBodyElements.push_back(static_cast(pDrawEllipseElement)); - mpBodyElements.push_back(static_cast(new TagCloseElement("draw:ellipse"))); -} - -void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices) -{ - if(vertices.count() < 2) - return; - - if(vertices.count() == 2) - { - const libwpg::WPGPoint& p1 = vertices[0]; - const libwpg::WPGPoint& p2 = vertices[1]; - - writeStyle(); - TagOpenElement *pDrawLineElement = new TagOpenElement("draw:line"); - WPXString sValue; - sValue.sprintf("gr%i", m_styleIndex-1); - pDrawLineElement->addAttribute("draw:style-name", sValue); - pDrawLineElement->addAttribute("draw:text-style-name", "P1"); - pDrawLineElement->addAttribute("draw:layer", "layout"); - sValue = doubleToString(2.54 * p1.x); sValue.append("cm"); - pDrawLineElement->addAttribute("svg:x1", sValue); - sValue = doubleToString(2.54 * p1.y); sValue.append("cm"); - pDrawLineElement->addAttribute("svg:y1", sValue); - sValue = doubleToString(2.54 * p2.x); sValue.append("cm"); - pDrawLineElement->addAttribute("svg:x2", sValue); - sValue = doubleToString(2.54 * p2.y); sValue.append("cm"); - pDrawLineElement->addAttribute("svg:y2", sValue); - mpBodyElements.push_back(static_cast(pDrawLineElement)); - mpBodyElements.push_back(static_cast(new TagCloseElement("draw:line"))); - } - else - { - // draw as path - libwpg::WPGPath path; - path.moveTo(vertices[0]); - for(unsigned long ii = 1; ii < vertices.count(); ii++) - path.lineTo(vertices[ii]); - path.closed = true; - drawPath(path); - } -} - -void OdgExporter::drawPath(const libwpg::WPGPath& path) -{ - if(path.count() == 0) - return; - - // try to find the bounding box - // this is simple convex hull technique, the bounding box might not be - // accurate but that should be enough for this purpose - libwpg::WPGPoint p = path.element(0).point; - libwpg::WPGPoint q = path.element(0).point; - for(unsigned k = 0; k < path.count(); k++) - { - libwpg::WPGPathElement element = path.element(k); - p.x = (p.x > element.point.x) ? element.point.x : p.x; - p.y = (p.y > element.point.y) ? element.point.y : p.y; - q.x = (q.x < element.point.x) ? element.point.x : q.x; - q.y = (q.y < element.point.y) ? element.point.y : q.y; - if(element.type == libwpg::WPGPathElement::CurveToElement) - { - p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x; - p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y; - q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x; - q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y; - p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x; - p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y; - q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x; - q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y; - } - } - double vw = q.x - p.x; - double vh = q.y - p.y; - - writeStyle(); - - TagOpenElement *pDrawPathElement = new TagOpenElement("draw:path"); - WPXString sValue; - sValue.sprintf("gr%i", m_styleIndex-1); - pDrawPathElement->addAttribute("draw:style-name", sValue); - pDrawPathElement->addAttribute("draw:text-style-name", "P1"); - pDrawPathElement->addAttribute("draw:layer", "layout"); - sValue = doubleToString(2.54 * p.x); sValue.append("cm"); - pDrawPathElement->addAttribute("svg:x", sValue); - sValue = doubleToString(2.54 * p.y); sValue.append("cm"); - pDrawPathElement->addAttribute("svg:y", sValue); - sValue = doubleToString(2.54 * vw); sValue.append("cm"); - pDrawPathElement->addAttribute("svg:width", sValue); - sValue = doubleToString(2.54 * vh); sValue.append("cm"); - pDrawPathElement->addAttribute("svg:height", sValue); - sValue.sprintf("%i %i %i %i", 0, 0, (int)(vw*2540), (int)(vh*2540)); - pDrawPathElement->addAttribute("svg:viewBox", sValue); - - sValue.clear(); - for(unsigned i = 0; i < path.count(); i++) - { - libwpg::WPGPathElement element = path.element(i); - libwpg::WPGPoint point = element.point; - WPXString sElement; - switch(element.type) - { - // 2540 is 2.54*1000, 2.54 cm = 1 inch - case libwpg::WPGPathElement::MoveToElement: - sElement.sprintf("M%i %i", (int)((point.x-p.x)*2540), (int)((point.y-p.y)*2540)); - break; - - case libwpg::WPGPathElement::LineToElement: - sElement.sprintf("L%i %i", (int)((point.x-p.x)*2540), (int)((point.y-p.y)*2540)); - break; - - case libwpg::WPGPathElement::CurveToElement: - sElement.sprintf("C%i %i %i %i %i %i", (int)((element.extra1.x-p.x)*2540), - (int)((element.extra1.y-p.y)*2540), (int)((element.extra2.x-p.x)*2540), - (int)((element.extra2.y-p.y)*2540), (int)((point.x-p.x)*2540), (int)((point.y-p.y)*2540)); - break; - - default: - break; - } - sValue.append(sElement); - } - if(path.closed) - sValue.append(" Z"); - pDrawPathElement->addAttribute("svg:d", sValue); - mpBodyElements.push_back(static_cast(pDrawPathElement)); - mpBodyElements.push_back(static_cast(new TagCloseElement("draw:path"))); -} - -void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap) -{ - TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame"); - WPXString sValue; - sValue = doubleToString(2.54 * bitmap.rect.x1); sValue.append("cm"); - pDrawFrameElement->addAttribute("svg:x", sValue); - sValue = doubleToString(2.54 * bitmap.rect.y1); sValue.append("cm"); - pDrawFrameElement->addAttribute("svg:y", sValue); - sValue = doubleToString(2.54 * bitmap.rect.height()); sValue.append("cm"); - pDrawFrameElement->addAttribute("svg:height", sValue); - sValue = doubleToString(2.54 * bitmap.rect.width()); sValue.append("cm"); - pDrawFrameElement->addAttribute("svg:width", sValue); - mpBodyElements.push_back(static_cast(pDrawFrameElement)); - - mpBodyElements.push_back(static_cast(new TagOpenElement("draw:image"))); - - mpBodyElements.push_back(static_cast(new TagOpenElement("office:binary-data"))); - - libwpg::WPGString base64Binary; - bitmap.generateBase64DIB(base64Binary); - mpBodyElements.push_back(static_cast(new CharDataElement(base64Binary.cstr()))); - - mpBodyElements.push_back(static_cast(new TagCloseElement("office:binary-data"))); - - mpBodyElements.push_back(static_cast(new TagCloseElement("draw:image"))); - - mpBodyElements.push_back(static_cast(new TagCloseElement("draw:frame"))); -} - -void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData) -{ - if (binaryData.mimeType.length() <= 0) - return; - - TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame"); - WPXString sValue; - sValue = doubleToString(2.54 * binaryData.rect.x1); sValue.append("cm"); - pDrawFrameElement->addAttribute("svg:x", sValue); - sValue = doubleToString(2.54 * binaryData.rect.y1); sValue.append("cm"); - pDrawFrameElement->addAttribute("svg:y", sValue); - sValue = doubleToString(2.54 * binaryData.rect.height()); sValue.append("cm"); - pDrawFrameElement->addAttribute("svg:height", sValue); - sValue = doubleToString(2.54 * binaryData.rect.width()); sValue.append("cm"); - pDrawFrameElement->addAttribute("svg:width", sValue); - mpBodyElements.push_back(static_cast(pDrawFrameElement)); - - mpBodyElements.push_back(static_cast(new TagOpenElement("draw:image"))); - - mpBodyElements.push_back(static_cast(new TagOpenElement("office:binary-data"))); - - libwpg::WPGString base64Binary = binaryData.getBase64Data();; - mpBodyElements.push_back(static_cast(new CharDataElement(base64Binary.cstr()))); - - mpBodyElements.push_back(static_cast(new TagCloseElement("office:binary-data"))); - - mpBodyElements.push_back(static_cast(new TagCloseElement("draw:image"))); - - mpBodyElements.push_back(static_cast(new TagCloseElement("draw:frame"))); -} - -void OdgExporter::writeStyle() -{ - if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) ) - { - // ODG only supports dashes with the same length of spaces inbetween - // here we take the first space and assume everything else the same - // note that dash length is written in percentage - double distance = m_pen.dashArray.at(1); - TagOpenElement tmpDrawStrokeDashElement("draw:stroke-dash"); - tmpDrawStrokeDashElement.addAttribute("draw:style", "rect"); - WPXString sValue; - sValue.sprintf("Dash_%i", m_dashIndex++); - tmpDrawStrokeDashElement.addAttribute("draw:name", sValue); - sValue.sprintf("%i \%", distance*100); - tmpDrawStrokeDashElement.addAttribute("draw:distance", sValue); - WPXString sName; - for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++) - { - sName.sprintf("draw:dots%i", i+1); - tmpDrawStrokeDashElement.addAttribute(sName.cstr(), "1"); - sName.sprintf("draw:dots%i-length", i+1); - sValue.sprintf("%i\%", 100*m_pen.dashArray.at(i*2)); - tmpDrawStrokeDashElement.addAttribute(sName.cstr(), sValue); - } - tmpDrawStrokeDashElement.write(mpHandler); - TagCloseElement("draw:stroke-dash").write(mpHandler); - } - - if(m_brush.style == libwpg::WPGBrush::Gradient) - { - TagOpenElement tmpDrawGradientElement("draw:gradient"); - tmpDrawGradientElement.addAttribute("draw:style", "linear"); - WPXString sValue; - sValue.sprintf("Gradient_%i", m_gradientIndex++); - tmpDrawGradientElement.addAttribute("draw:name", sValue); - - // ODG angle unit is 0.1 degree - double angle = -m_brush.gradient.angle(); - while(angle < 0) - angle += 360; - while(angle > 360) - angle -= 360; - - sValue.sprintf("%i", angle*10); - tmpDrawGradientElement.addAttribute("draw:angle", sValue); - - libwpg::WPGColor startColor = m_brush.gradient.stopColor(0); - libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1); - sValue.sprintf("#%.2x%.2x%.2x", (startColor.red & 0xff), (startColor.green & 0xff), (startColor.blue & 0xff)); - tmpDrawGradientElement.addAttribute("draw:start-color", sValue); - sValue.sprintf("#%.2x%.2x%.2x", (stopColor.red & 0xff), (stopColor.green & 0xff), (stopColor.blue & 0xff)); - tmpDrawGradientElement.addAttribute("draw:end-color", sValue); - tmpDrawGradientElement.addAttribute("draw:start-intensity", "100%"); - tmpDrawGradientElement.addAttribute("draw:end-intensity", "100%"); - tmpDrawGradientElement.addAttribute("draw:border", "0%"); - tmpDrawGradientElement.write(mpHandler); - TagCloseElement("draw:gradient").write(mpHandler); - } - - TagOpenElement tmpStyleStyleElement("style:style"); - WPXString sValue; - sValue.sprintf("gr%i", m_styleIndex); - tmpStyleStyleElement.addAttribute("style:name", sValue); - tmpStyleStyleElement.addAttribute("style:family", "graphic"); - tmpStyleStyleElement.addAttribute("style:parent-style-name", "standard"); - tmpStyleStyleElement.write(mpHandler); - - TagOpenElement tmpStyleGraphicPropertiesElement("style:graphic-properties"); - - if(m_pen.width > 0.0) - { - sValue = doubleToString(2.54 * m_pen.width); sValue.append("cm"); - tmpStyleGraphicPropertiesElement.addAttribute("svg:stroke-width", sValue); - sValue.sprintf("#%.2x%.2x%.2x", (m_pen.foreColor.red & 0xff), - (m_pen.foreColor.green & 0xff), (m_pen.foreColor.blue & 0xff)); - tmpStyleGraphicPropertiesElement.addAttribute("svg:stroke-color", sValue); - - if(!m_pen.solid) - { - tmpStyleGraphicPropertiesElement.addAttribute("draw:stroke", "dash"); - sValue.sprintf("Dash_%i", m_dashIndex-1); - tmpStyleGraphicPropertiesElement.addAttribute("draw:stroke-dash", sValue); - } - } - else - tmpStyleGraphicPropertiesElement.addAttribute("draw:stroke", "none"); - - if(m_brush.style == libwpg::WPGBrush::NoBrush) - tmpStyleGraphicPropertiesElement.addAttribute("draw:fill", "none"); - - if(m_brush.style == libwpg::WPGBrush::Solid) - { - tmpStyleGraphicPropertiesElement.addAttribute("draw:fill", "solid"); - sValue.sprintf("#%.2x%.2x%.2x", (m_brush.foreColor.red & 0xff), - (m_brush.foreColor.green & 0xff), (m_brush.foreColor.blue & 0xff)); - tmpStyleGraphicPropertiesElement.addAttribute("draw:fill-color", sValue); - } - - if(m_brush.style == libwpg::WPGBrush::Gradient) - { - tmpStyleGraphicPropertiesElement.addAttribute("draw:fill", "gradient"); - sValue.sprintf("Gradient_%i", m_gradientIndex-1); - tmpStyleGraphicPropertiesElement.addAttribute("draw:fill-gradient-name", sValue); - } - - tmpStyleGraphicPropertiesElement.write(mpHandler); - TagCloseElement("style:graphic-properties").write(mpHandler); - - TagCloseElement("style:style").write(mpHandler); - m_styleIndex++; -} - -WPXString OdgExporter::doubleToString(const double value) -{ - return WPXString((char *)::rtl::math::doubleToString(value, rtl_math_StringFormat_F, 4, '.').getStr()); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/wpgimp/OdgExporter.hxx b/writerperfect/source/wpgimp/OdgExporter.hxx deleted file mode 100644 index 2bfa6b88a144..000000000000 --- a/writerperfect/source/wpgimp/OdgExporter.hxx +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* libwpg - * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) - * Copyright (C) 2007 Fridrich Strba (fridrich_strba@bluewin.ch) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301 USA - * - * For further information visit http://libwpg.sourceforge.net - */ - -/* "This product is not manufactured, approved, or supported by - * Corel Corporation or Corel Corporation Limited." - */ - -#ifndef __ODGEXPORTER_HXX__ -#define __ODGEXPORTER_HXX__ - -#include -#include -#include - -#include -#include -#include -#include "filter/DocumentElement.hxx" -#include "filter/DocumentHandler.hxx" - -class OdgExporter : public libwpg::WPGPaintInterface { -public: - OdgExporter(DocumentHandler *pHandler); - ~OdgExporter(); - - void startDocument(double width, double height); - void startGraphics(double width, double height) { startDocument(width, height); } - void endDocument(); - void endGraphics() { endDocument(); }; - void startLayer(unsigned int id); - void endLayer(unsigned int id); - - void setPen(const libwpg::WPGPen& pen); - void setBrush(const libwpg::WPGBrush& brush); - void setFillRule(FillRule rule); - - void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry); - void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry); - void drawPolygon(const libwpg::WPGPointArray& vertices); - void drawPath(const libwpg::WPGPath& path); - void drawBitmap(const libwpg::WPGBitmap& bitmap); - void drawImageObject(const libwpg::WPGBinaryData& binaryData); - -private: - std::vector mpBodyElements; - std::vector mpStylesElements; - DocumentHandler *mpHandler; - - libwpg::WPGPen m_pen; - libwpg::WPGBrush m_brush; - FillRule m_fillRule; - int m_gradientIndex; - int m_dashIndex; - int m_styleIndex; - void writeStyle(); - WPXString doubleToString(const double value); -}; - -#endif // __ODGEXPORTER_HXX__ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/wpgimp/makefile.mk b/writerperfect/source/wpgimp/makefile.mk index f2440469c6a9..ccf1d7df9e34 100644 --- a/writerperfect/source/wpgimp/makefile.mk +++ b/writerperfect/source/wpgimp/makefile.mk @@ -8,14 +8,10 @@ ENABLE_EXCEPTIONS=true .IF "$(SYSTEM_LIBWPD)" == "YES" INCPRE+=$(LIBWPD_CFLAGS) -.ELSE -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd .ENDIF .IF "$(SYSTEM_LIBWPG)" == "YES" INCPRE+=$(LIBWPG_CFLAGS) -.ELSE -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF # broken but ... necessary, internal include shafted ... From 9974dbcbee4bbadccf20953ac729f843e34adc51 Mon Sep 17 00:00:00 2001 From: Muthu Subramanian K Date: Mon, 22 Nov 2010 15:55:48 +0530 Subject: [PATCH 3/6] Missing call to importDocumentProperties() n#655194 --- oox/source/xls/excelfilter.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/oox/source/xls/excelfilter.cxx b/oox/source/xls/excelfilter.cxx index 1093b5cc7bfe..783ff493c268 100644 --- a/oox/source/xls/excelfilter.cxx +++ b/oox/source/xls/excelfilter.cxx @@ -129,7 +129,12 @@ bool ExcelFilter::importDocument() throw() return false; WorkbookHelperRoot aHelper( *this ); - return aHelper.isValid() && importFragment( new OoxWorkbookFragment( aHelper, aWorkbookPath ) ); + if( aHelper.isValid() && importFragment( new OoxWorkbookFragment( aHelper, aWorkbookPath ) ) ) + { + importDocumentProperties(); + return true; + } + return false; } bool ExcelFilter::exportDocument() throw() From 06e1dc0304efe0446816d510f9c6e6673079f157 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Mon, 22 Nov 2010 12:02:41 +0000 Subject: [PATCH 4/6] fix for n#648731 imagedata attribute not imported correctly --- oox/source/vml/vmlshapecontext.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index ac7ede61f161..414a414c1a78 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -241,7 +241,8 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( sal_Int32 nElement, const A mrTypeModel.maFillModel.moRotate = lclDecodeBool( rAttribs, XML_rotate ); break; case VML_TOKEN( imagedata ): - mrTypeModel.moGraphicPath = decodeFragmentPath( rAttribs, O_TOKEN( relid ) ); + mydump( rAttribs ); + mrTypeModel.moGraphicPath = decodeFragmentPath( rAttribs, R_TOKEN( id ) ); mrTypeModel.moGraphicTitle = rAttribs.getString( O_TOKEN( title ) ); break; } From a146d01a70a85712556918f1b77596870582d679 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Mon, 22 Nov 2010 14:20:56 +0000 Subject: [PATCH 5/6] remove debugging artifact --- oox/source/vml/vmlshapecontext.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index 414a414c1a78..bdca6526ab6a 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -241,7 +241,6 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( sal_Int32 nElement, const A mrTypeModel.maFillModel.moRotate = lclDecodeBool( rAttribs, XML_rotate ); break; case VML_TOKEN( imagedata ): - mydump( rAttribs ); mrTypeModel.moGraphicPath = decodeFragmentPath( rAttribs, R_TOKEN( id ) ); mrTypeModel.moGraphicTitle = rAttribs.getString( O_TOKEN( title ) ); break; From 471786679a2b42f235486d090da592d476931789 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 24 Nov 2010 13:28:09 +0100 Subject: [PATCH 6/6] add missing xsl:when start tag (cherry picked from commit a720d902988a7fc8e6cbc6e6ab8f82553a56318c) --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 1 + 1 file changed, 1 insertion(+) diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 70cb8b716be9..3e030ba8ee06 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -1827,6 +1827,7 @@ 0 +