[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/06 10:51:47

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp 

Log message:
        * server/edit_text_character (format_text): properly handle empty-text.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1534&r2=1.1535
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1534
retrieving revision 1.1535
diff -u -b -r1.1534 -r1.1535
--- ChangeLog   6 Nov 2006 10:27:52 -0000       1.1534
+++ ChangeLog   6 Nov 2006 10:51:47 -0000       1.1535
@@ -1,5 +1,7 @@
 2006-11-06 Sandro Santilli <address@hidden>
 
+       * server/edit_text_character (format_text): properly
+         handle empty-text.
        * backend/render_handler_agg_style.h: comment-out
          add_bitmap with NULL input warning.
        * server/styles.{h,cpp}: warn about bitmap fills with

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/edit_text_character.cpp      4 Nov 2006 13:40:18 -0000       1.24
+++ server/edit_text_character.cpp      6 Nov 2006 10:51:47 -0000       1.25
@@ -3,7 +3,7 @@
 // This source code has been donated to the Public Domain.  Do
 // whatever you want with it.
 
-/* $Id: edit_text_character.cpp,v 1.24 2006/11/04 13:40:18 udog Exp $ */
+/* $Id: edit_text_character.cpp,v 1.25 2006/11/06 10:51:47 strk Exp $ */
 
 #include "utf8.h"
 #include "log.h"
@@ -544,6 +544,9 @@
 {
        m_text_glyph_records.resize(0);
 
+       // nothing more to do if text is empty
+       if ( _text.empty() ) return;
+
        // FIXME: I don't think we should query the definition
        // to find the appropriate font to use, as ActionScript
        // code should be able to change the font of a TextField