diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-24 09:12:26 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-24 11:15:01 +0100 |
commit | af72d1b9d1745944cd7842905d2d8ac3f8d1d640 (patch) | |
tree | 69e196755befcc0b4ff3e5605ddbe0d99f46a794 /writerperfect/source/writer | |
parent | de523ce9b834b2d8f29409fe21d68b81ef314fe5 (diff) |
EPUB export: handle cell width
By handling relative column widths in libepubgen (since LO may only know
that one, when layout is not available) and parsing column properties in
writerperfect.
Change-Id: I8fae5f1a3c970b97c2b452f3c20eff0911a56ba8
Reviewed-on: https://gerrit.libreoffice.org/45202
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerperfect/source/writer')
-rw-r--r-- | writerperfect/source/writer/exp/txtstyli.cxx | 37 | ||||
-rw-r--r-- | writerperfect/source/writer/exp/txtstyli.hxx | 2 | ||||
-rw-r--r-- | writerperfect/source/writer/exp/xmlfmt.cxx | 11 | ||||
-rw-r--r-- | writerperfect/source/writer/exp/xmlfmt.hxx | 5 | ||||
-rw-r--r-- | writerperfect/source/writer/exp/xmlimp.cxx | 16 | ||||
-rw-r--r-- | writerperfect/source/writer/exp/xmlimp.hxx | 4 | ||||
-rw-r--r-- | writerperfect/source/writer/exp/xmltbli.cxx | 94 | ||||
-rw-r--r-- | writerperfect/source/writer/exp/xmltbli.hxx | 4 |
8 files changed, 157 insertions, 16 deletions
diff --git a/writerperfect/source/writer/exp/txtstyli.cxx b/writerperfect/source/writer/exp/txtstyli.cxx index a6f04e20c39e..15889877e883 100644 --- a/writerperfect/source/writer/exp/txtstyli.cxx +++ b/writerperfect/source/writer/exp/txtstyli.cxx @@ -75,6 +75,34 @@ void XMLTextPropertiesContext::startElement(const OUString &/*rName*/, const css } } +/// Handler for <style:table-column-properties>. +class XMLTableColumnPropertiesContext : public XMLImportContext +{ +public: + XMLTableColumnPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle); + + void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override; + +private: + XMLStyleContext &mrStyle; +}; + +XMLTableColumnPropertiesContext::XMLTableColumnPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle) + : XMLImportContext(rImport) + , mrStyle(rStyle) +{ +} + +void XMLTableColumnPropertiesContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) +{ + for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i) + { + OString sName = OUStringToOString(xAttribs->getNameByIndex(i), RTL_TEXTENCODING_UTF8); + OString sValue = OUStringToOString(xAttribs->getValueByIndex(i), RTL_TEXTENCODING_UTF8); + mrStyle.GetColumnPropertyList().insert(sName.getStr(), sValue.getStr()); + } +} + /// Handler for <style:table-cell-properties>. class XMLTableCellPropertiesContext : public XMLImportContext { @@ -117,6 +145,8 @@ rtl::Reference<XMLImportContext> XMLStyleContext::CreateChildContext(const OUStr return new XMLTextPropertiesContext(mrImport, *this); if (rName == "style:table-cell-properties") return new XMLTableCellPropertiesContext(mrImport, *this); + if (rName == "style:table-column-properties") + return new XMLTableColumnPropertiesContext(mrImport, *this); return nullptr; } @@ -150,6 +180,8 @@ void XMLStyleContext::endElement(const OUString &/*rName*/) m_rStyles.GetCurrentParagraphStyles()[m_aName] = m_aParagraphPropertyList; if (m_aFamily == "table-cell") m_rStyles.GetCurrentCellStyles()[m_aName] = m_aCellPropertyList; + if (m_aFamily == "table-column") + m_rStyles.GetCurrentColumnStyles()[m_aName] = m_aColumnPropertyList; } librevenge::RVNGPropertyList &XMLStyleContext::GetTextPropertyList() @@ -167,6 +199,11 @@ librevenge::RVNGPropertyList &XMLStyleContext::GetCellPropertyList() return m_aCellPropertyList; } +librevenge::RVNGPropertyList &XMLStyleContext::GetColumnPropertyList() +{ + return m_aColumnPropertyList; +} + } // namespace exp } // namespace writerperfect diff --git a/writerperfect/source/writer/exp/txtstyli.hxx b/writerperfect/source/writer/exp/txtstyli.hxx index 8550cb66d879..1321beae9385 100644 --- a/writerperfect/source/writer/exp/txtstyli.hxx +++ b/writerperfect/source/writer/exp/txtstyli.hxx @@ -34,6 +34,7 @@ public: librevenge::RVNGPropertyList &GetTextPropertyList(); librevenge::RVNGPropertyList &GetParagraphPropertyList(); librevenge::RVNGPropertyList &GetCellPropertyList(); + librevenge::RVNGPropertyList &GetColumnPropertyList(); private: OUString m_aName; @@ -41,6 +42,7 @@ private: librevenge::RVNGPropertyList m_aTextPropertyList; librevenge::RVNGPropertyList m_aParagraphPropertyList; librevenge::RVNGPropertyList m_aCellPropertyList; + librevenge::RVNGPropertyList m_aColumnPropertyList; XMLStylesContext &m_rStyles; }; diff --git a/writerperfect/source/writer/exp/xmlfmt.cxx b/writerperfect/source/writer/exp/xmlfmt.cxx index 52698fec8740..c3854e5323c4 100644 --- a/writerperfect/source/writer/exp/xmlfmt.cxx +++ b/writerperfect/source/writer/exp/xmlfmt.cxx @@ -21,11 +21,13 @@ namespace exp XMLStylesContext::XMLStylesContext(XMLImport &rImport, std::map<OUString, librevenge::RVNGPropertyList> &rParagraphStyles, std::map<OUString, librevenge::RVNGPropertyList> &rTextStyles, - std::map<OUString, librevenge::RVNGPropertyList> &rCellStyles) + std::map<OUString, librevenge::RVNGPropertyList> &rCellStyles, + std::map<OUString, librevenge::RVNGPropertyList> &rColumnStyles) : XMLImportContext(rImport), m_rParagraphStyles(rParagraphStyles), m_rTextStyles(rTextStyles), - m_rCellStyles(rCellStyles) + m_rCellStyles(rCellStyles), + m_rColumnStyles(rColumnStyles) { } @@ -51,6 +53,11 @@ std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentCe return m_rCellStyles; } +std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentColumnStyles() +{ + return m_rColumnStyles; +} + } // namespace exp } // namespace writerperfect diff --git a/writerperfect/source/writer/exp/xmlfmt.hxx b/writerperfect/source/writer/exp/xmlfmt.hxx index cd89121b7dd5..5d575fa065d5 100644 --- a/writerperfect/source/writer/exp/xmlfmt.hxx +++ b/writerperfect/source/writer/exp/xmlfmt.hxx @@ -27,17 +27,20 @@ class XMLStylesContext : public XMLImportContext public: XMLStylesContext(XMLImport &rImport, std::map<OUString, librevenge::RVNGPropertyList> &rParagraphStyles, std::map<OUString, librevenge::RVNGPropertyList> &rTextStyles, - std::map<OUString, librevenge::RVNGPropertyList> &rCellStyles); + std::map<OUString, librevenge::RVNGPropertyList> &rCellStyles, + std::map<OUString, librevenge::RVNGPropertyList> &rColumnStyles); rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override; std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentParagraphStyles(); std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentTextStyles(); std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentCellStyles(); + std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentColumnStyles(); private: std::map<OUString, librevenge::RVNGPropertyList> &m_rParagraphStyles; std::map<OUString, librevenge::RVNGPropertyList> &m_rTextStyles; std::map<OUString, librevenge::RVNGPropertyList> &m_rCellStyles; + std::map<OUString, librevenge::RVNGPropertyList> &m_rColumnStyles; }; } // namespace exp diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx index 67b4fd713149..20e20e76f870 100644 --- a/writerperfect/source/writer/exp/xmlimp.cxx +++ b/writerperfect/source/writer/exp/xmlimp.cxx @@ -65,11 +65,13 @@ rtl::Reference<XMLImportContext> XMLOfficeDocContext::CreateChildContext(const O else if (rName == "office:automatic-styles") return new XMLStylesContext(mrImport, mrImport.GetAutomaticParagraphStyles(), mrImport.GetAutomaticTextStyles(), - mrImport.GetAutomaticCellStyles()); + mrImport.GetAutomaticCellStyles(), + mrImport.GetAutomaticColumnStyles()); else if (rName == "office:styles") return new XMLStylesContext(mrImport, mrImport.GetParagraphStyles(), mrImport.GetTextStyles(), - mrImport.GetCellStyles()); + mrImport.GetCellStyles(), + mrImport.GetColumnStyles()); return nullptr; } @@ -105,6 +107,11 @@ std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetAutomaticCellSty return maAutomaticCellStyles; } +std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetAutomaticColumnStyles() +{ + return maAutomaticColumnStyles; +} + std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetTextStyles() { return maTextStyles; @@ -120,6 +127,11 @@ std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetCellStyles() return maCellStyles; } +std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetColumnStyles() +{ + return maColumnStyles; +} + void XMLImport::startDocument() { mrGenerator.startDocument(librevenge::RVNGPropertyList()); diff --git a/writerperfect/source/writer/exp/xmlimp.hxx b/writerperfect/source/writer/exp/xmlimp.hxx index 2540e4db8d22..8b833b1f7054 100644 --- a/writerperfect/source/writer/exp/xmlimp.hxx +++ b/writerperfect/source/writer/exp/xmlimp.hxx @@ -41,6 +41,8 @@ class XMLImport : public cppu::WeakImplHelper std::map<OUString, librevenge::RVNGPropertyList> maParagraphStyles; std::map<OUString, librevenge::RVNGPropertyList> maAutomaticCellStyles; std::map<OUString, librevenge::RVNGPropertyList> maCellStyles; + std::map<OUString, librevenge::RVNGPropertyList> maAutomaticColumnStyles; + std::map<OUString, librevenge::RVNGPropertyList> maColumnStyles; public: XMLImport(librevenge::RVNGTextInterface &rGenerator); @@ -51,9 +53,11 @@ public: std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticTextStyles(); std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticParagraphStyles(); std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticCellStyles(); + std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticColumnStyles(); std::map<OUString, librevenge::RVNGPropertyList> &GetTextStyles(); std::map<OUString, librevenge::RVNGPropertyList> &GetParagraphStyles(); std::map<OUString, librevenge::RVNGPropertyList> &GetCellStyles(); + std::map<OUString, librevenge::RVNGPropertyList> &GetColumnStyles(); // XDocumentHandler void SAL_CALL startDocument() override; diff --git a/writerperfect/source/writer/exp/xmltbli.cxx b/writerperfect/source/writer/exp/xmltbli.cxx index 15444bc33e0b..c698c9d1ce9c 100644 --- a/writerperfect/source/writer/exp/xmltbli.cxx +++ b/writerperfect/source/writer/exp/xmltbli.cxx @@ -20,20 +20,41 @@ namespace writerperfect namespace exp { +/// Handler for <table:table-row>. +class XMLTableRowContext : public XMLImportContext +{ +public: + XMLTableRowContext(XMLImport &rImport); + + rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override; + int GetColumn() const; + void SetColumn(int nColumn); + + void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override; + void SAL_CALL endElement(const OUString &rName) override; + +private: + int m_nColumn = 0; +}; + /// Handler for <table:cell>. class XMLTableCellContext : public XMLImportContext { public: - XMLTableCellContext(XMLImport &rImport); + XMLTableCellContext(XMLImport &rImport, XMLTableRowContext &rRow); rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override; void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override; void SAL_CALL endElement(const OUString &rName) override; + +private: + XMLTableRowContext &m_rRow; }; -XMLTableCellContext::XMLTableCellContext(XMLImport &rImport) - : XMLImportContext(rImport) +XMLTableCellContext::XMLTableCellContext(XMLImport &rImport, XMLTableRowContext &rRow) + : XMLImportContext(rImport), + m_rRow(rRow) { } @@ -59,7 +80,9 @@ void XMLTableCellContext::startElement(const OUString &/*rName*/, const css::uno aPropertyList.insert(sName.getStr(), sValue.getStr()); } } + aPropertyList.insert("librevenge:column", m_rRow.GetColumn()); mrImport.GetGenerator().openTableCell(aPropertyList); + m_rRow.SetColumn(m_rRow.GetColumn() + 1); } void XMLTableCellContext::endElement(const OUString &/*rName*/) @@ -67,18 +90,38 @@ void XMLTableCellContext::endElement(const OUString &/*rName*/) mrImport.GetGenerator().closeTableCell(); } -/// Handler for <table:row>. -class XMLTableRowContext : public XMLImportContext +/// Handler for <table:table-column>. +class XMLTableColumnContext : public XMLImportContext { public: - XMLTableRowContext(XMLImport &rImport); - - rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override; + XMLTableColumnContext(XMLImport &rImport, librevenge::RVNGPropertyListVector &rColumns); void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override; - void SAL_CALL endElement(const OUString &rName) override; + +private: + librevenge::RVNGPropertyListVector &m_rColumns; }; +XMLTableColumnContext::XMLTableColumnContext(XMLImport &rImport, librevenge::RVNGPropertyListVector &rColumns) + : XMLImportContext(rImport), + m_rColumns(rColumns) +{ +} + +void XMLTableColumnContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) +{ + librevenge::RVNGPropertyList aPropertyList; + for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i) + { + const OUString &rAttributeName = xAttribs->getNameByIndex(i); + const OUString &rAttributeValue = xAttribs->getValueByIndex(i); + + if (rAttributeName == "table:style-name") + FillStyles(rAttributeValue, mrImport.GetAutomaticColumnStyles(), mrImport.GetColumnStyles(), aPropertyList); + } + m_rColumns.append(aPropertyList); +} + XMLTableRowContext::XMLTableRowContext(XMLImport &rImport) : XMLImportContext(rImport) { @@ -87,9 +130,12 @@ XMLTableRowContext::XMLTableRowContext(XMLImport &rImport) rtl::Reference<XMLImportContext> XMLTableRowContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/) { if (rName == "table:table-cell") - return new XMLTableCellContext(mrImport); + return new XMLTableCellContext(mrImport, *this); if (rName == "table:covered-table-cell") + { + ++m_nColumn; mrImport.GetGenerator().insertCoveredTableCell(librevenge::RVNGPropertyList()); + } else SAL_WARN("writerperfect", "XMLTableRowContext::CreateChildContext: unhandled " << rName); return nullptr; @@ -105,6 +151,16 @@ void XMLTableRowContext::endElement(const OUString &/*rName*/) mrImport.GetGenerator().closeTableRow(); } +int XMLTableRowContext::GetColumn() const +{ + return m_nColumn; +} + +void XMLTableRowContext::SetColumn(int nColumn) +{ + m_nColumn = nColumn; +} + XMLTableContext::XMLTableContext(XMLImport &rImport) : XMLImportContext(rImport) { @@ -112,14 +168,30 @@ XMLTableContext::XMLTableContext(XMLImport &rImport) rtl::Reference<XMLImportContext> XMLTableContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/) { + if (rName == "table:table-column") + // Make sure columns are parsed before we open the table. + return new XMLTableColumnContext(mrImport, m_aColumns); + + if (!m_bTableOpened) + { + librevenge::RVNGPropertyList aPropertyList; + if (!m_aColumns.empty()) + aPropertyList.insert("librevenge:table-columns", m_aColumns); + mrImport.GetGenerator().openTable(aPropertyList); + m_bTableOpened = true; + } + if (rName == "table:table-row") return new XMLTableRowContext(mrImport); + + SAL_WARN("writerperfect", "XMLTableContext::CreateChildContext: unhandled " << rName); + return nullptr; } void XMLTableContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/) { - mrImport.GetGenerator().openTable(librevenge::RVNGPropertyList()); + m_bTableOpened = false; } void XMLTableContext::endElement(const OUString &/*rName*/) diff --git a/writerperfect/source/writer/exp/xmltbli.hxx b/writerperfect/source/writer/exp/xmltbli.hxx index 07ae0a647181..8f0d06092f06 100644 --- a/writerperfect/source/writer/exp/xmltbli.hxx +++ b/writerperfect/source/writer/exp/xmltbli.hxx @@ -27,6 +27,10 @@ public: void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override; void SAL_CALL endElement(const OUString &rName) override; + +private: + bool m_bTableOpened = false; + librevenge::RVNGPropertyListVector m_aColumns; }; } // namespace exp |