[lmi-commits] [5624] Remove remainder of toxic kludges reinstated 20081214T1434Z

[Greg Chicares]

Revision: 5624
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5624
Author:   chicares
Date:     2012-12-14 13:54:23 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Remove remainder of toxic kludges reinstated 20081214T1434Z

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

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-12-14 10:57:13 UTC (rev 5623)
+++ lmi/trunk/ChangeLog 2012-12-14 13:54:23 UTC (rev 5624)
@@ -31111,3 +31111,13 @@
 Fix defect introduced 20050114T1947Z, from an original file predating
 the lmi epoch, and noted 20050601T1449Z.
 
+20121214T1057Z <address@hidden> [552]
+
+  input_harmonization.cpp
+Remove part of a toxic kludge reinstated 20081214T1434Z.
+
+20121214T1354Z <address@hidden> [551]
+
+  input_harmonization.cpp
+Remove remainder of toxic kludges reinstated 20081214T1434Z.
+

Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp   2012-12-14 10:57:13 UTC (rev 5623)
+++ lmi/trunk/input_harmonization.cpp   2012-12-14 13:54:23 UTC (rev 5624)
@@ -606,8 +606,12 @@
 // TODO ?? WX PORT !! But for now, use this workaround: products that have no
 // general account can't select non-custom funds--there's no GUI for
 // that anyway. INPUT !! See: http://savannah.nongnu.org/support/?104481
-//
-    FundChoiceType.allow(mce_fund_selection, !sepacct_only);
+// However, don't impose that restriction on regression tests that
+// cover the once and future ability to choose funds.
+    if(!global_settings::instance().regression_testing())
+        {
+        FundChoiceType.allow(mce_fund_selection, !sepacct_only);
+        }
 
 /* TODO ?? WX PORT !! Not ported:
     SELECTED_FUND_ALLOC->EnableWindow
@@ -910,17 +914,12 @@
         IssueAge = apparent_age;
         }
 
-bool egregious_kludge = global_settings::instance().regression_testing();
-// TODO ?? Nomen est omen.
-if(!egregious_kludge)
-  {
     // TODO ?? WX PORT !! Icky kludge.
     UseAverageOfAllFunds =
         (mce_fund_average  == FundChoiceType)
         ? mce_yes
         : mce_no
         ;
-  } // end if(!egregious_kludge)
     OverrideFundManagementFee =
         (mce_fund_override == FundChoiceType)
         ? mce_yes