glom r1921 - in trunk: . glom/libglom/data_structure

[murrayc svn gnome org]

Author: murrayc
Date: Sun Feb 22 17:51:41 2009
New Revision: 1921
URL: http://svn.gnome.org/viewvc/glom?rev=1921&view=rev

Log:
2009-02-22  Murray Cumming  <murrayc murrayc com>

* glom/libglom/data_structure/glomconversions.cc: 
get_text_for_gda_value(): Avoid a warning about no return value.

Modified:
   trunk/ChangeLog
   trunk/glom/libglom/data_structure/glomconversions.cc

Modified: trunk/glom/libglom/data_structure/glomconversions.cc
==============================================================================
--- trunk/glom/libglom/data_structure/glomconversions.cc	(original)
+++ trunk/glom/libglom/data_structure/glomconversions.cc	Sun Feb 22 17:51:41 2009
@@ -321,7 +321,7 @@
 {
   if(value.is_null()) //The type can be null for any of the actual field types.
   {
-    return "";
+    return Glib::ustring();
   }
 
   if(glom_type == Field::TYPE_DATE)
@@ -479,6 +479,7 @@
     //- Values in SQL queries, but we only do that for clauses (where/sort/order) 
     //  which should never use image values.
     std::cerr << "Conversions::get_text_for_gda_value(): Unexpected TYPE_IMAGE field type: " << glom_type << std::endl;
+    return Glib::ustring();
   }
   else
   {