From 44ec4270cb5824d368bf84512e6aaeaddef415c8 Mon Sep 17 00:00:00 2001 From: henrikjust Date: Thu, 30 Jul 2015 11:32:25 +0000 Subject: [PATCH] w2l: Enable export from WMF/EMF to PDF git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@266 f0f2a975-2e09-46c8-9428-3b39399b9f3c --- source/distro/changelog.txt | 2 ++ .../da/comp/w2lcommon/filter/GraphicConverterImpl2.java | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 2f89228..617a6e3 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 ---------- version 1.6 beta ---------- +[w2l] Enabled export of WMF and EMF graphics to PDF (was disabled due to bugs in earlier versions of LO) + [w2x] In the BibTeX dialog, updating references generates a status message. This is now moved from a message box to in a label at the bottom of the dialog. diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java index a9d0670..49a8a75 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java +++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2012 by Henrik Just + * Copyright: 2002-2015 by Henrik Just * * All Rights Reserved. * - * Version 1.4 (2012-04-03) + * Version 1.6 (2015-07-30) * */ @@ -103,8 +103,8 @@ public class GraphicConverterImpl2 implements GraphicConverter { boolean bSupportsSource = MIMETypes.SVM.equals(sSourceMime) || MIMETypes.PNG.equals(sSourceMime) || MIMETypes.JPEG.equals(sSourceMime) || MIMETypes.GIF.equals(sSourceMime) || MIMETypes.TIFF.equals(sSourceMime) || - MIMETypes.BMP.equals(sSourceMime); - //|| MIMETypes.WMF.equals(sSourceMime) || MIMETypes.EMF.equals(sSourceMime); + MIMETypes.BMP.equals(sSourceMime) + || MIMETypes.WMF.equals(sSourceMime) || MIMETypes.EMF.equals(sSourceMime); boolean bSupportsTarget = MIMETypes.PDF.equals(sTargetMime) || MIMETypes.EPS.equals(sTargetMime) || MIMETypes.SVG.equals(sTargetMime); return bSupportsSource && bSupportsTarget;