[Libreoffice-commits] libvisio.git: src/conv src/lib
src/conv/raw/vsd2raw.cpp|2 +- src/conv/raw/vss2raw.cpp|2 +- src/conv/svg/vsd2xhtml.cpp |2 +- src/conv/svg/vss2xhtml.cpp |2 +- src/conv/text/vsd2text.cpp |2 +- src/conv/text/vss2text.cpp |2 +- src/lib/VDXParser.cpp |6 +++--- src/lib/VSD5Parser.cpp |2 +- src/lib/VSDContentCollector.cpp | 16 src/lib/VSDContentCollector.h |4 ++-- src/lib/VSDFieldList.cpp|2 +- src/lib/VSDGeometryList.cpp |2 +- src/lib/VSDInternalStream.cpp |4 ++-- src/lib/VSDInternalStream.h |6 +++--- src/lib/VSDLayerList.cpp|6 +++--- src/lib/VSDMetaData.cpp |2 +- src/lib/VSDParser.cpp | 14 +++--- src/lib/VSDParser.h |2 +- src/lib/VSDStencils.cpp | 32 src/lib/VSDXMLHelper.cpp| 10 +- src/lib/VSDXMLParserBase.cpp|8 src/lib/VSDXMetaData.cpp|2 +- src/lib/VSDXParser.cpp | 12 ++-- src/lib/VSDXTheme.cpp |2 +- src/lib/VisioDocument.cpp |2 +- src/lib/libvisio_xml.h |2 +- 26 files changed, 74 insertions(+), 74 deletions(-) New commits: commit 7cf4bf3b624fadb327a54c63d880ee664e8434b5 Author: Miklos Vajna Date: Mon Sep 18 10:34:05 2017 +0200 Convert 0 to nullptr where it's used as a pointer value To make the code easier to read, because this means the remaining zeros all mean numbers. Change-Id: I677df217aae81e15496d47a93daaab633d8b903f diff --git a/src/conv/raw/vsd2raw.cpp b/src/conv/raw/vsd2raw.cpp index b9ffde9..ce15260 100644 --- a/src/conv/raw/vsd2raw.cpp +++ b/src/conv/raw/vsd2raw.cpp @@ -54,7 +54,7 @@ int printVersion() int main(int argc, char *argv[]) { bool printIndentLevel = false; - char *file = 0; + char *file = nullptr; if (argc < 2) return printUsage(); diff --git a/src/conv/raw/vss2raw.cpp b/src/conv/raw/vss2raw.cpp index 4af8e3c..8f1b311 100644 --- a/src/conv/raw/vss2raw.cpp +++ b/src/conv/raw/vss2raw.cpp @@ -54,7 +54,7 @@ int printVersion() int main(int argc, char *argv[]) { bool printIndentLevel = false; - char *file = 0; + char *file = nullptr; if (argc < 2) return printUsage(); diff --git a/src/conv/svg/vsd2xhtml.cpp b/src/conv/svg/vsd2xhtml.cpp index cc91c85..7801eee 100644 --- a/src/conv/svg/vsd2xhtml.cpp +++ b/src/conv/svg/vsd2xhtml.cpp @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) if (argc < 2) return printUsage(); - char *file = 0; + char *file = nullptr; for (int i = 1; i < argc; i++) { diff --git a/src/conv/svg/vss2xhtml.cpp b/src/conv/svg/vss2xhtml.cpp index f466988..edfeea5 100644 --- a/src/conv/svg/vss2xhtml.cpp +++ b/src/conv/svg/vss2xhtml.cpp @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) if (argc < 2) return printUsage(); - char *file = 0; + char *file = nullptr; for (int i = 1; i < argc; i++) { diff --git a/src/conv/text/vsd2text.cpp b/src/conv/text/vsd2text.cpp index e5fe090..1d9d5fb 100644 --- a/src/conv/text/vsd2text.cpp +++ b/src/conv/text/vsd2text.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) if (argc < 2) return printUsage(); - char *file = 0; + char *file = nullptr; for (int i = 1; i < argc; i++) { diff --git a/src/conv/text/vss2text.cpp b/src/conv/text/vss2text.cpp index dd8148e..f1e80f9 100644 --- a/src/conv/text/vss2text.cpp +++ b/src/conv/text/vss2text.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) if (argc < 2) return printUsage(); - char *file = 0; + char *file = nullptr; for (int i = 1; i < argc; i++) { diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp index 2a3304b..ef6f7c6 100644 --- a/src/lib/VDXParser.cpp +++ b/src/lib/VDXParser.cpp @@ -75,7 +75,7 @@ bool libvisio::VDXParser::processXmlDocument(librevenge::RVNGInputStream *input) return false; const std::shared_ptr reader( -xmlReaderForStream(input, 0, 0, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER), +xmlReaderForStream(input, nullptr, nullptr, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER), xmlFreeTextReader); if (!reader) return false; @@ -920,7 +920,7 @@ xmlChar *libvisio::VDXParser::readStringData(xmlTextReaderPtr reader) return stringValue; } } - return 0; + return nullptr; } int libvisio::VDXParser::getElementToken(xmlTextReaderPtr reader) @@ -1032,7 +1032,7 @@ void libvisio::VDXParser::readTabs(xmlTextReaderPtr reader) } while ((XML_TABS != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && (!m_watcher || !m_watcher->isError())); } - m_currentTabSet = 0; + m_currentTabSet = nullptr; } void libvisio::VDXParser::readTab(xmlTextReaderPtr reader) diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp index fd5b298..c3f80fd 100644 --- a/src/lib/VSD5Parser.cpp
[Libreoffice-commits] libvisio.git: src/conv
src/conv/text/vsd2text.cpp |6 +- src/conv/text/vss2text.cpp |6 +- 2 files changed, 10 insertions(+), 2 deletions(-) New commits: commit dfbb827940bcf2e8b1ffcea48db10050c0d80e9e Author: David Tardon Date: Fri Nov 8 15:03:19 2013 +0100 adapt to librevenge generator changes Change-Id: I3ab3ab4c8100fbd391780a4df6c01832cfd91d9d diff --git a/src/conv/text/vsd2text.cpp b/src/conv/text/vsd2text.cpp index e843fa4..5a3fb31 100644 --- a/src/conv/text/vsd2text.cpp +++ b/src/conv/text/vsd2text.cpp @@ -76,13 +76,17 @@ int main(int argc, char *argv[]) return 1; } - librevenge::RVNGTextDrawingGenerator painter; + librevenge::RVNGStringVector pages; + librevenge::RVNGTextDrawingGenerator painter(pages); if (!libvisio::VisioDocument::parse(&input, &painter)) { fprintf(stderr, "ERROR: Parsing of document failed!\n"); return 1; } + for (unsigned i = 0; i != pages.size(); ++i) +printf("%s", pages[i].cstr()); + return 0; } diff --git a/src/conv/text/vss2text.cpp b/src/conv/text/vss2text.cpp index 217dc62..f7ba149 100644 --- a/src/conv/text/vss2text.cpp +++ b/src/conv/text/vss2text.cpp @@ -76,13 +76,17 @@ int main(int argc, char *argv[]) return 1; } - librevenge::RVNGTextDrawingGenerator painter; + librevenge::RVNGStringVector pages; + librevenge::RVNGTextDrawingGenerator painter(pages); if (!libvisio::VisioDocument::parseStencils(&input, &painter)) { fprintf(stderr, "ERROR: Parsing of document failed!\n"); return 1; } + for (unsigned i = 0; i != pages.size(); ++i) +printf("%s", pages[i].cstr()); + return 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/conv
src/conv/svg/vsd2xhtml.cpp |2 +- src/conv/svg/vss2xhtml.cpp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 8c10286ed99c0e8682c7563282a06da11cf136b2 Author: Fridrich Å trba Date: Thu Nov 7 22:32:11 2013 +0100 historically this svg was in svg namespace Change-Id: If0eeb76c1ebb9e264b58c3597884b0370b74106f diff --git a/src/conv/svg/vsd2xhtml.cpp b/src/conv/svg/vsd2xhtml.cpp index e21a477..74fb06b 100644 --- a/src/conv/svg/vsd2xhtml.cpp +++ b/src/conv/svg/vsd2xhtml.cpp @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) } librevenge::RVNGStringVector output; - librevenge::RVNGSVGDrawingGenerator generator(output, ""); + librevenge::RVNGSVGDrawingGenerator generator(output, "svg"); if (!libvisio::VisioDocument::parse(&input, &generator)) { std::cerr << "ERROR: SVG Generation failed!" << std::endl; diff --git a/src/conv/svg/vss2xhtml.cpp b/src/conv/svg/vss2xhtml.cpp index b96b639..5af2a05 100644 --- a/src/conv/svg/vss2xhtml.cpp +++ b/src/conv/svg/vss2xhtml.cpp @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) } librevenge::RVNGStringVector output; - librevenge::RVNGSVGDrawingGenerator generator(output, ""); + librevenge::RVNGSVGDrawingGenerator generator(output, "svg"); if (!libvisio::VisioDocument::parseStencils(&input, &generator)) { std::cerr << "ERROR: SVG Generation failed!" << std::endl; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/conv
src/conv/svg/Makefile.am |2 -- 1 file changed, 2 deletions(-) New commits: commit 0329157c79f7f5a03a0ef4f651978363d0f6e1ce Author: Fridrich Å trba Date: Thu Nov 7 20:51:12 2013 +0100 Small fix Change-Id: Ie4e9f82756e2337124a8b56507f7e6bc0a5a8397 diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am index 6f24fc6..6fa540b 100644 --- a/src/conv/svg/Makefile.am +++ b/src/conv/svg/Makefile.am @@ -6,7 +6,6 @@ AM_CXXFLAGS = \ -I$(top_srcdir)/inc \ $(LIBVISIO_CXXFLAGS) \ $(REVENGE_STREAM_CFLAGS) \ - $(REVENGE_GENERATORS_CFLAGS) \ $(DEBUG_CXXFLAGS) vsd2xhtml_DEPENDENCIES = @VSD2XHTML_WIN32_RESOURCE@ @@ -15,7 +14,6 @@ vss2xhtml_DEPENDENCIES = @VSS2XHTML_WIN32_RESOURCE@ vsd2xhtml_LDADD = \ ../../lib/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.la \ - $(REVENGE_GENERATORS_LIBS) \ $(LIBVISIO_LIBS) \ $(REVENGE_STREAM_LIBS) \ @VSD2XHTML_WIN32_RESOURCE@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/conv
src/conv/raw/vsd2raw.cpp |2 ++ src/conv/raw/vss2raw.cpp |2 ++ 2 files changed, 4 insertions(+) New commits: commit 1f93cd5ef60ff1c3008e507f29123d7f2ea0449a Author: Fridrich Å trba Date: Tue Nov 5 18:34:51 2013 +0100 Missing includes Change-Id: Ifc3be1a5c6e9219da5aa9da270f14aa96ab492ae diff --git a/src/conv/raw/vsd2raw.cpp b/src/conv/raw/vsd2raw.cpp index e20e2b7..738a863 100644 --- a/src/conv/raw/vsd2raw.cpp +++ b/src/conv/raw/vsd2raw.cpp @@ -28,6 +28,8 @@ * instead of those above. */ +#include +#include #include #include #include diff --git a/src/conv/raw/vss2raw.cpp b/src/conv/raw/vss2raw.cpp index b496e28..5bf1b85 100644 --- a/src/conv/raw/vss2raw.cpp +++ b/src/conv/raw/vss2raw.cpp @@ -28,6 +28,8 @@ * instead of those above. */ +#include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/conv
src/conv/text/Makefile.am |3 ++ src/conv/text/vsd2text.cpp | 67 + src/conv/text/vss2text.cpp | 67 + 3 files changed, 7 insertions(+), 130 deletions(-) New commits: commit 325248eff211f52fbd8fd41835b942194b94a7a4 Author: Fridrich Å trba Date: Tue Nov 5 14:45:02 2013 +0100 Use RVNGTextDrawingGenerator Change-Id: Ie775928694fd562d380e6f9600d31e5911d48b8c diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am index 7b08e81..6be006f 100644 --- a/src/conv/text/Makefile.am +++ b/src/conv/text/Makefile.am @@ -6,6 +6,7 @@ AM_CXXFLAGS = \ -I$(top_srcdir)/inc \ $(LIBVISIO_CXXFLAGS) \ $(REVENGE_STREAM_CFLAGS) \ + $(REVENGE_GENERATORS_CFLAGS) \ $(DEBUG_CXXFLAGS) vsd2text_DEPENDENCIES = @VSD2TEXT_WIN32_RESOURCE@ @@ -14,12 +15,14 @@ vss2text_DEPENDENCIES = @VSS2TEXT_WIN32_RESOURCE@ vsd2text_LDADD = \ ../../lib/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.la \ + $(REVENGE_GENERATORS_LIBS) \ $(LIBVISIO_LIBS) \ $(REVENGE_STREAM_LIBS) \ @VSD2TEXT_WIN32_RESOURCE@ vss2text_LDADD = \ ../../lib/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.la \ + $(REVENGE_GENERATORS_LIBS) \ $(LIBVISIO_LIBS) \ $(REVENGE_STREAM_LIBS) \ @VSS2TEXT_WIN32_RESOURCE@ diff --git a/src/conv/text/vsd2text.cpp b/src/conv/text/vsd2text.cpp index ff1652b..e843fa4 100644 --- a/src/conv/text/vsd2text.cpp +++ b/src/conv/text/vsd2text.cpp @@ -32,73 +32,10 @@ #include #include +#include #include #include -class TextPainter : public librevenge::RVNGDrawingInterface -{ -public: - TextPainter(); - - void startDocument(const librevenge::RVNGPropertyList & /*propList*/) {} - void endDocument() {} - void setDocumentMetaData(const librevenge::RVNGPropertyList & /*propList*/) {} - void startPage(const librevenge::RVNGPropertyList &) {} - void endPage() {} - void startLayer(const librevenge::RVNGPropertyList &) {} - void endLayer() {} - void startEmbeddedGraphics(const librevenge::RVNGPropertyList &) {} - void endEmbeddedGraphics() {} - - void setStyle(const librevenge::RVNGPropertyList &, const librevenge::RVNGPropertyListVector &) {} - - void drawRectangle(const librevenge::RVNGPropertyList &) {} - void drawEllipse(const librevenge::RVNGPropertyList &) {} - void drawPolyline(const librevenge::RVNGPropertyListVector &) {} - void drawPolygon(const librevenge::RVNGPropertyListVector &) {} - void drawPath(const librevenge::RVNGPropertyListVector &) {} - void drawGraphicObject(const librevenge::RVNGPropertyList &, const librevenge::RVNGBinaryData &) {} - void startTextObject(const librevenge::RVNGPropertyList &, const librevenge::RVNGPropertyListVector &) {} - void endTextObject() {} - - - void openOrderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {} - void closeOrderedListLevel() {} - - void openUnorderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {} - void closeUnorderedListLevel() {} - - void openListElement(const librevenge::RVNGPropertyList & /*propList*/, const librevenge::RVNGPropertyListVector & /* tabStops */) {} - void closeListElement() {} - - void openParagraph(const librevenge::RVNGPropertyList & /*propList*/, const librevenge::RVNGPropertyListVector & /* tabStops */) {} - void closeParagraph(); - - void openSpan(const librevenge::RVNGPropertyList & /* propList */) {} - void closeSpan() {} - - void insertTab() {} - void insertSpace() {} - void insertText(const librevenge::RVNGString &text); - void insertLineBreak() {} - void insertField(const librevenge::RVNGString & /* type */, const librevenge::RVNGPropertyList & /*propList*/) {} - -}; - -TextPainter::TextPainter(): librevenge::RVNGDrawingInterface() -{ -} - -void TextPainter::insertText(const librevenge::RVNGString &str) -{ - printf("%s", str.cstr()); -} - -void TextPainter::closeParagraph() -{ - printf("\n"); -} - namespace { @@ -139,7 +76,7 @@ int main(int argc, char *argv[]) return 1; } - TextPainter painter; + librevenge::RVNGTextDrawingGenerator painter; if (!libvisio::VisioDocument::parse(&input, &painter)) { fprintf(stderr, "ERROR: Parsing of document failed!\n"); diff --git a/src/conv/text/vss2text.cpp b/src/conv/text/vss2text.cpp index aa5b55a..217dc62 100644 --- a/src/conv/text/vss2text.cpp +++ b/src/conv/text/vss2text.cpp @@ -32,73 +32,10 @@ #include #include +#include #include #include -class TextPainter : public librevenge::RVNGDrawingInterface -{ -public: - TextPainter(); - - void startDocument(const librevenge::RVNGPropertyList & /*propList*/) {} - void endDocument() {} - void setDocumentMetaData(const librevenge::RVNGPropertyList & /*propList*/) {} - void startPage(const librevenge::RVNGPropertyList &) {} - void endPage() {} - void startLayer(const librevenge::RVNGPropertyList &) {} - void endLaye
[Libreoffice-commits] libvisio.git: src/conv
src/conv/raw/vsd2raw.cpp | 338 --- src/conv/raw/vss2raw.cpp |7 2 files changed, 2 insertions(+), 343 deletions(-) New commits: commit bdfaab8e82224873c4e18a9c3ae058d734ff1b7d Author: Fridrich Å trba Date: Tue Nov 5 13:08:08 2013 +0100 Add printing of indent levels in vs?2raw Change-Id: I034d6e604b60ddbfc21e1ddee2935d59f9bd1292 diff --git a/src/conv/raw/vsd2raw.cpp b/src/conv/raw/vsd2raw.cpp index 1226923..e20e2b7 100644 --- a/src/conv/raw/vsd2raw.cpp +++ b/src/conv/raw/vsd2raw.cpp @@ -28,347 +28,11 @@ * instead of those above. */ -#include -#include -#include -#include - #include #include #include #include - -#if 0 - -enum PainterCallback -{ - PC_START_GRAPHICS = 0, - PC_START_LAYER, - PC_START_EMBEDDED_GRAPHICS, - PC_START_TEXT_OBJECT, - PC_START_TEXT_LINE, - PC_START_TEXT_SPAN -}; - -#ifdef _U -#undef _U -#endif - -#define _U(M, L) \ - if (!m_printCallgraphScore) \ - __iuprintf M; \ - else \ - m_callStack.push(L); - -#ifdef _D -#undef _D -#endif - -#define _D(M, L) \ - if (!m_printCallgraphScore) \ - __idprintf M; \ - else \ - { \ - PainterCallback lc = m_callStack.top(); \ - if (lc != L) \ - m_callbackMisses++; \ - m_callStack.pop(); \ - } - -class RawPainter : public librevenge::RVNGDrawingInterface -{ -public: - RawPainter(bool printCallgraphScore); - - ~RawPainter(); - - void startDocument(const librevenge::RVNGPropertyList & /*propList*/) {} - void endDocument() {} - void setDocumentMetaData(const librevenge::RVNGPropertyList & /*propList*/) {} - void startPage(const librevenge::RVNGPropertyList &propList); - void endPage(); - void startLayer(const librevenge::RVNGPropertyList &propList); - void endLayer(); - void startEmbeddedGraphics(const librevenge::RVNGPropertyList &propList); - void endEmbeddedGraphics(); - - void setStyle(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &gradient); - - void drawRectangle(const librevenge::RVNGPropertyList &propList); - void drawEllipse(const librevenge::RVNGPropertyList &propList); - void drawPolyline(const librevenge::RVNGPropertyListVector &vertices); - void drawPolygon(const librevenge::RVNGPropertyListVector &vertices); - void drawPath(const librevenge::RVNGPropertyListVector &path); - void drawGraphicObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGBinaryData &binaryData); - void startTextObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &path); - void endTextObject(); - - - void openOrderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {} - void closeOrderedListLevel() {} - - void openUnorderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {} - void closeUnorderedListLevel() {} - - void openListElement(const librevenge::RVNGPropertyList & /*propList*/, const librevenge::RVNGPropertyListVector & /* tabStops */) {} - void closeListElement() {} - - void openParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &tabStops); - void closeParagraph(); - - void openSpan(const librevenge::RVNGPropertyList &propList); - void closeSpan(); - - void insertTab() {} - void insertSpace() {} - void insertText(const librevenge::RVNGString &text); - void insertLineBreak() {} - void insertField(const librevenge::RVNGString & /* type */, const librevenge::RVNGPropertyList & /*propList*/) {} - - -private: - int m_indent; - int m_callbackMisses; - bool m_printCallgraphScore; - std::stack m_callStack; - - void __indentUp() - { -m_indent++; - } - void __indentDown() - { -if (m_indent > 0) m_indent--; - } - - void __iprintf(const char *format, ...); - void __iuprintf(const char *format, ...); - void __idprintf(const char *format, ...); -}; - -librevenge::RVNGString getPropString(const librevenge::RVNGPropertyList &propList) -{ - librevenge::RVNGString propString; - librevenge::RVNGPropertyList::Iter i(propList); - if (!i.last()) - { -propString.append(i.key()); -propString.append(": "); -propString.append(i()->getStr().cstr()); -for (; i.next(); ) -{ - propString.append(", "); - propString.append(i.key()); - propString.append(": "); - propString.append(i()->getStr().cstr()); -} - } - - return propString; -} - -librevenge::RVNGString getPropString(const librevenge::RVNGPropertyListVector &itemList) -{ - librevenge::RVNGString propString; - - propString.append("("); - librevenge::RVNGPropertyListVector::Iter i(itemList); - - if (!i.last()) - { -propString.append("("); -propString.append(getPropString(i())); -propString.append(")"); - -for (; i.next();) -{ - propString.append(", ("); - propString.append(get