From cdca675509b0a24f77f04020f32237a5592aa5bf Mon Sep 17 00:00:00 2001
From: henrikjust <henrikjust@f0f2a975-2e09-46c8-9428-3b39399b9f3c>
Date: Tue, 18 Nov 2014 14:13:53 +0000
Subject: [PATCH] Fix for SVG images in LO 4.0/AOO 4.1

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@220 f0f2a975-2e09-46c8-9428-3b39399b9f3c
---
 .../java/writer2latex/api/ConverterFactory.java   |  2 +-
 source/java/writer2latex/base/ImageConverter.java | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index e53c7af..fce4548 100644
--- a/source/java/writer2latex/api/ConverterFactory.java
+++ b/source/java/writer2latex/api/ConverterFactory.java
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.5.2";
-    private static final String DATE = "2014-11-09";
+    private static final String DATE = "2014-11-18";
 	
     /** Return the Writer2LaTeX version in the form
      *  (major version).(minor version).(patch level)<br/>
diff --git a/source/java/writer2latex/base/ImageConverter.java b/source/java/writer2latex/base/ImageConverter.java
index e5309e2..183c0c0 100644
--- a/source/java/writer2latex/base/ImageConverter.java
+++ b/source/java/writer2latex/base/ImageConverter.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.6 (2014-10-27)
+ *  Version 1.6 (2014-11-18)
  *
  */
 
@@ -170,16 +170,21 @@ public final class ImageConverter {
     public BinaryGraphicsDocument getImage(Element node) {
         String sName = sSubDirName+sBaseFileName+formatter.format(++nImageCount);
         BinaryGraphicsDocument bgd = getImage(node,sName);
-        if (bgd!=null) { 
-        	if (!bgd.isAcceptedFormat()) { // We may have better luck with an alternative image
+        if (bgd!=null) {
+        	if (!bgd.isAcceptedFormat() || (sDefaultVectorFormat!=null && !sDefaultVectorFormat.equals(bgd.getMIMEType()))) {
+        		// We may have better luck with an alternative image
 	        	Element sibling = getAlternativeImage(node);
 	        	if (sibling!=null) {
 	        		BinaryGraphicsDocument altBgd = getImage(sibling,sName);
 	        		if (altBgd!=null && altBgd.isAcceptedFormat()) {
-	        			bgd = altBgd;
+	        			if (!bgd.isAcceptedFormat() ||
+	        				(sDefaultVectorFormat!=null && !sDefaultVectorFormat.equals(bgd.getMIMEType()) &&
+	        								sDefaultVectorFormat.equals(altBgd.getMIMEType()))) {
+		        			bgd = altBgd;
+	        			}
 	        		}
 	        	}
-        	}
+        	}        	
         }
     	if (bgd==null || bgd.isLinked() || bgd.isRecycled()) {
     		 // The file name was not used