INTEGRATION: CWS xsltfilter07 (1.2.20); FILE MERGED

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

2 files changed, 12 insertions, 7 deletions

diff --git a/xmerge/source/writer2latex/source/writer2latex/Application.java b/xmerge/source/writer2latex/source/writer2latex/Application.java
index 01940e976984..3924772b75d9 100644
--- a/xmerge/source/writer2latex/source/writer2latex/Application.java
+++ b/xmerge/source/writer2latex/source/writer2latex/Application.java
@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2005 by Henrik Just
+ *  Copyright: 2002-2006 by Henrik Just
  *
  *  All Rights Reserved.
  *
- *  Version 0.3.3j (2005-07-01)
+ *  Version 0.4b (2006-11-03)
  *
  */
 
@@ -55,8 +55,8 @@ import writer2latex.latex.*;
  */
 public final class Application {
     // Version number and date of Writer2LaTeX
-    private static final String VERSION = "0.4";
-    private static final String DATE = "2005-07-01";
+    private static final String VERSION = "0.4b";
+    private static final String DATE = "2006-11-03";
 
     public static String getVersion() { return VERSION; }
     public static String getDate() { return DATE; }
diff --git a/xmerge/source/writer2latex/source/writer2latex/latex/content/BlockConverter.java b/xmerge/source/writer2latex/source/writer2latex/latex/content/BlockConverter.java
index 28ff4bf96116..77dff48fab22 100644
--- a/xmerge/source/writer2latex/source/writer2latex/latex/content/BlockConverter.java
+++ b/xmerge/source/writer2latex/source/writer2latex/latex/content/BlockConverter.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.3g (2004-11-11)
+ *  Version 0.4b (2006-11-03)
  *
  */
 
@@ -446,6 +446,8 @@ public class BlockConverter extends ConverterHelper {
             BeforeAfter baHardPage = new BeforeAfter();
             BeforeAfter baHardChar = new BeforeAfter();
             Context ic = (Context) oc.clone();
+            // Footnotes with multiple paragraphs does not work in sections
+            ic.setNoFootnotes(true);
             palette.getParSc().applyHardHeadingStyle(nLevel, sStyleName,
                 baHardPage, baHardChar, ic);
 
@@ -463,6 +465,9 @@ public class BlockConverter extends ConverterHelper {
             ldp.append(baHardChar.getAfter()).append("}").nl();
             ldp.append(baHardPage.getAfter());
 
+            // Flush pending footnotes
+            palette.getNoteCv().flushFootnotes(ldp,oc);
+
             // Include any floating frames
             palette.getDrawCv().flushFloatingFrames(ldp,ic);
 
@@ -542,4 +547,4 @@ public class BlockConverter extends ConverterHelper {
         palette.getI18n().popSpecialTable();
     }
 
-}
\ No newline at end of file
+}