librevenge: update to latest patch from bug #1323592 (support old and new versions of libwpg, libcdr and libvisio

)

(bzr r13398.1.7)

1 files changed, 26 insertions, 8 deletions

diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp
index c4f251361..748bf4477 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -24,7 +24,21 @@
 #include <cstring>
 
 #include <libcdr/libcdr.h>
-#include <librevenge-stream/librevenge-stream.h>
+
+// TODO: Drop this check when librevenge is widespread.
+#if WITH_LIBCDR01
+  #include <librevenge-stream/librevenge-stream.h>
+
+  using librevenge::RVNGString;
+  using librevenge::RVNGFileStream;
+  using librevenge::RVNGStringVector;
+#else
+  #include <libwpd-stream/libwpd-stream.h>
+
+  typedef WPXString               RVNGString;
+  typedef WPXFileStream           RVNGFileStream;
+  typedef libcdr::CDRStringVector RVNGStringVector;
+#endif
 
 #include <gtkmm/alignment.h>
 #include <gtkmm/comboboxtext.h>
@@ -60,7 +74,7 @@ namespace Internal {
 
 class CdrImportDialog : public Gtk::Dialog {
 public:
-     CdrImportDialog(const std::vector<librevenge::RVNGString> &vec);
+     CdrImportDialog(const std::vector<RVNGString> &vec);
      virtual ~CdrImportDialog();
 
      bool showDialog();
@@ -86,12 +100,12 @@ private:
      class Gtk::VBox * vbox2;
      class Gtk::Widget * _previewArea;
 
-     const std::vector<librevenge::RVNGString> &_vec;   // Document to be imported
+     const std::vector<RVNGString> &_vec;   // Document to be imported
      unsigned _current_page;  // Current selected page
      int _preview_width, _preview_height;    // Size of the preview area
 };
 
-CdrImportDialog::CdrImportDialog(const std::vector<librevenge::RVNGString> &vec)
+CdrImportDialog::CdrImportDialog(const std::vector<RVNGString> &vec)
      : _vec(vec), _current_page(1)
 {
      int num_pages = _vec.size();
@@ -210,16 +224,20 @@ void CdrImportDialog::_setPreviewPage(unsigned page)
 
 SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
 {
-     librevenge::RVNGFileStream input(uri);
+     RVNGFileStream input(uri);
 
      if (!libcdr::CDRDocument::isSupported(&input)) {
           return NULL;
      }
 
-     librevenge::RVNGStringVector output;
+     RVNGStringVector output;
+#if WITH_LIBCDR01
      librevenge::RVNGSVGDrawingGenerator generator(output, "svg");
 
      if (!libcdr::CDRDocument::parse(&input, &generator)) {
+#else
+     if (!libcdr::CDRDocument::generateSVG(&input, output)) {
+#endif
           return NULL;
      }
 
@@ -227,9 +245,9 @@ SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u
           return NULL;
      }
 
-     std::vector<librevenge::RVNGString> tmpSVGOutput;
+     std::vector<RVNGString> tmpSVGOutput;
      for (unsigned i=0; i<output.size(); ++i) {
-          librevenge::RVNGString tmpString("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
+          RVNGString tmpString("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
           tmpString.append(output[i]);
           tmpSVGOutput.push_back(tmpString);
      }