[webkit-changes] cvs commit: WebCore/khtml/editing htmlediting.cpp

[Adele]

adele       05/08/09 11:46:36

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/editing Tag: Safari-2-0-branch htmlediting.cpp
  Log:
          change by Justin to fix build error.
  
          * khtml/editing/htmlediting.cpp:
          (khtml::InsertTextCommand::input):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.102 +7 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.101
  retrieving revision 1.4104.2.102
  diff -u -r1.4104.2.101 -r1.4104.2.102
  --- ChangeLog	9 Aug 2005 17:52:19 -0000	1.4104.2.101
  +++ ChangeLog	9 Aug 2005 18:46:12 -0000	1.4104.2.102
  @@ -1,5 +1,12 @@
   2005-08-09  Adele Peterson  <adele at apple.com>
   
  +        change by Justin to fix build error.
  +
  +        * khtml/editing/htmlediting.cpp:
  +        (khtml::InsertTextCommand::input):
  +
  +2005-08-09  Adele Peterson  <adele at apple.com>
  +
           Merged fix from TOT to Safari-2-0-branch
   
       2005-08-08  David Hyatt  <hyatt at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.228.8.9 +1 -1      WebCore/khtml/editing/htmlediting.cpp
  
  Index: htmlediting.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/htmlediting.cpp,v
  retrieving revision 1.228.8.8
  retrieving revision 1.228.8.9
  diff -u -r1.228.8.8 -r1.228.8.9
  --- htmlediting.cpp	9 Aug 2005 17:48:54 -0000	1.228.8.8
  +++ htmlediting.cpp	9 Aug 2005 18:46:35 -0000	1.228.8.9
  @@ -4026,7 +4026,7 @@
               // When the user hits space to finish marked sequence, the string that
               // we receive ends with a normal space, not a non breaking space.  This code
               // ensures that the right kind of space is produced.
  -            if (KWQ(document()->part())->markedTextRange() && text[len-1] == ' ') {
  +            if (KWQ(document()->part())->markedTextRange() != NULL && text[len-1] == ' ') {
                   DOMString textWithoutTrailingSpace(text.unicode(), len-1);
                   insertTextIntoNode(textNode, offset, textWithoutTrailingSpace);
                   insertSpace(textNode, offset + len-1);