INTEGRATION: CWS xsltfilter07 (1.3.20); FILE MERGED

2006/11/09 15:02:51 sus 1.3.20.1: #i71256# Commiting the Patches provided by Hendrik Just the author of this filter

1 files changed, 7 insertions, 3 deletions

diff --git a/xmerge/source/writer2latex/source/writer2latex/latex/content/DrawConverter.java b/xmerge/source/writer2latex/source/writer2latex/latex/content/DrawConverter.java
index c5f2dd99b857..6d78ca42b179 100644
--- a/xmerge/source/writer2latex/source/writer2latex/latex/content/DrawConverter.java
+++ b/xmerge/source/writer2latex/source/writer2latex/latex/content/DrawConverter.java
@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2004 by Henrik Just
+ *  Copyright: 2002-2006 by Henrik Just
  *
  *  All Rights Reserved.
  *
- *  Version 0.3.3i (2004-12-14)
+ *  Version 0.4b (2006-11-03)
  *
  */
 
@@ -158,7 +158,11 @@ public class DrawConverter extends ConverterHelper {
         String sFileName = null;
         boolean bCommentOut = true;
         String sHref = node.getAttribute(XMLString.XLINK_HREF);
-        if (sHref!=null && sHref.length()>0 && !sHref.startsWith("#")) {
+        if (sHref!=null && sHref.length()>0) {
+            // Workaround for bug in OOo's flat sxw export: The xlink:href starts
+            // with a # if the image is in the same directory or a subdirectory.
+            // We simply ignore that, which is o.k. because we only handle flat xml.
+            if (sHref.startsWith("#")) { sHref=sHref.substring(1); }
             // Linked image is not yet handled by ImageLoader. This is a temp.
             // solution (will go away when ImageLoader is finished)
             sFileName = sHref;