[lmi-commits] [5747] Revert two defective hunks of revision 5678 committed 20130414T1847Z

[Greg Chicares]

Revision: 5747
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5747
Author:   chicares
Date:     2013-07-16 22:50:21 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
Revert two defective hunks of revision 5678 committed 20130414T1847Z

Revision Links:
--------------
    http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5678

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/preferences_model.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2013-07-15 16:22:22 UTC (rev 5746)
+++ lmi/trunk/ChangeLog 2013-07-16 22:50:21 UTC (rev 5747)
@@ -32429,3 +32429,11 @@
   install_wx.make
 Use wxWidgets-2.9.5-rc1.
 
+20130716T2250Z <address@hidden> [541]
+
+  preferences_model.cpp
+Revert two defective hunks of revision 5678 committed 20130414T1847Z.
+Load() should always read the selected columns even if default columns
+are to be used instead. This change temporarily reintroduces the
+defect noted 20130414T1341Z.
+

Modified: lmi/trunk/preferences_model.cpp
===================================================================
--- lmi/trunk/preferences_model.cpp     2013-07-15 16:22:22 UTC (rev 5746)
+++ lmi/trunk/preferences_model.cpp     2013-07-16 22:50:21 UTC (rev 5747)
@@ -210,9 +210,15 @@
 
 void PreferencesModel::Load()
 {
-    std::vector<std::string> columns(parsed_calculation_summary_columns());
+    configurable_settings const& z = configurable_settings::instance();
+    std::istringstream iss(z.calculation_summary_columns());
+    std::vector<std::string> columns;
+    std::copy
+        (std::istream_iterator<std::string>(iss)
+        ,std::istream_iterator<std::string>()
+        ,std::back_inserter(columns)
+        );
 
-    configurable_settings const& z = configurable_settings::instance();
     bool b = z.use_builtin_calculation_summary();
     UseBuiltinCalculationSummary = b ? "Yes" : "No";