Changeset 126727


Ignore:
Timestamp:
Oct 14, 2014, 5:02:55 PM (6 years ago)
Author:
devans@…
Message:

devans/dports: inkscape-devel, update to trunk bzr 13613, fixes startup crash when building +gtk3 with gtk3 version 3.14.

Location:
users/devans/dports/graphics/inkscape-devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • users/devans/dports/graphics/inkscape-devel/Portfile

    r126093 r126727  
    66name            inkscape-devel
    77conflicts       inkscape inkscape-experimental inkscape-prerelease
    8 set bzr_rev     13577
     8set bzr_rev     13613
    99version         0.48.99.${bzr_rev}
    1010epoch           1
     
    2626master_sites    file:///Users/devans/macports/distfiles/${name}
    2727
    28 checksums       rmd160  707ecaf4b2ab376c30ff91495c9af7dc03b37f4a \
    29                 sha256  4e0f547a247215d9b4767b0f32b1854832108d1b1eb4d6dfb941c720f21010ae
     28checksums       rmd160  a890ba2fda2062f1147e0c15e9d3c07ccb78ef5a \
     29                sha256  de4ebf97db985f60977c56aa218f2275e030ebd09611b50d92d1ba4ad78b95da
    3030
    3131worksrcdir      inkscape
  • users/devans/dports/graphics/inkscape-devel/files/patch-librevenge.diff

    r122133 r126727  
    1 === modified file 'configure.ac'
    2 --- configure.ac        2014-06-03 15:38:31 +0000
    3 +++ configure.ac        2014-06-15 09:24:33 +0000
    4 @@ -531,28 +531,14 @@
     1=== modified file 'src/extension/internal/cdr-input.cpp'
     2--- src/extension/internal/cdr-input.cpp        2013-10-27 16:33:32 +0000
     3+++ src/extension/internal/cdr-input.cpp        2014-06-15 09:24:33 +0000
     4@@ -24,7 +24,7 @@
     5 #include <cstring>
     6 
     7 #include <libcdr/libcdr.h>
     8-#include <libwpd-stream/libwpd-stream.h>
     9+#include <librevenge-stream/librevenge-stream.h>
     10 
     11 #include <gtkmm/alignment.h>
     12 #include <gtkmm/comboboxtext.h>
     13@@ -60,7 +60,7 @@
     14 
     15 class CdrImportDialog : public Gtk::Dialog {
     16 public:
     17-     CdrImportDialog(const std::vector<WPXString> &vec);
     18+     CdrImportDialog(const std::vector<librevenge::RVNGString> &vec);
     19      virtual ~CdrImportDialog();
     20 
     21      bool showDialog();
     22@@ -86,12 +86,12 @@
     23      class Gtk::VBox * vbox2;
     24      class Gtk::Widget * _previewArea;
     25 
     26-     const std::vector<WPXString> &_vec;   // Document to be imported
     27+     const std::vector<librevenge::RVNGString> &_vec;   // Document to be imported
     28      unsigned _current_page;  // Current selected page
     29      int _preview_width, _preview_height;    // Size of the preview area
     30 };
     31 
     32-CdrImportDialog::CdrImportDialog(const std::vector<WPXString> &vec)
     33+CdrImportDialog::CdrImportDialog(const std::vector<librevenge::RVNGString> &vec)
     34      : _vec(vec), _current_page(1)
     35 {
     36      int num_pages = _vec.size();
     37@@ -210,14 +210,16 @@
     38 
     39 SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
     40 {
     41-     WPXFileStream input(uri);
     42+     librevenge::RVNGFileStream input(uri);
     43 
     44      if (!libcdr::CDRDocument::isSupported(&input)) {
     45           return NULL;
     46      }
     47 
     48-     libcdr::CDRStringVector output;
     49-     if (!libcdr::CDRDocument::generateSVG(&input, output)) {
     50+     librevenge::RVNGStringVector output;
     51+     librevenge::RVNGSVGDrawingGenerator generator(output, "svg");
     52+
     53+     if (!libcdr::CDRDocument::parse(&input, &generator)) {
     54           return NULL;
     55      }
     56 
     57@@ -225,9 +227,9 @@
     58           return NULL;
     59      }
     60 
     61-     std::vector<WPXString> tmpSVGOutput;
     62+     std::vector<librevenge::RVNGString> tmpSVGOutput;
     63      for (unsigned i=0; i<output.size(); ++i) {
     64-          WPXString 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");
     65+          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");
     66           tmpString.append(output[i]);
     67           tmpSVGOutput.push_back(tmpString);
     68      }
     69
     70=== modified file 'src/extension/internal/vsd-input.cpp'
     71--- src/extension/internal/vsd-input.cpp        2013-10-24 15:03:01 +0000
     72+++ src/extension/internal/vsd-input.cpp        2014-06-15 09:24:33 +0000
     73@@ -24,7 +24,7 @@
     74 #include <cstring>
     75 
     76 #include <libvisio/libvisio.h>
     77-#include <libwpd-stream/libwpd-stream.h>
     78+#include <librevenge-stream/librevenge-stream.h>
     79 
     80 #include <gtkmm/alignment.h>
     81 #include <gtkmm/comboboxtext.h>
     82@@ -59,7 +59,7 @@
     83 
     84 class VsdImportDialog : public Gtk::Dialog {
     85 public:
     86-     VsdImportDialog(const std::vector<WPXString> &vec);
     87+     VsdImportDialog(const std::vector<librevenge::RVNGString> &vec);
     88      virtual ~VsdImportDialog();
     89 
     90      bool showDialog();
     91@@ -85,12 +85,12 @@
     92      class Gtk::VBox * vbox2;
     93      class Gtk::Widget * _previewArea;
     94 
     95-     const std::vector<WPXString> &_vec;   // Document to be imported
     96+     const std::vector<librevenge::RVNGString> &_vec;   // Document to be imported
     97      unsigned _current_page;  // Current selected page
     98      int _preview_width, _preview_height;    // Size of the preview area
     99 };
     100 
     101-VsdImportDialog::VsdImportDialog(const std::vector<WPXString> &vec)
     102+VsdImportDialog::VsdImportDialog(const std::vector<librevenge::RVNGString> &vec)
     103      : _vec(vec), _current_page(1)
     104 {
     105      int num_pages = _vec.size();
     106@@ -209,14 +209,16 @@
     107 
     108 SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
     109 {
     110-     WPXFileStream input(uri);
     111+     librevenge::RVNGFileStream input(uri);
     112 
     113      if (!libvisio::VisioDocument::isSupported(&input)) {
     114           return NULL;
     115      }
     116 
     117-     libvisio::VSDStringVector output;
     118-     if (!libvisio::VisioDocument::generateSVG(&input, output)) {
     119+     librevenge::RVNGStringVector output;
     120+     librevenge::RVNGSVGDrawingGenerator generator(output, "svg");
     121+
     122+     if (!libvisio::VisioDocument::parse(&input, &generator)) {
     123           return NULL;
     124      }
     125 
     126@@ -224,9 +226,9 @@
     127           return NULL;
     128      }
     129 
     130-     std::vector<WPXString> tmpSVGOutput;
     131+     std::vector<librevenge::RVNGString> tmpSVGOutput;
     132      for (unsigned i=0; i<output.size(); ++i) {
     133-          WPXString 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");
     134+          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");
     135           tmpString.append(output[i]);
     136           tmpSVGOutput.push_back(tmpString);
     137      }
     138
     139=== modified file 'src/extension/internal/wpg-input.cpp'
     140--- src/extension/internal/wpg-input.cpp        2014-03-27 01:33:44 +0000
     141+++ src/extension/internal/wpg-input.cpp        2014-06-15 09:24:33 +0000
     142@@ -52,17 +52,8 @@
     143 #include "util/units.h"
     144 #include <cstring>
     145 
     146-// Take a guess and fallback to 0.1.x if no configure has run
     147-#if !defined(WITH_LIBWPG01) && !defined(WITH_LIBWPG02)
     148-#define WITH_LIBWPG01 1
     149-#endif
     150-
     151 #include "libwpg/libwpg.h"
     152-#if WITH_LIBWPG01
     153-#include "libwpg/WPGStreamImplementation.h"
     154-#elif WITH_LIBWPG02
     155-#include "libwpd-stream/libwpd-stream.h"
     156-#endif
     157+#include "librevenge-stream/librevenge-stream.h"
     158 
     159 using namespace libwpg;
     160 
     161@@ -73,17 +64,9 @@
     162 
     163 SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
     164 {
     165-#if WITH_LIBWPG01
     166-    WPXInputStream* input = new libwpg::WPGFileStream(uri);
     167-#elif WITH_LIBWPG02
     168-    WPXInputStream* input = new WPXFileStream(uri);
     169-#endif
     170-    if (input->isOLEStream()) {
     171-#if WITH_LIBWPG01
     172-        WPXInputStream* olestream = input->getDocumentOLEStream();
     173-#elif WITH_LIBWPG02
     174-        WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN");
     175-#endif
     176+    librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(uri);
     177+    if (input->isStructured()) {
     178+        librevenge::RVNGInputStream* olestream = input->getSubStreamByName("PerfectOffice_MAIN");
     179         if (olestream) {
     180             delete input;
     181             input = olestream;
     182@@ -98,15 +81,17 @@
     183         return NULL;
     184     }
     185 
     186-#if WITH_LIBWPG01
     187-    libwpg::WPGString output;
     188-#elif WITH_LIBWPG02
     189-    WPXString output;
     190-#endif
     191-    if (!libwpg::WPGraphics::generateSVG(input, output)) {
     192+       librevenge::RVNGStringVector vec;
     193+       librevenge::RVNGSVGDrawingGenerator generator(vec, "");
     194+
     195+       if (!libwpg::WPGraphics::parse(input, &generator) || vec.empty() || vec[0].empty())
     196+       {
     197         delete input;
     198         return NULL;
     199-    }
     200+       }
     201+
     202+    librevenge::RVNGString output("<?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");
     203+       output.append(vec[0]);
     204 
     205     //printf("I've got a doc: \n%s", painter.document.c_str());
     206 
     207
     208=== modified file 'src/ui/dialog/symbols.cpp'
     209--- src/ui/dialog/symbols.cpp   2014-06-13 16:06:01 +0000
     210+++ src/ui/dialog/symbols.cpp   2014-06-15 09:24:33 +0000
     211@@ -63,7 +63,7 @@
     212 
     213 #ifdef WITH_LIBVISIO
     214 #include <libvisio/libvisio.h>
     215-#include <libwpd-stream/libwpd-stream.h>
     216+#include <librevenge-stream/librevenge-stream.h>
     217 #endif
     218 
     219 #include "verbs.h"
     220@@ -495,14 +495,16 @@
     221 // Read Visio stencil files
     222 SPDocument* read_vss( gchar* fullname, gchar* filename ) {
     223 
     224-  WPXFileStream input(fullname);
     225+  librevenge::RVNGFileStream input(fullname);
     226 
     227   if (!libvisio::VisioDocument::isSupported(&input)) {
     228     return NULL;
     229   }
     230 
     231-  libvisio::VSDStringVector output;
     232-  if (!libvisio::VisioDocument::generateSVGStencils(&input, output)) {
     233+  librevenge::RVNGStringVector output;
     234+  librevenge::RVNGSVGDrawingGenerator generator(output, "svg");
     235+
     236+  if (!libvisio::VisioDocument::parseStencils(&input, &generator)) {
     237     return NULL;
     238   }
     239 
     240
     241--- configure.ac.orig   2014-09-10 14:08:05.000000000 -0700
     242+++ configure.ac        2014-10-07 12:51:40.000000000 -0700
     243@@ -532,28 +532,14 @@
    5244 with_libwpg=no
    6245 
     
    34273 
    35274 dnl ********************************
    36 @@ -566,7 +552,7 @@
     275@@ -567,7 +553,7 @@
    37276 with_libvisio=no
    38277 
     
    43282        if test "x$with_libvisio" = "xyes"; then
    44283                AC_DEFINE(WITH_LIBVISIO,1,[Build in libvisio])
    45 @@ -587,7 +573,7 @@
     284@@ -588,7 +574,7 @@
    46285 with_libcdr=no
    47286 
     
    52291        if test "x$with_libcdr" = "xyes"; then
    53292                AC_DEFINE(WITH_LIBCDR,1,[Build in libcdr])
    54 
    55 === modified file 'src/extension/internal/cdr-input.cpp'
    56 --- src/extension/internal/cdr-input.cpp        2013-10-27 16:33:32 +0000
    57 +++ src/extension/internal/cdr-input.cpp        2014-06-15 09:24:33 +0000
    58 @@ -24,7 +24,7 @@
    59  #include <cstring>
    60  
    61  #include <libcdr/libcdr.h>
    62 -#include <libwpd-stream/libwpd-stream.h>
    63 +#include <librevenge-stream/librevenge-stream.h>
    64  
    65  #include <gtkmm/alignment.h>
    66  #include <gtkmm/comboboxtext.h>
    67 @@ -60,7 +60,7 @@
    68  
    69  class CdrImportDialog : public Gtk::Dialog {
    70  public:
    71 -     CdrImportDialog(const std::vector<WPXString> &vec);
    72 +     CdrImportDialog(const std::vector<librevenge::RVNGString> &vec);
    73       virtual ~CdrImportDialog();
    74  
    75       bool showDialog();
    76 @@ -86,12 +86,12 @@
    77       class Gtk::VBox * vbox2;
    78       class Gtk::Widget * _previewArea;
    79  
    80 -     const std::vector<WPXString> &_vec;   // Document to be imported
    81 +     const std::vector<librevenge::RVNGString> &_vec;   // Document to be imported
    82       unsigned _current_page;  // Current selected page
    83       int _preview_width, _preview_height;    // Size of the preview area
    84  };
    85  
    86 -CdrImportDialog::CdrImportDialog(const std::vector<WPXString> &vec)
    87 +CdrImportDialog::CdrImportDialog(const std::vector<librevenge::RVNGString> &vec)
    88       : _vec(vec), _current_page(1)
    89  {
    90       int num_pages = _vec.size();
    91 @@ -210,14 +210,16 @@
    92  
    93  SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
    94  {
    95 -     WPXFileStream input(uri);
    96 +     librevenge::RVNGFileStream input(uri);
    97  
    98       if (!libcdr::CDRDocument::isSupported(&input)) {
    99            return NULL;
    100       }
    101  
    102 -     libcdr::CDRStringVector output;
    103 -     if (!libcdr::CDRDocument::generateSVG(&input, output)) {
    104 +     librevenge::RVNGStringVector output;
    105 +     librevenge::RVNGSVGDrawingGenerator generator(output, "svg");
    106 +
    107 +     if (!libcdr::CDRDocument::parse(&input, &generator)) {
    108            return NULL;
    109       }
    110  
    111 @@ -225,9 +227,9 @@
    112            return NULL;
    113       }
    114  
    115 -     std::vector<WPXString> tmpSVGOutput;
    116 +     std::vector<librevenge::RVNGString> tmpSVGOutput;
    117       for (unsigned i=0; i<output.size(); ++i) {
    118 -          WPXString 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");
    119 +          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");
    120            tmpString.append(output[i]);
    121            tmpSVGOutput.push_back(tmpString);
    122       }
    123 
    124 === modified file 'src/extension/internal/vsd-input.cpp'
    125 --- src/extension/internal/vsd-input.cpp        2013-10-24 15:03:01 +0000
    126 +++ src/extension/internal/vsd-input.cpp        2014-06-15 09:24:33 +0000
    127 @@ -24,7 +24,7 @@
    128  #include <cstring>
    129  
    130  #include <libvisio/libvisio.h>
    131 -#include <libwpd-stream/libwpd-stream.h>
    132 +#include <librevenge-stream/librevenge-stream.h>
    133  
    134  #include <gtkmm/alignment.h>
    135  #include <gtkmm/comboboxtext.h>
    136 @@ -59,7 +59,7 @@
    137  
    138  class VsdImportDialog : public Gtk::Dialog {
    139  public:
    140 -     VsdImportDialog(const std::vector<WPXString> &vec);
    141 +     VsdImportDialog(const std::vector<librevenge::RVNGString> &vec);
    142       virtual ~VsdImportDialog();
    143  
    144       bool showDialog();
    145 @@ -85,12 +85,12 @@
    146       class Gtk::VBox * vbox2;
    147       class Gtk::Widget * _previewArea;
    148  
    149 -     const std::vector<WPXString> &_vec;   // Document to be imported
    150 +     const std::vector<librevenge::RVNGString> &_vec;   // Document to be imported
    151       unsigned _current_page;  // Current selected page
    152       int _preview_width, _preview_height;    // Size of the preview area
    153  };
    154  
    155 -VsdImportDialog::VsdImportDialog(const std::vector<WPXString> &vec)
    156 +VsdImportDialog::VsdImportDialog(const std::vector<librevenge::RVNGString> &vec)
    157       : _vec(vec), _current_page(1)
    158  {
    159       int num_pages = _vec.size();
    160 @@ -209,14 +209,16 @@
    161  
    162  SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
    163  {
    164 -     WPXFileStream input(uri);
    165 +     librevenge::RVNGFileStream input(uri);
    166  
    167       if (!libvisio::VisioDocument::isSupported(&input)) {
    168            return NULL;
    169       }
    170  
    171 -     libvisio::VSDStringVector output;
    172 -     if (!libvisio::VisioDocument::generateSVG(&input, output)) {
    173 +     librevenge::RVNGStringVector output;
    174 +     librevenge::RVNGSVGDrawingGenerator generator(output, "svg");
    175 +
    176 +     if (!libvisio::VisioDocument::parse(&input, &generator)) {
    177            return NULL;
    178       }
    179  
    180 @@ -224,9 +226,9 @@
    181            return NULL;
    182       }
    183  
    184 -     std::vector<WPXString> tmpSVGOutput;
    185 +     std::vector<librevenge::RVNGString> tmpSVGOutput;
    186       for (unsigned i=0; i<output.size(); ++i) {
    187 -          WPXString 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");
    188 +          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");
    189            tmpString.append(output[i]);
    190            tmpSVGOutput.push_back(tmpString);
    191       }
    192 
    193 === modified file 'src/extension/internal/wpg-input.cpp'
    194 --- src/extension/internal/wpg-input.cpp        2014-03-27 01:33:44 +0000
    195 +++ src/extension/internal/wpg-input.cpp        2014-06-15 09:24:33 +0000
    196 @@ -52,17 +52,8 @@
    197  #include "util/units.h"
    198  #include <cstring>
    199  
    200 -// Take a guess and fallback to 0.1.x if no configure has run
    201 -#if !defined(WITH_LIBWPG01) && !defined(WITH_LIBWPG02)
    202 -#define WITH_LIBWPG01 1
    203 -#endif
    204 -
    205  #include "libwpg/libwpg.h"
    206 -#if WITH_LIBWPG01
    207 -#include "libwpg/WPGStreamImplementation.h"
    208 -#elif WITH_LIBWPG02
    209 -#include "libwpd-stream/libwpd-stream.h"
    210 -#endif
    211 +#include "librevenge-stream/librevenge-stream.h"
    212  
    213  using namespace libwpg;
    214  
    215 @@ -73,17 +64,9 @@
    216  
    217  SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
    218  {
    219 -#if WITH_LIBWPG01
    220 -    WPXInputStream* input = new libwpg::WPGFileStream(uri);
    221 -#elif WITH_LIBWPG02
    222 -    WPXInputStream* input = new WPXFileStream(uri);
    223 -#endif
    224 -    if (input->isOLEStream()) {
    225 -#if WITH_LIBWPG01
    226 -        WPXInputStream* olestream = input->getDocumentOLEStream();
    227 -#elif WITH_LIBWPG02
    228 -        WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN");
    229 -#endif
    230 +    librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(uri);
    231 +    if (input->isStructured()) {
    232 +        librevenge::RVNGInputStream* olestream = input->getSubStreamByName("PerfectOffice_MAIN");
    233          if (olestream) {
    234              delete input;
    235              input = olestream;
    236 @@ -98,15 +81,17 @@
    237          return NULL;
    238      }
    239  
    240 -#if WITH_LIBWPG01
    241 -    libwpg::WPGString output;
    242 -#elif WITH_LIBWPG02
    243 -    WPXString output;
    244 -#endif
    245 -    if (!libwpg::WPGraphics::generateSVG(input, output)) {
    246 +       librevenge::RVNGStringVector vec;
    247 +       librevenge::RVNGSVGDrawingGenerator generator(vec, "");
    248 +
    249 +       if (!libwpg::WPGraphics::parse(input, &generator) || vec.empty() || vec[0].empty())
    250 +       {
    251          delete input;
    252          return NULL;
    253 -    }
    254 +       }
    255 +
    256 +    librevenge::RVNGString output("<?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");
    257 +       output.append(vec[0]);
    258  
    259      //printf("I've got a doc: \n%s", painter.document.c_str());
    260  
    261 
    262 === modified file 'src/ui/dialog/symbols.cpp'
    263 --- src/ui/dialog/symbols.cpp   2014-06-13 16:06:01 +0000
    264 +++ src/ui/dialog/symbols.cpp   2014-06-15 09:24:33 +0000
    265 @@ -63,7 +63,7 @@
    266  
    267  #ifdef WITH_LIBVISIO
    268  #include <libvisio/libvisio.h>
    269 -#include <libwpd-stream/libwpd-stream.h>
    270 +#include <librevenge-stream/librevenge-stream.h>
    271  #endif
    272  
    273  #include "verbs.h"
    274 @@ -495,14 +495,16 @@
    275  // Read Visio stencil files
    276  SPDocument* read_vss( gchar* fullname, gchar* filename ) {
    277  
    278 -  WPXFileStream input(fullname);
    279 +  librevenge::RVNGFileStream input(fullname);
    280  
    281    if (!libvisio::VisioDocument::isSupported(&input)) {
    282      return NULL;
    283    }
    284  
    285 -  libvisio::VSDStringVector output;
    286 -  if (!libvisio::VisioDocument::generateSVGStencils(&input, output)) {
    287 +  librevenge::RVNGStringVector output;
    288 +  librevenge::RVNGSVGDrawingGenerator generator(output, "svg");
    289 +
    290 +  if (!libvisio::VisioDocument::parseStencils(&input, &generator)) {
    291      return NULL;
    292    }
    293  
    294 
Note: See TracChangeset for help on using the changeset viewer.