chrisg      02/02/28 04:20:02

  Modified:    src/org/apache/fop/fo Tag: fop-0_20_2-maintain
                        FObjMixed.java
  Log:
  quick fix for Markers (thanks to Keiron)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.3  +6 -4      xml-fop/src/org/apache/fop/fo/FObjMixed.java
  
  Index: FObjMixed.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObjMixed.java,v
  retrieving revision 1.12.2.2
  retrieving revision 1.12.2.3
  diff -u -r1.12.2.2 -r1.12.2.3
  --- FObjMixed.java    9 Jan 2002 11:32:57 -0000       1.12.2.2
  +++ FObjMixed.java    28 Feb 2002 12:20:02 -0000      1.12.2.3
  @@ -1,5 +1,5 @@
   /*
  - * $Id: FObjMixed.java,v 1.12.2.2 2002/01/09 11:32:57 keiron Exp $
  + * $Id: FObjMixed.java,v 1.12.2.3 2002/02/28 12:20:02 chrisg Exp $
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
  @@ -44,9 +44,11 @@
           // addChild(new FOText(data, start, length, this));
           FOText ft = new FOText(data, start, length, this);
           ft.setLogger(log);
  -        ft.setUnderlined(ts.getUnderlined());
  -        ft.setOverlined(ts.getOverlined());
  -        ft.setLineThrough(ts.getLineThrough());
  +        if (ts != null) {
  +            ft.setUnderlined(ts.getUnderlined());
  +            ft.setOverlined(ts.getOverlined());
  +            ft.setLineThrough(ts.getLineThrough());
  +        }
           addChild(ft);
   
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to