ICU-511.35.tar.gz

[apple/icu.git] / icuSources / samples / layout / paragraph.cpp

diff --git a/icuSources/samples/layout/paragraph.cpp b/icuSources/samples/layout/paragraph.cpp
index 315ca04a4b7eed44c515f5cfaadafcf332b9513d..65d3e3684239eb5932475c0b1878778897cf4de6 100644 (file)
--- a/icuSources/samples/layout/paragraph.cpp
+++ b/icuSources/samples/layout/paragraph.cpp
@@ -1,7 +1,7 @@
 /*
  *******************************************************************************
  *
 /*
  *******************************************************************************
  *

- *   Copyright (C) 1999-2005, International Business Machines
+ *   Copyright (C) 1999-2007, International Business Machines

  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************


@@ -19,11 +19,9 @@
 #include "layout/ParagraphLayout.h"
 
 #include "RenderingSurface.h"
 #include "layout/ParagraphLayout.h"
 
 #include "RenderingSurface.h"

-#include "ScriptCompositeFontInstance.h"

 
 #include "paragraph.h"
 #include "UnicodeReader.h"
 
 #include "paragraph.h"
 #include "UnicodeReader.h"

-#include "FontMap.h"

 
 #define MARGIN 10
 #define LINE_GROW 32
 
 #define MARGIN 10
 #define LINE_GROW 32


@@ -80,7 +78,7 @@ Paragraph::Paragraph(const LEUnicode chars[], int32_t charCount, const FontRuns
     fLineCount(0), fLinesMax(LINE_GROW), fLinesGrow(LINE_GROW), fLines(NULL), fChars(NULL),
     fLineHeight(-1), fAscent(-1), fWidth(-1), fHeight(-1), fParagraphLevel(UBIDI_DEFAULT_LTR)
 {
     fLineCount(0), fLinesMax(LINE_GROW), fLinesGrow(LINE_GROW), fLines(NULL), fChars(NULL),
     fLineHeight(-1), fAscent(-1), fWidth(-1), fHeight(-1), fParagraphLevel(UBIDI_DEFAULT_LTR)
 {

-    static const LEUnicode separators[] = {CH_LF, CH_CR, CH_LSEP, CH_PSEP};
+    static const LEUnicode separators[] = {CH_LF, CH_CR, CH_LSEP, CH_PSEP, 0x0000};

 
        if (LE_FAILURE(status)) {
                return;
 
        if (LE_FAILURE(status)) {
                return;