Hi folks,

attached a patch to solve bug 2223 (AbiWord segfaults on some Psion documents).

It should go into the stable tree, but I don't know the rules for checking
it in there.

By the way, what happened to the Psion importer/exporter in the current 
development tree? It seems to have disappeared...

Thanks,
  Frodo

-- 
Frodo Looijaard <[EMAIL PROTECTED]>  PGP key and more: http://huizen.dds.nl/~frodol
Defenestration n. (formal or joc.):
  The act of removing Windows from your computer in disgust, usually followed
  by the installation of Linux or some other Unix-like operating system.
--- /tmp/abiword-1.0.1/abi/src/wp/impexp/xp/ie_imp_Psion.cpp    Mon Feb 25 17:11:55 
2002
+++ abiword-1.0.1/abi/src/wp/impexp/xp/ie_imp_Psion.cpp Thu May 16 22:02:02 2002
@@ -580,10 +580,4 @@
        const XML_Char* propsArray[11];
 
-       // HACK: there is no real setting to do this.
-       if (layout->on_next_page) {
-               UT_UCSChar ucs = UCS_FF;
-               if (!(getDoc()->appendSpan(&ucs,1)))
-                       return false;
-       }
        // Get all attributes into prop
        if (!(getParagraphAttributes(layout,&props)))
@@ -636,4 +630,11 @@
                return false;
        
+       // HACK: there is no real setting to do this.
+       if (layout->on_next_page) {
+               UT_UCSChar ucs = UCS_FF;
+               if (!(getDoc()->appendSpan(&ucs,1)))
+                       return false;
+       }
+
        // We need to append a field and some other stuff...
        if (layout->bullet->on) {

Reply via email to