diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-12-16 18:11:41 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-12-16 18:11:41 +0000 |
| commit | 7a843713846d41a75ff639e2188bb95b249b0f79 (patch) | |
| tree | 826660af796f8e64eee388c1c82543d146dac056 | |
| parent | GTK+ 3: Switch to more orientable widgets (diff) | |
| download | inkscape-7a843713846d41a75ff639e2188bb95b249b0f79.tar.gz inkscape-7a843713846d41a75ff639e2188bb95b249b0f79.zip | |
libvisio: raise required version to >=0.20 and add new file types (VDX, VSDX)
Fixed bugs:
- https://launchpad.net/bugs/1086504
(bzr r11961)
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/extension/internal/vsd-input.cpp | 43 |
2 files changed, 44 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index ed1127418..6e943b6b1 100644 --- a/configure.ac +++ b/configure.ac @@ -696,7 +696,7 @@ AC_ARG_ENABLE(wpg, with_libvisio=no if test "x$enable_visio" = "xyes"; then - PKG_CHECK_MODULES(LIBVISIO, libvisio-0.0 >= 0.0.15 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libvisio=yes, with_libvisio=no) + PKG_CHECK_MODULES(LIBVISIO, libvisio-0.0 >= 0.0.20 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libvisio=yes, with_libvisio=no) if test "x$with_libvisio" = "xyes"; then AC_DEFINE(WITH_LIBVISIO,1,[Build in libvisio]) diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index 6d71ce72a..54b570258 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -261,6 +261,7 @@ SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u void VsdInput::init(void) { + /* VSD */ Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("VSD Input") "</name>\n" @@ -272,6 +273,48 @@ void VsdInput::init(void) "<filetypetooltip>" N_("File format used by Microsoft Visio 6 and later") "</filetypetooltip>\n" "</input>\n" "</inkscape-extension>", new VsdInput()); + + /* VDX */ + Inkscape::Extension::build_from_mem( + "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" + "<name>" N_("VDX Input") "</name>\n" + "<id>org.inkscape.input.vdx</id>\n" + "<input>\n" + "<extension>.vdx</extension>\n" + "<mimetype>application/vnd.visio</mimetype>\n" + "<filetypename>" N_("Microsoft Visio XML Diagram (*.vdx)") "</filetypename>\n" + "<filetypetooltip>" N_("File format used by Microsoft Visio 2010 and later") "</filetypetooltip>\n" + "</input>\n" + "</inkscape-extension>", new VsdInput()); + + /* VSDM */ + Inkscape::Extension::build_from_mem( + "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" + "<name>" N_("VSDM Input") "</name>\n" + "<id>org.inkscape.input.vsdm</id>\n" + "<input>\n" + "<extension>.vsdm</extension>\n" + "<mimetype>application/vnd.visio</mimetype>\n" + "<filetypename>" N_("Microsoft Visio 2013 drawing (*.vsdm)") "</filetypename>\n" + "<filetypetooltip>" N_("File format used by Microsoft Visio 2013 and later") "</filetypetooltip>\n" + "</input>\n" + "</inkscape-extension>", new VsdInput()); + + /* VSDX */ + Inkscape::Extension::build_from_mem( + "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" + "<name>" N_("VSDX Input") "</name>\n" + "<id>org.inkscape.input.vsdx</id>\n" + "<input>\n" + "<extension>.vsdx</extension>\n" + "<mimetype>application/vnd.visio</mimetype>\n" + "<filetypename>" N_("Microsoft Visio 2013 drawing (*.vsdx)") "</filetypename>\n" + "<filetypetooltip>" N_("File format used by Microsoft Visio 2013 and later") "</filetypetooltip>\n" + "</input>\n" + "</inkscape-extension>", new VsdInput()); + + return; + } // init } } } /* namespace Inkscape, Extension, Implementation */ |