src/lib/VSDXTheme.cpp | 16 ++++++++++++++-- src/lib/VSDXTheme.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-)
New commits: commit b63cef2b299728328ff33a44ba0cfc20673949af Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Mon Jul 22 06:10:01 2013 +0200 Stub reader for a:clrScheme diff --git a/src/lib/VSDXTheme.cpp b/src/lib/VSDXTheme.cpp index 126d16f..a0388f0 100644 --- a/src/lib/VSDXTheme.cpp +++ b/src/lib/VSDXTheme.cpp @@ -53,8 +53,17 @@ bool libvisio::VSDXTheme::parse(WPXInputStream *input) int ret = xmlTextReaderRead(reader); while (1 == ret) { - /* int tokenId = VSDXMLTokenMap::getTokenId(xmlTextReaderConstName(reader)); - int tokenType = xmlTextReaderNodeType(reader); */ + int tokenId = VSDXMLTokenMap::getTokenId(xmlTextReaderConstName(reader)); + int tokenType = xmlTextReaderNodeType(reader); + + switch (tokenId) + { + case XML_A_CLRSCHEME: + readClrScheme(reader); + break; + default: + break; + } ret = xmlTextReaderRead(reader); } } @@ -109,5 +118,8 @@ boost::optional<libvisio::Colour> libvisio::VSDXTheme::readSysClr(xmlTextReaderP return retVal; } +void libvisio::VSDXTheme::readClrScheme(xmlTextReaderPtr reader) +{ +} /* vim:set shiftwidth=2 softtabstop=2 expandtab: */ diff --git a/src/lib/VSDXTheme.h b/src/lib/VSDXTheme.h index 30ac216..2e1101f 100644 --- a/src/lib/VSDXTheme.h +++ b/src/lib/VSDXTheme.h @@ -39,6 +39,34 @@ namespace libvisio class VSDCollector; +struct VSDXVariationClrScheme +{ + Colour m_varColor1; + Colour m_varColor2; + Colour m_varColor3; + Colour m_varColor4; + Colour m_varColor5; + Colour m_varColor6; + Colour m_varColor7; +}; + +struct VSDXClrScheme +{ + Colour m_dk1; + Colour m_lt1; + Colour m_dk2; + Colour m_lt2; + Colour m_accent1; + Colour m_accent2; + Colour m_accent3; + Colour m_accent4; + Colour m_accent5; + Colour m_accent6; + Colour m_hlink; + Colour m_folHlink; + std::vector<VSDXVariationClrScheme> variationClrSchemeLst; +}; + class VSDXTheme { public: @@ -52,6 +80,8 @@ private: boost::optional<Colour> readSrgbClr(xmlTextReaderPtr reader); boost::optional<Colour> readSysClr(xmlTextReaderPtr reader); + + void readClrScheme(xmlTextReaderPtr reader); }; } // namespace libvisio
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits