glom r1821 - trunk/glom/reports

[murrayc svn gnome org]

Author: murrayc
Date: Sun Dec 21 16:24:23 2008
New Revision: 1821
URL: http://svn.gnome.org/viewvc/glom?rev=1821&view=rev

Log:
2008-12-21  Murray Cumming  <murrayc murrayc com>

* glom/libglom/data_structure/layout/layoutitem_text.cc: 
Copy constructor and operator=: Copy the underlying text, not just 
the smartpointer to it. This stops us from accidentally changing the 
empty available template parts in reports.
Ubuntu bug https://bugs.launchpad.net/ubuntu/+source/glom/+bug/309417
(elmergato) 

Modified:
   trunk/glom/reports/dialog_layout_report.cc

Modified: trunk/glom/reports/dialog_layout_report.cc
==============================================================================
--- trunk/glom/reports/dialog_layout_report.cc	(original)
+++ trunk/glom/reports/dialog_layout_report.cc	Sun Dec 21 16:24:23 2008
@@ -635,7 +635,7 @@
   if(parent)
   {
     sharedptr<LayoutItem> temp = (*parent)[m_model_available_parts_main->m_columns.m_col_item];
-    parent = temp;
+    pParentPart = temp;
   }
 
   Gtk::TreeModel::iterator available = get_selected_available();
@@ -655,7 +655,9 @@
     parent = (*parent).parent();
     if(parent)
     {
-      pParentPart = (*parent)[model_available->m_columns.m_col_item];
+      sharedptr<LayoutItem> temp = (*parent)[model_available->m_columns.m_col_item];
+      pParentPart = temp;
+
       if(!TreeStore_ReportLayout::may_be_child_of(pParentPart, pAvailablePart))
         return; //Not allowed either.
     }